merge magento/2.2-develop into magento-engcom/MAGETWO-71174

Magento CICD · web-flow · commit f86d210e6abd · 2017-08-07T02:27:31.000+01:00
diff --git a/Test/Unit/Block/Adminhtml/CaseInfoTest.php b/Test/Unit/Block/Adminhtml/CaseInfoTest.php
@@ -19,7 +19,7 @@
  *
  * Class CaseInfoTest
  */
-class CaseInfoTest extends \PHPUnit_Framework_TestCase
+class CaseInfoTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var CaseInterface|MockObject
diff --git a/Test/Unit/Controller/Webhooks/HandlerTest.php b/Test/Unit/Controller/Webhooks/HandlerTest.php
@@ -27,7 +27,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class HandlerTest extends \PHPUnit_Framework_TestCase
+class HandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Handler
@@ -121,7 +121,7 @@ protected function setUp()
 
         $config = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
-            ->setMethods(['isDebugModeEnabled'])
+            ->setMethods(['isDebugModeEnabled', 'getByCaseId'])
             ->getMock();
         $config->expects(self::any())
             ->method('getByCaseId')
diff --git a/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php b/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php
@@ -18,7 +18,7 @@
 /**
  * Contains tests for case updating service factory.
  */
-class UpdatingServiceFactoryTest extends \PHPUnit_Framework_TestCase
+class UpdatingServiceFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var UpdatingServiceFactory
diff --git a/Test/Unit/Model/CaseServices/UpdatingServiceTest.php b/Test/Unit/Model/CaseServices/UpdatingServiceTest.php
@@ -19,7 +19,7 @@
 /**
  * Contains tests with different negative and positive scenarios for case updating service.
  */
-class UpdatingServiceTest extends \PHPUnit_Framework_TestCase
+class UpdatingServiceTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var UpdatingService
diff --git a/Test/Unit/Model/CommentsHistoryUpdaterTest.php b/Test/Unit/Model/CommentsHistoryUpdaterTest.php
@@ -15,7 +15,7 @@
 /**
  * Contains tests for comments history updater class.
  */
-class CommentsHistoryUpdaterTest extends \PHPUnit_Framework_TestCase
+class CommentsHistoryUpdaterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var int
@@ -61,7 +61,7 @@ protected function setUp()
 
         $this->historyFactory = $this->getMockBuilder(HistoryFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->setMethods(['create', 'save'])
             ->getMock();
 
         $this->caseEntity = $this->getMockBuilder(CaseInterface::class)
diff --git a/Test/Unit/Model/CustomerOrdersTest.php b/Test/Unit/Model/CustomerOrdersTest.php
@@ -19,7 +19,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CustomerOrdersTest extends \PHPUnit_Framework_TestCase
+class CustomerOrdersTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var int
diff --git a/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php b/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php
@@ -16,7 +16,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CancelGuaranteeAbilityTest extends \PHPUnit_Framework_TestCase
+class CancelGuaranteeAbilityTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
diff --git a/Test/Unit/Model/Guarantee/CancelingServiceTest.php b/Test/Unit/Model/Guarantee/CancelingServiceTest.php
@@ -19,7 +19,7 @@
 /**
  * Contains test cases for Signifyd guarantee canceling service.
  */
-class CancelingServiceTest extends \PHPUnit_Framework_TestCase
+class CancelingServiceTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var int
diff --git a/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php b/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php
@@ -17,7 +17,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CreateGuaranteeAbilityTest extends \PHPUnit_Framework_TestCase
+class CreateGuaranteeAbilityTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var DateTimeFactory
diff --git a/Test/Unit/Model/Guarantee/CreationServiceTest.php b/Test/Unit/Model/Guarantee/CreationServiceTest.php
@@ -14,7 +14,7 @@
 use Magento\Signifyd\Model\SignifydGateway\Gateway;
 use Magento\Signifyd\Model\SignifydGateway\GatewayException;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use PHPUnit_Framework_TestCase as TestCase;
+use \PHPUnit\Framework\TestCase as TestCase;
 use Psr\Log\LoggerInterface;
 
 class CreationServiceTest extends TestCase
diff --git a/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php b/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php
@@ -16,7 +16,7 @@
  *
  * Class CaseRescoreTest
  */
-class CaseRescoreTest extends \PHPUnit_Framework_TestCase
+class CaseRescoreTest extends \PHPUnit\Framework\TestCase
 {
     private static $data = [
         'caseId' => 100,
diff --git a/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php b/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php
@@ -15,7 +15,7 @@
 /**
  * Contains tests for messages generators factory.
  */
-class GeneratorFactoryTest extends \PHPUnit_Framework_TestCase
+class GeneratorFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var GeneratorFactory
diff --git a/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php b/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php
@@ -10,7 +10,7 @@
 /**
  * Contains tests for different variations like empty data, wrong required arguments, or bad placeholders.
  */
-class PatternGeneratorTest extends \PHPUnit_Framework_TestCase
+class PatternGeneratorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Checks an exception if generators does not receives required data.
diff --git a/Test/Unit/Model/OrderStateServiceTest.php b/Test/Unit/Model/OrderStateServiceTest.php
@@ -13,7 +13,7 @@
 use Magento\Signifyd\Model\OrderStateService;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-class OrderStateServiceTest extends \PHPUnit_Framework_TestCase
+class OrderStateServiceTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var int
diff --git a/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php b/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php
@@ -9,7 +9,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Config\Dom\ValidationSchemaException;
 
-class XmlToArrayConfigConverterTest extends \PHPUnit_Framework_TestCase
+class XmlToArrayConfigConverterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var XmlToArrayConfigConverter
diff --git a/Test/Unit/Model/PaymentVerificationFactoryTest.php b/Test/Unit/Model/PaymentVerificationFactoryTest.php
@@ -12,7 +12,7 @@
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Magento\Payment\Gateway\ConfigInterface;
 
-class PaymentVerificationFactoryTest extends \PHPUnit_Framework_TestCase
+class PaymentVerificationFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var PaymentVerificationFactory
diff --git a/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php b/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php
@@ -10,7 +10,7 @@
 use Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-class OrderGridUpdaterTest extends \PHPUnit_Framework_TestCase
+class OrderGridUpdaterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var GridInterface|MockObject
diff --git a/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php b/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php
@@ -13,7 +13,7 @@
 use Magento\Framework\Json\EncoderInterface;
 use \PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-class HttpClientFactoryTest extends \PHPUnit_Framework_TestCase
+class HttpClientFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string
diff --git a/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php b/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php
@@ -12,7 +12,7 @@
 use \Zend_Http_Response as Response;
 use \PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-class ResponseHandlerTest extends \PHPUnit_Framework_TestCase
+class ResponseHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string
diff --git a/Test/Unit/Model/SignifydGateway/GatewayTest.php b/Test/Unit/Model/SignifydGateway/GatewayTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use \PHPUnit\Framework\TestCase as TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Magento\Signifyd\Model\SignifydGateway\Gateway;
 use Magento\Signifyd\Model\SignifydGateway\GatewayException;
 use Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface;
 use Magento\Signifyd\Model\SignifydGateway\ApiClient;
 use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
 
-class GatewayTest extends TestCase
+class GatewayTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var CreateCaseBuilderInterface|MockObject
@@ -61,7 +61,8 @@ public function testCreateCaseForSpecifiedOrder()
             ->with($this->equalTo($dummyOrderId))
             ->willReturn([]);
 
-        $this->gateway->createCase($dummyOrderId);
+        $result = $this->gateway->createCase($dummyOrderId);
+        $this->assertEquals(42, $result);
     }
 
     public function testCreateCaseCallsValidApiMethod()
@@ -84,7 +85,8 @@ public function testCreateCaseCallsValidApiMethod()
                 'investigationId' => $dummySignifydInvestigationId
             ]);
 
-        $this->gateway->createCase($dummyOrderId);
+        $result = $this->gateway->createCase($dummyOrderId);
+        $this->assertEquals(42, $result);
     }
 
     public function testCreateCaseNormalFlow()
@@ -119,7 +121,7 @@ public function testCreateCaseWithFailedApiCall()
             ->method('makeApiCall')
             ->willThrowException(new ApiCallException($apiCallFailureMessage));
 
-        $this->setExpectedException(
+        $this->expectException(
             GatewayException::class,
             $apiCallFailureMessage
         );
@@ -138,7 +140,7 @@ public function testCreateCaseWithMissedResponseRequiredData()
                 'someOtherParameter' => 'foo',
             ]);
 
-        $this->setExpectedException(GatewayException::class);
+        $this->expectException(GatewayException::class);
         $this->gateway->createCase($dummyOrderId);
     }
 
@@ -182,7 +184,8 @@ public function testSubmitCaseForGuaranteeCallsValidApiMethod()
                 'disposition' => $dummyDisposition
             ]);
 
-        $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals('APPROVED', $result);
     }
 
     public function testSubmitCaseForGuaranteeWithFailedApiCall()
@@ -194,11 +197,12 @@ public function testSubmitCaseForGuaranteeWithFailedApiCall()
             ->method('makeApiCall')
             ->willThrowException(new ApiCallException($apiCallFailureMessage));
 
-        $this->setExpectedException(
+        $this->expectException(
             GatewayException::class,
             $apiCallFailureMessage
         );
-        $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals('Api call failed', $result);
     }
 
     public function testSubmitCaseForGuaranteeReturnsDisposition()
@@ -237,7 +241,7 @@ public function testSubmitCaseForGuaranteeWithMissedDisposition()
                 'rereviewCount' => $dummyRereviewCount,
             ]);
 
-        $this->setExpectedException(GatewayException::class);
+        $this->expectException(GatewayException::class);
         $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
     }
 
@@ -252,8 +256,9 @@ public function testSubmitCaseForGuaranteeWithUnexpectedDisposition()
                 'disposition' => $dummyUnexpectedDisposition,
             ]);
 
-        $this->setExpectedException(GatewayException::class);
-        $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->expectException(GatewayException::class);
+        $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals('UNEXPECTED', $result);
     }
 
     /**
@@ -270,7 +275,8 @@ public function testSubmitCaseForGuaranteeWithExpectedDisposition($dummyExpected
             ]);
 
         try {
-            $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+            $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+            $this->assertEquals($dummyExpectedDisposition, $result);
         } catch (GatewayException $e) {
             $this->fail(sprintf(
                 'Expected disposition "%s" was not accepted with message "%s"',
@@ -314,7 +320,8 @@ public function testCancelGuaranteeWithUnexpectedDisposition()
             ->with('/cases/' . $caseId . '/guarantee', 'PUT', ['guaranteeDisposition' => Gateway::GUARANTEE_CANCELED])
             ->willReturn(['disposition' => Gateway::GUARANTEE_DECLINED]);
 
-        $this->gateway->cancelGuarantee($caseId);
+        $result = $this->gateway->cancelGuarantee($caseId);
+        $this->assertEquals(Gateway::GUARANTEE_CANCELED, $result);
     }
 
     public function supportedGuaranteeDispositionsProvider()
diff --git a/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php b/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php
@@ -14,7 +14,7 @@
 /**
  * Class WebhookMessageReaderTest
  */
-class WebhookMessageReaderTest extends \PHPUnit_Framework_TestCase
+class WebhookMessageReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var WebhookMessageReader
diff --git a/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php b/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php
@@ -13,7 +13,7 @@
 /**
  * Class WebhookRequestValidatorTest
  */
-class WebhookRequestValidatorTest extends \PHPUnit_Framework_TestCase
+class WebhookRequestValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var WebhookRequestValidator
diff --git a/Test/Unit/Model/SignifydOrderSessionIdTest.php b/Test/Unit/Model/SignifydOrderSessionIdTest.php
@@ -14,7 +14,7 @@
  * Class SignifydOrderSessionIdTest tests that SignifydOrderSessionId class dependencies
  * follow the contracts.
  */
-class SignifydOrderSessionIdTest extends \PHPUnit_Framework_TestCase
+class SignifydOrderSessionIdTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var SignifydOrderSessionId
diff --git a/Test/Unit/Observer/PlaceOrderTest.php b/Test/Unit/Observer/PlaceOrderTest.php
@@ -17,7 +17,7 @@
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
 
-class PlaceOrderTest extends \PHPUnit_Framework_TestCase
+class PlaceOrderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Config|MockObject
@@ -160,7 +160,8 @@ public function testExecuteWithFailedCaseCreation()
         $this->logger->method('error')
             ->with(self::equalTo($exceptionMessage));
 
-        $this->placeOrder->execute($this->observer);
+        $result = $this->placeOrder->execute($this->observer);
+        $this->assertNull($result);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* Class CaseInfoTest`
`21`	`21`	`*/`
`22`		`-class CaseInfoTest extends \PHPUnit_Framework_TestCase`
	`22`	`+class CaseInfoTest extends \PHPUnit\Framework\TestCase`
`23`	`23`	`{`
`24`	`24`	`/**`
`25`	`25`	`* @var CaseInterface\|MockObject`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`/**`
`19`	`19`	`* Contains tests for case updating service factory.`
`20`	`20`	`*/`
`21`		`-class UpdatingServiceFactoryTest extends \PHPUnit_Framework_TestCase`
	`21`	`+class UpdatingServiceFactoryTest extends \PHPUnit\Framework\TestCase`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`	`24`	`* @var UpdatingServiceFactory`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`18`	`18`	`*/`
`19`		`-class CancelGuaranteeAbilityTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class CancelGuaranteeAbilityTest extends \PHPUnit\Framework\TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @var OrderRepositoryInterface\|\PHPUnit_Framework_MockObject_MockObject`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`19`	`19`	`*/`
`20`		`-class CreateGuaranteeAbilityTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class CreateGuaranteeAbilityTest extends \PHPUnit\Framework\TestCase`
`21`	`21`	`{`
`22`	`22`	`/**`
`23`	`23`	`* @var DateTimeFactory`