ACP2E-2213: Loading order through repository loads the order multiple times from DB

Author: o-iegorov

app/code/Magento/Sales/Test/Unit/Model/Order/ShippingBuilderTest.php

@@ -7,9 +7,10 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order;
 
-use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShippingInterfaceFactory;
 use Magento\Sales\Api\Data\TotalInterfaceFactory;
+use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\Order\ShippingBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -37,16 +38,38 @@ class ShippingBuilderTest extends TestCase
     private $totalFactory;
 
     /**
-     * @return void
+     * @inheirtDoc
      */
     protected function setUp(): void
     {
         $this->orderFactory = $this->getMockBuilder(OrderFactory::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $this->shippingFactory = $this->getMockBuilder(ShippingInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $this->totalFactory = $this->getMockBuilder(TotalInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $this->shippingBuilder = new ShippingBuilder($this->orderFactory, $this->shippingFactory, $this->totalFactory);
     }
+
+    /**
+     * Test for case when order is provided instead of order_id
+     *
+     * @return void
+     */
+    public function testCreateWithOrder() : void
+    {
+        $order = $this->getMockBuilder(OrderInterface::class)
+            ->getMockForAbstractClass();
+        $this->shippingBuilder->setOrder($order);
+        $order->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn(1);
+        $this->orderFactory->expects($this->never())
+            ->method('create');
+
+        $this->shippingBuilder->create();
+    }
 }

app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php

@@ -270,6 +270,7 @@ private function getOrderExtensionMock(): MockObject
             $mockBuilder
                 ->addMethods(
                     [
+                        'setShippingAssignments',
                         'getShippingAssignments',
                         'setAppliedTaxes',
                         'setConvertingFromQuote',