add assertions to service request tests

JeremyDunn · JeremyDunn · commit 1feee78daba8 · 2017-03-28T08:25:06.000-05:00
diff --git a/tests/FedEx/Tests/AddressValidationTest.php b/tests/FedEx/Tests/AddressValidationTest.php
@@ -16,7 +16,9 @@ public function testAddressValidationRequest()
 
         //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('addressValidation')->will($this->returnValue(ComplexType\AddressValidationRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getAddressValidationReply($addressValidationRequest);
+        $this->assertEquals(ComplexType\AddressValidationRequest::class, $request->getAddressValidationReply($addressValidationRequest));
     }
 }
diff --git a/tests/FedEx/Tests/CloseServiceTest.php b/tests/FedEx/Tests/CloseServiceTest.php
@@ -22,13 +22,18 @@ public function testCloseServiceRequest()
         $complexTypePopulator->populate($smartPostCloseRequest);
         $complexTypePopulator->populate($groundCloseReportReprintsRequest);
 
-        //for now use mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('groundClose')->will($this->returnValue(ComplexType\GroundCloseRequest::class));
+        $mockSoapClient->method('groundCloseWithDocuments')->will($this->returnValue(ComplexType\GroundCloseWithDocumentsRequest::class));
+        $mockSoapClient->method('reprintGroundCloseDocuments')->will($this->returnValue(ComplexType\ReprintGroundCloseDocumentsRequest::class));
+        $mockSoapClient->method('smartPostClose')->will($this->returnValue(ComplexType\SmartPostCloseRequest::class));
+        $mockSoapClient->method('groundCloseReportsReprint')->will($this->returnValue(ComplexType\GroundCloseReportsReprintRequest::class));
+
         $closeService = new Request($mockSoapClient);
-        $closeService->getGroundCloseReply($groundCloseRequest);
-        $closeService->getGroundCloseWithDocumentsReply($groundCloseWithDocumentsRequest);
-        $closeService->getReprintGroundCloseDocumentsReply($reprintGroundCloseDocumentsRequest);
-        $closeService->getSmartPostCloseReply($smartPostCloseRequest);
-        $closeService->getGroundCloseReportsReprintReply($groundCloseReportReprintsRequest);
+        $this->assertEquals(ComplexType\GroundCloseRequest::class, $closeService->getGroundCloseReply($groundCloseRequest));
+        $this->assertEquals(ComplexType\GroundCloseWithDocumentsRequest::class, $closeService->getGroundCloseWithDocumentsReply($groundCloseWithDocumentsRequest));
+        $this->assertEquals(ComplexType\ReprintGroundCloseDocumentsRequest::class, $closeService->getReprintGroundCloseDocumentsReply($reprintGroundCloseDocumentsRequest));
+        $this->assertEquals(ComplexType\SmartPostCloseRequest::class, $closeService->getSmartPostCloseReply($smartPostCloseRequest));
+        $this->assertEquals(ComplexType\GroundCloseReportsReprintRequest::class, $closeService->getGroundCloseReportsReprintReply($groundCloseReportReprintsRequest));
     }
 }
diff --git a/tests/FedEx/Tests/CourierDispatchServiceTest.php b/tests/FedEx/Tests/CourierDispatchServiceTest.php
@@ -19,11 +19,15 @@ public function testCourierDispatchServiceRequest()
         $complextTypePopulator->populate($courierDispatchRequest);
         $complextTypePopulator->populate($pickupAvailabilityRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('cancelCourierDispatch')->will($this->returnValue(ComplexType\CancelCourierDispatchRequest::class));
+        $mockSoapClient->method('createCourierDispatch')->will($this->returnValue(ComplexType\CourierDispatchRequest::class));
+        $mockSoapClient->method('getPickupAvailability')->will($this->returnValue(ComplexType\PickupAvailabilityRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getCancelCourierDispatchReply($cancelCourierDispatchRequest);
-        $request->getCreateCourierDispatchReply($courierDispatchRequest);
-        $request->getGetPickupAvailabilityReply($pickupAvailabilityRequest);
+
+        $this->assertEquals(ComplexType\CancelCourierDispatchRequest::class, $request->getCancelCourierDispatchReply($cancelCourierDispatchRequest));
+        $this->assertEquals(ComplexType\CourierDispatchRequest::class, $request->getCreateCourierDispatchReply($courierDispatchRequest));
+        $this->assertEquals(ComplexType\PickupAvailabilityRequest::class, $request->getGetPickupAvailabilityReply($pickupAvailabilityRequest));
     }
 }
diff --git a/tests/FedEx/Tests/LocatorServiceTest.php b/tests/FedEx/Tests/LocatorServiceTest.php
@@ -15,9 +15,11 @@ public function testLocatorServiceRequest()
         $complextTypePopulator = new ComplexTypePopulator();
         $complextTypePopulator->populate($fedexLocatorRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('fedExLocator')->will($this->returnValue(ComplexType\FedExLocatorRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getFedExLocatorReply($fedexLocatorRequest);
+
+        $this->assertEquals(ComplexType\FedExLocatorRequest::class, $request->getFedExLocatorReply($fedexLocatorRequest));
     }
 }
diff --git a/tests/FedEx/Tests/PackageMovementInformationServiceTest.php b/tests/FedEx/Tests/PackageMovementInformationServiceTest.php
@@ -17,10 +17,13 @@ public function testPackageMovementInformationServiceRequest()
         $complexTypePopulator->populate($postalCodeInquieryRequest);
         $complexTypePopulator->populate($serviceAvailabilityRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('postalCodeInquiry')->will($this->returnValue(ComplexType\PostalCodeInquiryRequest::class));
+        $mockSoapClient->method('serviceAvailability')->will($this->returnValue(ComplexType\ServiceAvailabilityRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getPostalCodeInquiryReply($postalCodeInquieryRequest);
-        $request->getServiceAvailabilityReply($serviceAvailabilityRequest);
+
+        $this->assertEquals(ComplexType\PostalCodeInquiryRequest::class, $request->getPostalCodeInquiryReply($postalCodeInquieryRequest));
+        $this->assertEquals(ComplexType\ServiceAvailabilityRequest::class, $request->getServiceAvailabilityReply($serviceAvailabilityRequest));
     }
 }
diff --git a/tests/FedEx/Tests/PickupServiceTest.php b/tests/FedEx/Tests/PickupServiceTest.php
@@ -19,11 +19,15 @@ public function testPickupServiceRequestTest()
         $populator->populate($cancelPickupRequest);
         $populator->populate($createPickupRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('getPickupAvailability')->will($this->returnValue(ComplexType\PickupAvailabilityRequest::class));
+        $mockSoapClient->method('cancelPickup')->will($this->returnValue(ComplexType\CancelPickupRequest::class));
+        $mockSoapClient->method('createPickup')->will($this->returnValue(ComplexType\CreatePickupRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getGetPickupAvailabilityReply($pickupAvailabilityRequest);
-        $request->getCancelPickupReply($cancelPickupRequest);
-        $request->getCreatePickupReply($createPickupRequest);
+
+        $this->assertEquals(ComplexType\PickupAvailabilityRequest::class, $request->getGetPickupAvailabilityReply($pickupAvailabilityRequest));
+        $this->assertEquals(ComplexType\CancelPickupRequest::class, $request->getCancelPickupReply($cancelPickupRequest));
+        $this->assertEquals(ComplexType\CreatePickupRequest::class, $request->getCreatePickupReply($createPickupRequest));
     }
 }
diff --git a/tests/FedEx/Tests/RateServiceTest.php b/tests/FedEx/Tests/RateServiceTest.php
@@ -15,9 +15,11 @@ public function testRateServiceRequest()
         $populator = new ComplexTypePopulator();
         $populator->populate($rateRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('getRates')->will($this->returnValue(ComplexType\RateRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getGetRatesReply($rateRequest);
+
+        $this->assertEquals(ComplexType\RateRequest::class, $request->getGetRatesReply($rateRequest));
     }
 }
diff --git a/tests/FedEx/Tests/ReturnTagServiceTest.php b/tests/FedEx/Tests/ReturnTagServiceTest.php
@@ -15,9 +15,10 @@ public function testReturnTagServiceRequest()
         $populator = new ComplexTypePopulator();
         $populator->populate($expressTagAvailabilityRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('getExpressTagAvailability')->will($this->returnValue(ComplexType\ExpressTagAvailabilityRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getGetExpressTagAvailabilityReply($expressTagAvailabilityRequest);
+        $this->assertEquals(ComplexType\ExpressTagAvailabilityRequest::class, $request->getGetExpressTagAvailabilityReply($expressTagAvailabilityRequest));
     }
 }
diff --git a/tests/FedEx/Tests/ShipServiceTest.php b/tests/FedEx/Tests/ShipServiceTest.php
@@ -26,16 +26,23 @@ public function testShipServiceRequest()
         $populator->populate($deleteShipmentRequest);
         $populator->populate($validationShipmentRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('createPendingShipment')->will($this->returnValue(ComplexType\CreatePendingShipmentRequest::class));
+        $mockSoapClient->method('processTag')->will($this->returnValue(ComplexType\ProcessTagRequest::class));
+        $mockSoapClient->method('processShipment')->will($this->returnValue(ComplexType\ProcessShipmentRequest::class));
+        $mockSoapClient->method('cancelPendingShipment')->will($this->returnValue(ComplexType\CancelPendingShipmentRequest::class));
+        $mockSoapClient->method('deleteTag')->will($this->returnValue(ComplexType\DeleteTagRequest::class));
+        $mockSoapClient->method('deleteShipment')->will($this->returnValue(ComplexType\DeleteShipmentRequest::class));
+        $mockSoapClient->method('validateShipment')->will($this->returnValue(ComplexType\ValidateShipmentRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getCreatePendingShipmentReply($createPendingShipmentRequest);
-        $request->getProcessTagReply($processTagRequest);
-        $request->getProcessShipmentReply($processShipmentRequest);
-        $request->getCancelPendingShipmentReply($cancelPendingShipmentRequest);
-        $request->getDeleteTagReply($deleteTagRequest);
-        $request->getDeleteShipmentReply($deleteShipmentRequest);
-        $request->getValidateShipmentReply($validationShipmentRequest);
 
+        $this->assertEquals(ComplexType\CreatePendingShipmentRequest::class, $request->getCreatePendingShipmentReply($createPendingShipmentRequest));
+        $this->assertEquals(ComplexType\ProcessTagRequest::class, $request->getProcessTagReply($processTagRequest));
+        $this->assertEquals(ComplexType\ProcessShipmentRequest::class, $request->getProcessShipmentReply($processShipmentRequest));
+        $this->assertEquals(ComplexType\CancelPendingShipmentRequest::class, $request->getCancelPendingShipmentReply($cancelPendingShipmentRequest));
+        $this->assertEquals(ComplexType\DeleteTagRequest::class, $request->getDeleteTagReply($deleteTagRequest));
+        $this->assertEquals(ComplexType\DeleteShipmentRequest::class, $request->getDeleteShipmentReply($deleteShipmentRequest));
+        $this->assertEquals(ComplexType\ValidateShipmentRequest::class, $request->getValidateShipmentReply($validationShipmentRequest));
     }
 }
diff --git a/tests/FedEx/Tests/TrackServiceTest.php b/tests/FedEx/Tests/TrackServiceTest.php
@@ -21,12 +21,16 @@ public function testTrackServiceRequest()
         $populator->populate($sendSignatureProofOfDeliveryFaxRequest);
         $populator->populate($trackRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('getTrackNotification')->will($this->returnValue(ComplexType\TrackNotificationRequest::class));
+        $mockSoapClient->method('retrieveSignatureProofOfDeliveryLetter')->will($this->returnValue(ComplexType\SignatureProofOfDeliveryLetterRequest::class));
+        $mockSoapClient->method('sendSignatureProofOfDeliveryFax')->will($this->returnValue(ComplexType\SignatureProofOfDeliveryFaxRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getGetTrackNotificationReply($trackNotificationRequest);
-        $request->getRetrieveSignatureProofOfDeliveryLetterReply($retrieveSignatureProofOfDeliveryLetterRequest);
-        $request->getSendSignatureProofOfDeliveryFaxReply($sendSignatureProofOfDeliveryFaxRequest);
+
+        $this->assertEquals(ComplexType\TrackNotificationRequest::class, $request->getGetTrackNotificationReply($trackNotificationRequest));
+        $this->assertEquals(ComplexType\SignatureProofOfDeliveryLetterRequest::class, $request->getRetrieveSignatureProofOfDeliveryLetterReply($retrieveSignatureProofOfDeliveryLetterRequest));
+        $this->assertEquals(ComplexType\SignatureProofOfDeliveryFaxRequest::class, $request->getSendSignatureProofOfDeliveryFaxReply($sendSignatureProofOfDeliveryFaxRequest));
         $request->getTrackReply($trackRequest);
     }
 }
diff --git a/tests/FedEx/Tests/UploadDocumentServiceTest.php b/tests/FedEx/Tests/UploadDocumentServiceTest.php
@@ -17,10 +17,13 @@ public function testUploadDocumentServiceRequest()
         $populator->populate($uploadDocumentsRequest);
         $populator->populate($uploadImagesRequest);
 
-        //for now use a mock soap client that doesn't expect or return anything
         $mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());
+        $mockSoapClient->method('uploadDocuments')->will($this->returnValue(ComplexType\UploadDocumentsRequest::class));
+        $mockSoapClient->method('uploadImages')->will($this->returnValue(ComplexType\UploadImagesRequest::class));
+
         $request = new Request($mockSoapClient);
-        $request->getUploadDocumentsReply($uploadDocumentsRequest);
-        $request->getUploadImagesReply($uploadImagesRequest);
+
+        $this->assertEquals(ComplexType\UploadDocumentsRequest::class, $request->getUploadDocumentsReply($uploadDocumentsRequest));
+        $this->assertEquals(ComplexType\UploadImagesRequest::class, $request->getUploadImagesReply($uploadImagesRequest));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ public function testAddressValidationRequest()`
`16`	`16`
`17`	`17`	`//for now use a mock soap client that doesn't expect or return anything`
`18`	`18`	`$mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());`
	`19`	`+ $mockSoapClient->method('addressValidation')->will($this->returnValue(ComplexType\AddressValidationRequest::class));`
	`20`	`+`
`19`	`21`	`$request = new Request($mockSoapClient);`
`20`		`- $request->getAddressValidationReply($addressValidationRequest);`
	`22`	`+ $this->assertEquals(ComplexType\AddressValidationRequest::class, $request->getAddressValidationReply($addressValidationRequest));`
`21`	`23`	`}`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,11 @@ public function testLocatorServiceRequest()`
`15`	`15`	`$complextTypePopulator = new ComplexTypePopulator();`
`16`	`16`	`$complextTypePopulator->populate($fedexLocatorRequest);`
`17`	`17`
`18`		`- //for now use a mock soap client that doesn't expect or return anything`
`19`	`18`	`$mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());`
	`19`	`+ $mockSoapClient->method('fedExLocator')->will($this->returnValue(ComplexType\FedExLocatorRequest::class));`
	`20`	`+`
`20`	`21`	`$request = new Request($mockSoapClient);`
`21`		`- $request->getFedExLocatorReply($fedexLocatorRequest);`
	`22`	`+`
	`23`	`+ $this->assertEquals(ComplexType\FedExLocatorRequest::class, $request->getFedExLocatorReply($fedexLocatorRequest));`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,10 @@ public function testReturnTagServiceRequest()`
`15`	`15`	`$populator = new ComplexTypePopulator();`
`16`	`16`	`$populator->populate($expressTagAvailabilityRequest);`
`17`	`17`
`18`		`- //for now use a mock soap client that doesn't expect or return anything`
`19`	`18`	`$mockSoapClient = $this->getMockFromWsdl(Request::getWsdlPath());`
	`19`	`+ $mockSoapClient->method('getExpressTagAvailability')->will($this->returnValue(ComplexType\ExpressTagAvailabilityRequest::class));`
	`20`	`+`
`20`	`21`	`$request = new Request($mockSoapClient);`
`21`		`- $request->getGetExpressTagAvailabilityReply($expressTagAvailabilityRequest);`
	`22`	`+ $this->assertEquals(ComplexType\ExpressTagAvailabilityRequest::class, $request->getGetExpressTagAvailabilityReply($expressTagAvailabilityRequest));`
`22`	`23`	`}`
`23`	`24`	`}`