Merge branch 'MAGETWO-99376' into 'MC-18826'

MC-18826: Increase test coverage for Cart & Checkout and Order Processing functional areas

See merge request magn-m23/magn-m23!1656

Author: stkorf

dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php

@@ -10,7 +10,11 @@
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class OrderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -59,10 +63,10 @@ protected function tearDown()
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', true);
 
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->loadByIncrementId($this->orderIncrementId);
-        $order->delete();
+        $orderCollection = $this->objectManager->create(OrderCollectionFactory::class)->create();
+        foreach ($orderCollection as $order) {
+            $order->delete();
+        }
 
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', false);
@@ -140,11 +144,11 @@ public function testSaveOrder()
      * Check that store name with length within 255 chars can be saved in table sales_order
      *
      * @magentoDataFixture Magento/Store/_files/store_with_long_name.php
+     * @magentoDbIsolation disabled
      * @return void
      */
     public function testSaveStoreName()
     {
-        $storeName = str_repeat('a', 220);
         $store = $this->storeRepository->get('test_2');
         $this->storeManager->setCurrentStore($store->getId());
         $eventManager = $this->objectManager->get(ManagerInterface::class);
@@ -154,13 +158,10 @@ public function testSaveStoreName()
         $payment->setMethod('checkmo');
         $order->setStoreId($store->getId())->setPayment($payment);
         $this->resourceModel->save($order);
-        $this->resourceModel->load($order, $storeName, 'store_name');
-        $name = [
-            'Main Website',
-            'Main Website Store',
-            $storeName,
-        ];
-        $expectedStoreName = implode(PHP_EOL, $name);
-        $this->assertEquals($expectedStoreName, $order->getStoreName());
+        $orderRepository = $this->objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $order = $orderRepository->get($order->getId());
+        $this->assertEquals(255, strlen($order->getStoreName()));
+        $this->assertContains($store->getWebsite()->getName(), $order->getStoreName());
+        $this->assertContains($store->getGroup()->getName(), $order->getStoreName());
     }
 }

dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name.php

@@ -7,7 +7,7 @@
 
 /** @var $store \Magento\Store\Model\Store */
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-$storeName = str_repeat('a', 220);
+$storeName = str_repeat('a', 255);
 if (!$store->load('test', 'code')->getId()) {
     $store->setData(
         [