MAGETWO-69553: Report related integration tests fail

Igor Melnikov · Igor Melnikov · commit 26c8143224e3 · 2017-05-31T17:07:41.000-05:00
- workaround to have tests pass
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/InvoicedTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/InvoicedTest.php
@@ -13,19 +13,23 @@ class InvoicedTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Invoiced\Collection\Invoiced
      */
-    private $_collection;
+    private $collection;
 
     /**
-     * Set up.
-     *
-     * @return void
+     * @var \Magento\Framework\ObjectManagerInterface
      */
+    private $objectManager;
+
     protected function setUp()
     {
-        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->collection = $this->objectManager->create(
             \Magento\Sales\Model\ResourceModel\Report\Invoiced\Collection\Invoiced::class
         );
-        $this->_collection->setPeriod('day')->setDateRange(null, null)->addStoreFilter([1]);
+        $this->collection->setPeriod('day')
+            ->setDateRange(null, null)
+            ->addStoreFilter([1]);
     }
 
     /**
@@ -36,16 +40,26 @@ protected function setUp()
      */
     public function testGetItems()
     {
+
         /** @var \Magento\Sales\Model\Order $order */
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order::class);
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
-        $invoiceCreatedAt = $order->getInvoiceCollection()->getFirstItem()->getCreatedAt();
+        $invoiceCreatedAt = $order->getInvoiceCollection()
+            ->getFirstItem()
+            ->getCreatedAt();
         /** @var \Magento\Framework\Stdlib\DateTime\DateTime $dateTime */
-        $dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Stdlib\DateTime\DateTimeFactory::class
-        )
+        $dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\DateTimeFactory::class)
             ->create();
+        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
+        $timezone = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $invoiceCreatedAt = $timezone->formatDateTime(
+            $invoiceCreatedAt,
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            null,
+            null,
+            'yyyy-MM-dd'
+        );
         $invoiceCreatedAtDate = $dateTime->date('Y-m-d', $invoiceCreatedAt);
 
         $expectedResult = [
@@ -57,7 +71,7 @@ public function testGetItems()
         ];
         $actualResult = [];
         /** @var \Magento\Reports\Model\Item $reportItem */
-        foreach ($this->_collection->getItems() as $reportItem) {
+        foreach ($this->collection->getItems() as $reportItem) {
             $actualResult[] = [
                 'orders_count' => $reportItem->getData('orders_count'),
                 'orders_invoiced' => $reportItem->getData('orders_invoiced'),
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/OrderTest.php
@@ -13,19 +13,22 @@ class OrderTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Invoiced\Collection\Order
      */
-    private $_collection;
+    private $collection;
 
     /**
-     * Set up.
-     *
-     * @return void
+     * @var \Magento\Framework\ObjectManagerInterface
      */
+    private $objectManager;
+
     protected function setUp()
     {
-        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->collection = $this->objectManager->create(
             \Magento\Sales\Model\ResourceModel\Report\Invoiced\Collection\Order::class
         );
-        $this->_collection->setPeriod('day')->setDateRange(null, null)->addStoreFilter([1]);
+        $this->collection->setPeriod('day')
+            ->setDateRange(null, null)
+            ->addStoreFilter([1]);
     }
 
     /**
@@ -37,15 +40,23 @@ protected function setUp()
     public function testGetItems()
     {
         /** @var \Magento\Sales\Model\Order $order */
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        $order = $this->objectManager
             ->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
         /** @var \Magento\Framework\Stdlib\DateTime\DateTime $dateTime */
-        $dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Stdlib\DateTime\DateTimeFactory::class
-        )
+        $dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\DateTimeFactory::class)
             ->create();
-        $invoiceCreatedAtDate = $dateTime->date('Y-m-d', $order->getCreatedAt());
+        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
+        $timezone = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $orderCreatedAt = $timezone->formatDateTime(
+            $order->getCreatedAt(),
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            null,
+            null,
+            'yyyy-MM-dd'
+        );
+        $invoiceCreatedAtDate = $dateTime->date('Y-m-d', $orderCreatedAt);
 
         $expectedResult = [
             [
@@ -56,7 +67,7 @@ public function testGetItems()
         ];
         $actualResult = [];
         /** @var \Magento\Reports\Model\Item $reportItem */
-        foreach ($this->_collection->getItems() as $reportItem) {
+        foreach ($this->collection->getItems() as $reportItem) {
             $actualResult[] = [
                 'orders_count' => $reportItem->getData('orders_count'),
                 'orders_invoiced' => $reportItem->getData('orders_invoiced'),
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/OrderTest.php
@@ -13,19 +13,22 @@ class OrderTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Refunded\Collection\Order
      */
-    private $_collection;
+    private $collection;
 
     /**
-     * Set up.
-     *
-     * @return void
+     * @var \Magento\Framework\ObjectManagerInterface
      */
+    private $objectManager;
+
     protected function setUp()
     {
-        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->collection = $this->objectManager->create(
             \Magento\Sales\Model\ResourceModel\Report\Refunded\Collection\Order::class
         );
-        $this->_collection->setPeriod('day')->setDateRange(null, null)->addStoreFilter([1]);
+        $this->collection->setPeriod('day')
+            ->setDateRange(null, null)
+            ->addStoreFilter([1]);
     }
 
     /**
@@ -37,15 +40,22 @@ protected function setUp()
     public function testGetItems()
     {
         /** @var \Magento\Sales\Model\Order $order */
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order::class);
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
         /** @var \Magento\Framework\Stdlib\DateTime\DateTime $dateTime */
-        $dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Stdlib\DateTime\DateTimeFactory::class
-        )
+        $dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\DateTimeFactory::class)
             ->create();
-        $creditmemoCreatedAtDate = $dateTime->date('Y-m-d', $order->getCreatedAt());
+        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
+        $timezone = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $orderCreatedAt = $timezone->formatDateTime(
+            $order->getCreatedAt(),
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            null,
+            null,
+            'yyyy-MM-dd'
+        );
+        $creditmemoCreatedAtDate = $dateTime->date('Y-m-d', $orderCreatedAt);
 
         $expectedResult = [
             [
@@ -58,7 +68,7 @@ public function testGetItems()
         ];
         $actualResult = [];
         /** @var \Magento\Reports\Model\Item $reportItem */
-        foreach ($this->_collection->getItems() as $reportItem) {
+        foreach ($this->collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
         $this->assertEquals($expectedResult, $actualResult);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/RefundedTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/RefundedTest.php
@@ -13,19 +13,22 @@ class RefundedTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Refunded\Collection\Refunded
      */
-    private $_collection;
+    private $collection;
 
     /**
-     * Set up.
-     *
-     * @return void
+     * @var \Magento\Framework\ObjectManagerInterface
      */
+    private $objectManager;
+
     protected function setUp()
     {
-        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->collection = $this->objectManager->create(
             \Magento\Sales\Model\ResourceModel\Report\Refunded\Collection\Refunded::class
         );
-        $this->_collection->setPeriod('day')->setDateRange(null, null)->addStoreFilter([1]);
+        $this->collection->setPeriod('day')
+            ->setDateRange(null, null)
+            ->addStoreFilter([1]);
     }
 
     /**
@@ -37,16 +40,23 @@ protected function setUp()
     public function testGetItems()
     {
         /** @var \Magento\Sales\Model\Order $order */
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order::class);
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
-        $creditMemoCreatedAt = $order->getCreditmemosCollection()->getFirstItem()->getCreatedAt();
+        $creditmemoCreatedAt = $order->getCreditmemosCollection()->getFirstItem()->getCreatedAt();
         /** @var \Magento\Framework\Stdlib\DateTime\DateTime $dateTime */
-        $dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Stdlib\DateTime\DateTimeFactory::class
-        )
+        $dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\DateTimeFactory::class)
             ->create();
-        $creditmemoCreatedAtDate = $dateTime->date('Y-m-d', $creditMemoCreatedAt);
+        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
+        $timezone = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $creditmemoCreatedAt = $timezone->formatDateTime(
+            $creditmemoCreatedAt,
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            null,
+            null,
+            'yyyy-MM-dd'
+        );
+        $creditmemoCreatedAtDate = $dateTime->date('Y-m-d', $creditmemoCreatedAt);
 
         $expectedResult = [
             [
@@ -59,7 +69,7 @@ public function testGetItems()
         ];
         $actualResult = [];
         /** @var \Magento\Reports\Model\Item $reportItem */
-        foreach ($this->_collection->getItems() as $reportItem) {
+        foreach ($this->collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
         $this->assertEquals($expectedResult, $actualResult);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/OrderTest.php
@@ -13,19 +13,22 @@ class OrderTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Sales\Model\ResourceModel\Report\Shipping\Collection\Order
      */
-    private $_collection;
+    private $collection;
 
     /**
-     * Set up.
-     *
-     * @return void
+     * @var \Magento\Framework\ObjectManagerInterface
      */
+    private $objectManager;
+
     protected function setUp()
     {
-        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->collection = $this->objectManager->create(
             \Magento\Sales\Model\ResourceModel\Report\Shipping\Collection\Order::class
         );
-        $this->_collection->setPeriod('day')->setDateRange(null, null)->addStoreFilter([1]);
+        $this->collection->setPeriod('day')
+            ->setDateRange(null, null)
+            ->addStoreFilter([1]);
     }
 
     /**
@@ -37,15 +40,22 @@ protected function setUp()
     public function testGetItems()
     {
         /** @var \Magento\Sales\Model\Order $order */
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order::class);
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
         /** @var \Magento\Framework\Stdlib\DateTime\DateTime $dateTime */
-        $dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Stdlib\DateTime\DateTimeFactory::class
-        )
+        $dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\DateTimeFactory::class)
             ->create();
-        $shipmentCreatedAtDate = $dateTime->date('Y-m-d', $order->getCreatedAt());
+        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
+        $timezone = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $orderCreatedAt = $timezone->formatDateTime(
+            $order->getCreatedAt(),
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE,
+            null,
+            null,
+            'yyyy-MM-dd'
+        );
+        $shipmentCreatedAtDate = $dateTime->date('Y-m-d', $orderCreatedAt);
 
         $expectedResult = [
             [
@@ -57,7 +67,7 @@ public function testGetItems()
         ];
         $actualResult = [];
         /** @var \Magento\Reports\Model\Item $reportItem */
-        foreach ($this->_collection->getItems() as $reportItem) {
+        foreach ($this->collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
         $this->assertEquals($expectedResult, $actualResult);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/ShipmentTest.php
