From bc9dc4ce9dc7b6e473a4d3f8106293823a03e741 Mon Sep 17 00:00:00 2001 From: Nikolay Ushmodin Date: Thu, 16 Mar 2017 16:32:20 +0700 Subject: [PATCH] XSD --- avs5.xsd | 7 + avs5rs.jmx | 1548 +++++++++++++++++++++------------------------------- avs5rs_common.xsd | 76 +++ avs5rs_sale.xsd | 567 +++++++++++++++++++ avs5rs_transit.xsd | 63 +-- 5 files changed, 1288 insertions(+), 973 deletions(-) create mode 100644 avs5.xsd create mode 100644 avs5rs_common.xsd create mode 100644 avs5rs_sale.xsd diff --git a/avs5.xsd b/avs5.xsd new file mode 100644 index 0000000..db3df37 --- /dev/null +++ b/avs5.xsd @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/avs5rs.jmx b/avs5rs.jmx index 427c166..6aa6e06 100644 --- a/avs5rs.jmx +++ b/avs5rs.jmx @@ -30,7 +30,7 @@ server - http://localhost:8080/avs5/soap/rs + = @@ -45,17 +45,12 @@ date - 2016-07-12 + 2017-03-14 = - - - true - - @@ -66,7 +61,8 @@ - ${__V(server)} + + HttpClient3.1 4 @@ -124,18 +120,9 @@ - - false - /Response/@success='true' - false - false - false - false - - false - /Response/Body/message/text()='Test' + /EchoResponse/Body/message/text()='Test' false false false @@ -174,18 +161,9 @@ - - false - /Response/@success='true' - false - false - false - false - - false - count(/Response/Body/Station)>0 + count(/GetDispatchStationsResponse/Body/Station)>0 false false false @@ -195,7 +173,7 @@ dispatchStationIds - /Response/Body/Station/id + /GetDispatchStationsResponse/Body/Station/id false false false @@ -240,18 +218,9 @@ - - false - /Response/@success='true' - false - false - false - false - - false - count(/Response/Body/Station)>0 + count(/GetArrivalStationsResponse/Body/Station)>0 false false false @@ -261,7 +230,7 @@ arrivalStationIds - /Response/Body/Station/id + /GetArrivalStationsResponse/Body/Station/id false false false @@ -309,19 +278,10 @@ - - false - /Response/@success='true' - false - false - false - false - - tripIds - /Response/Body/Trip/id + /SearchTripsResponse/Body/Trip/id false false false @@ -367,18 +327,53 @@ - + false - /Response/@success='true' + count(/GetTripStopsResponse/Body/Stop)>0 false false false false + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<GetTicketTypesRequest> + <tripId>${tripId}</tripId> + <dispatchStationId>${dispatchStationId}</dispatchStationId> + <arrivalStationId>${arrivalStationId}</arrivalStationId> +</GetTicketTypesRequest> + = + + + + + + + + + + ${__V(server)}/sales/getTicketTypes + POST + true + false + true + false + false + + + + + false - count(/Response/Body/TicketType)>0 + count(/GetTicketTypesResponse/Body/TicketType)>0 false false false @@ -388,7 +383,69 @@ ticketTypeIds - /Response/Body/TicketType/id + /GetTicketTypesResponse/Body/TicketType/id + false + false + false + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<GetDocumentTypesRequest> + <tripId>${tripId}</tripId> + <dispatchStationId>${dispatchStationId}</dispatchStationId> + <arrivalStationId>${arrivalStationId}</arrivalStationId> +</GetDocumentTypesRequest> + = + + + + + + + + + + ${__V(server)}/sales/getDocumentTypes + POST + true + false + true + false + false + + + + + + + false + count(/GetDocumentTypesResponse/Body/DocumentType)>0 + false + false + false + false + + + + false + count(/GetDocumentTypesResponse/Body/DocumentType/id[text()='00' or text()='0']) > 0 + false + false + false + false + + + + + documentTypeIds + /GetDocumentTypesResponse/Body/DocumentType/id[text()='00' or text()='0']/text() false false false @@ -431,163 +488,23 @@ - - false - /Response/@success='true' - false - false - false - false - - - seatIds - /Response/Body/Seat/id + seatId + /GetFreeSeatsResponse/Body/Seat/id false false false - - seatIds - seatId - true - 1 - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<GetTicketTypesRequest> - <tripId>${tripId}</tripId> - <dispatchStationId>${dispatchStationId}</dispatchStationId> - <arrivalStationId>${arrivalStationId}</arrivalStationId> -</GetTicketTypesRequest> - = - - - - - - - - - - ${__V(server)}/sales/getTicketTypes - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/TicketType)>0 - false - false - false - false - - - - - ticketTypeIds - /Response/Body/TicketType/id - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<GetDocumentTypesRequest> - <tripId>${tripId}</tripId> - <dispatchStationId>${dispatchStationId}</dispatchStationId> - <arrivalStationId>${arrivalStationId}</arrivalStationId> -</GetDocumentTypesRequest> - = - - - - - - - - - - ${__V(server)}/sales/getDocumentTypes - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/DocumentType)>0 - false - false - false - false - - - - - documentTypeIds - /Response/Body/DocumentType/id - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> <BookOrderRequest> <tripId>${tripId}</tripId> <dispatchStationId>${dispatchStationId}</dispatchStationId> @@ -599,8 +516,8 @@ <firstName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</firstName> <lastName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</lastName> <middleName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</middleName> - <docNum>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</docNum> - <docSeries>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</docSeries> + <docNum>${__RandomString(6,0123456789)}</docNum> + <docSeries>${__RandomString(4,0123456789)}</docSeries> <docTypeId>${documentTypeIds_1}</docTypeId> <birthday>1985-01-01</birthday> <citizenshipISO2>RU</citizenshipISO2> @@ -608,332 +525,48 @@ </Passenger> </Sale> </BookOrderRequest> - = - - - - - - - - - - ${__V(server)}/sales/bookOrder - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - - orderId - /Response/Body/orderId - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<GetOrderRequest> - <orderId>${orderId}</orderId> -</GetOrderRequest> - = - - - - - - - - - - ${__V(server)}/sales/getOrder - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/Ticket)=1 - false - false - false - false - - - - - ticketId - /Response/Body/Ticket/id - false - false - false - - - - false - /Response/Body/Ticket/status/text()='RESERVED' - false - false - false - false - - - - false - /Response/Body/Ticket/Passenger/citizenshipISO2/text()='RU' - false - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<UpdateTicketRequest> - <ticketId>${ticketId}</ticketId> - <Passenger> - <firstName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</firstName> - <lastName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</lastName> - <middleName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</middleName> - <docNum>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</docNum> - <docSeries>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</docSeries> - <docTypeId>${documentTypeIds_1}</docTypeId> - <birthday>1986-01-01</birthday> - <citizenshipISO2>RU</citizenshipISO2> - <gender>FEMALE</gender> - </Passenger> -</UpdateTicketRequest> - = - - - - - - - - - - ${__V(server)}/sales/updateTicket - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<ConfirmOrderRequest> - <orderId>${orderId}</orderId> -</ConfirmOrderRequest> - = - - - - - - - - - - ${__V(server)}/sales/confirmOrder - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/Ticket)=1 - false - false - false - false - - - - - orderId - /Response/Body/Ticket/id - false - false - false - - - - false - /Response/Body/Ticket/status/text()='SOLD' - false - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<CancelTicketRequest> - <ticketId>${ticketId}</ticketId> -</CancelTicketRequest> - = - - - - - - - - - - ${__V(server)}/sales/cancelTicket - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/Ticket)=1 - false - false - false - false - - - - - orderId - /Response/Body/Ticket/id - false - false - false - - - - false - /Response/Body/Ticket/status/text()='CANCELED' - false - false - false - false - - - + = + + + + + + + + + + ${__V(server)}/sales/bookOrder + POST + true + false + true + false + false + + + + + + + + orderId + /BookOrderResponse/Body/orderId + false + false + false + + - - - - + true false <?xml version="1.0" encoding="UTF-8"?> -<GetFreeSeatsRequest> - <tripId>${tripId}</tripId> - <dispatchStationId>${dispatchStationId}</dispatchStationId> - <arrivalStationId>${arrivalStationId}</arrivalStationId> -</GetFreeSeatsRequest> +<GetOrderRequest> + <orderId>${orderId}</orderId> +</GetOrderRequest> = @@ -944,7 +577,7 @@ - ${__V(server)}/sales/getFreeSeats + ${__V(server)}/sales/getOrder POST true false @@ -956,163 +589,252 @@ - + false - /Response/@success='true' + count(/GetOrderResponse/Body/Ticket)=1 false false false false - + - seatIds - /Response/Body/Seat/id + ticketId + /GetOrderResponse/Body/Ticket/id false false false + + false + /GetOrderResponse/Body/Ticket/status/text()='RESERVED' + false + false + false + false + + + + false + /GetOrderResponse/Body/Ticket/Passenger/citizenshipISO2/text()='RU' + false + false + false + false + + - - seatIds - seatId - true - 1 - + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<UpdateTicketRequest> + <ticketId>${ticketId}</ticketId> + <Passenger> + <firstName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</firstName> + <lastName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</lastName> + <middleName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</middleName> + <docNum>${__RandomString(6,0123456789)}</docNum> + <docSeries>${__RandomString(4,0123456789)}</docSeries> + <docTypeId>${documentTypeIds_1}</docTypeId> + <birthday>1986-01-01</birthday> + <citizenshipISO2>RU</citizenshipISO2> + <gender>FEMALE</gender> + </Passenger> +</UpdateTicketRequest> + = + + + + + + + + + + ${__V(server)}/sales/updateTicket + POST + true + false + true + false + false + + - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<GetTicketTypesRequest> - <tripId>${tripId}</tripId> - <dispatchStationId>${dispatchStationId}</dispatchStationId> - <arrivalStationId>${arrivalStationId}</arrivalStationId> -</GetTicketTypesRequest> - = - - - - - - - - - - ${__V(server)}/sales/getTicketTypes - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/TicketType)>0 - false - false - false - false - - - - - ticketTypeIds - /Response/Body/TicketType/id - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> -<GetDocumentTypesRequest> + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<ConfirmOrderRequest> + <orderId>${orderId}</orderId> +</ConfirmOrderRequest> + = + + + + + + + + + + ${__V(server)}/sales/confirmOrder + POST + true + false + true + false + false + + + + + + + false + count(/ConfirmOrderResponse/Body/Ticket)=1 + false + false + false + false + + + + + orderId + /ConfirmOrderResponse/Body/Ticket/id + false + false + false + + + + false + /ConfirmOrderResponse/Body/Ticket/status/text()='SOLD' + false + false + false + false + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<CancelTicketRequest> + <ticketId>${ticketId}</ticketId> +</CancelTicketRequest> + = + + + + + + + + + + ${__V(server)}/sales/cancelTicket + POST + true + false + true + false + false + + + + + + + false + count(/CancelTicketResponse/Body/Ticket)=1 + false + false + false + false + + + + false + /CancelTicketResponse/Body/Ticket/status/text()='CANCELED' + false + false + false + false + + + + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<GetFreeSeatsRequest> <tripId>${tripId}</tripId> <dispatchStationId>${dispatchStationId}</dispatchStationId> <arrivalStationId>${arrivalStationId}</arrivalStationId> -</GetDocumentTypesRequest> - = - - - - - - - - - - ${__V(server)}/sales/getDocumentTypes - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/DocumentType)>0 - false - false - false - false - - - - - documentTypeIds - /Response/Body/DocumentType/id - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> +</GetFreeSeatsRequest> + = + + + + + + + + + + ${__V(server)}/sales/getFreeSeats + POST + true + false + true + false + false + + + + + + + + seatId + /GetFreeSeatsResponse/Body/Seat/id + false + false + false + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> <BookOrderRequest> <tripId>${tripId}</tripId> <dispatchStationId>${dispatchStationId}</dispatchStationId> @@ -1124,8 +846,8 @@ <firstName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</firstName> <lastName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</lastName> <middleName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</middleName> - <docNum>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</docNum> - <docSeries>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</docSeries> + <docNum>${__RandomString(6,0123456789)}</docNum> + <docSeries>${__RandomString(4,0123456789)}</docSeries> <docTypeId>${documentTypeIds_1}</docTypeId> <birthday>1985-01-01</birthday> <citizenshipISO2>RU</citizenshipISO2> @@ -1133,263 +855,261 @@ </Passenger> </Sale> </BookOrderRequest> - = - - - - - - - - - - ${__V(server)}/sales/bookOrder - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - - orderId - /Response/Body/orderId - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> + = + + + + + + + + + + ${__V(server)}/sales/bookOrder + POST + true + false + true + false + false + + + + + + + + orderId + /BookOrderResponse/Body/orderId + false + false + false + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> <GetOrderRequest> <orderId>${orderId}</orderId> </GetOrderRequest> - = - - - - - - - - - - ${__V(server)}/sales/getOrder - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/Ticket)=1 - false - false - false - false - - - - - ticketId - /Response/Body/Ticket/id - false - false - false - - - - false - /Response/Body/Ticket/status/text()='RESERVED' - false - false - false - false - - - - false - /Response/Body/Ticket/Passenger/citizenshipISO2/text()='RU' - false - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> + = + + + + + + + + + + ${__V(server)}/sales/getOrder + POST + true + false + true + false + false + + + + + + + false + count(/GetOrderResponse/Body/Ticket)=1 + false + false + false + false + + + + + ticketId + /GetOrderResponse/Body/Ticket/id + false + false + false + + + + false + /GetOrderResponse/Body/Ticket/status/text()='RESERVED' + false + false + false + false + + + + false + /GetOrderResponse/Body/Ticket/Passenger/citizenshipISO2/text()='RU' + false + false + false + false + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> +<UpdateTicketRequest> + <ticketId>${ticketId}</ticketId> + <Passenger> + <firstName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</firstName> + <lastName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</lastName> + <middleName>${__RandomString(10,ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz)}</middleName> + <docNum>${__RandomString(6,0123456789)}</docNum> + <docSeries>${__RandomString(4,0123456789)}</docSeries> + <docTypeId>${documentTypeIds_1}</docTypeId> + <birthday>1986-01-01</birthday> + <citizenshipISO2>RU</citizenshipISO2> + <gender>FEMALE</gender> + </Passenger> +</UpdateTicketRequest> + = + + + + + + + + + + ${__V(server)}/sales/updateTicket + POST + true + false + true + false + false + + + + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> <ConfirmOrderRequest> <orderId>${orderId}</orderId> </ConfirmOrderRequest> - = - - - - - - - - - - ${__V(server)}/sales/confirmOrder - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/Ticket)=1 - false - false - false - false - - - - - orderId - /Response/Body/Ticket/id - false - false - false - - - - false - /Response/Body/Ticket/status/text()='SOLD' - false - false - false - false - - - - - true - - - - false - <?xml version="1.0" encoding="UTF-8"?> + = + + + + + + + + + + ${__V(server)}/sales/confirmOrder + POST + true + false + true + false + false + + + + + + + false + count(/ConfirmOrderResponse/Body/Ticket)=1 + false + false + false + false + + + + + orderId + /ConfirmOrderResponse/Body/Ticket/id + false + false + false + + + + false + /ConfirmOrderResponse/Body/Ticket/status/text()='SOLD' + false + false + false + false + + + + + true + + + + false + <?xml version="1.0" encoding="UTF-8"?> <ReturnTicketRequest> <ticketId>${ticketId}</ticketId> </ReturnTicketRequest> - = - - - - - - - - - - ${__V(server)}/sales/returnTicket - POST - true - false - true - false - false - - - - - - - false - /Response/@success='true' - false - false - false - false - - - - false - count(/Response/Body/Ticket)=1 - false - false - false - false - - - - - orderId - /Response/Body/Ticket/id - false - false - false - - - - false - /Response/Body/Ticket/status/text()='RETURNED' - false - false - false - false - - - + = + + + + + + + + + + ${__V(server)}/sales/returnTicket + POST + true + false + true + false + false + + + + + + + false + count(/ReturnTicketResponse/Body/Ticket)=1 + false + false + false + false + + + + false + /ReturnTicketResponse/Body/Ticket/status/text()='RETURNED' + false + false + false + false + + diff --git a/avs5rs_common.xsd b/avs5rs_common.xsd new file mode 100644 index 0000000..aed6b5b --- /dev/null +++ b/avs5rs_common.xsd @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/avs5rs_sale.xsd b/avs5rs_sale.xsd new file mode 100644 index 0000000..604206e --- /dev/null +++ b/avs5rs_sale.xsd @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/avs5rs_transit.xsd b/avs5rs_transit.xsd index 91976b7..dd27e12 100644 --- a/avs5rs_transit.xsd +++ b/avs5rs_transit.xsd @@ -3,65 +3,10 @@ elementFormDefault="qualified" attributeFormDefault="qualified"> - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -70,7 +15,7 @@ - + @@ -85,7 +30,7 @@ - +