Merge remote-tracking branch 'origin/MAGETWO-52079' into MAGETWO-52374

Author: mlogvin

app/code/Magento/Sales/Model/OrderRepository.php

@@ -173,7 +173,7 @@ private function setShippingAssignments(OrderInterface $order)
         $extensionAttributes = $order->getExtensionAttributes();
 
         if ($extensionAttributes === null) {
-            $extensionAttributes = $this->getOrderExtensionDependencyFactory()->create();
+            $extensionAttributes = $this->getOrderExtensionFactory()->create();
         } elseif ($extensionAttributes->getShippingAssignments() !== null) {
             return;
         }
@@ -185,11 +185,12 @@ private function setShippingAssignments(OrderInterface $order)
     }
 
     /**
-     * Get the new OrderExtension dependency for application code
-     * @return OrderExtension
+     * Get the new OrderExtensionFactory for application code
+     * 
+     * @return OrderExtensionFactory
      * @deprecated
      */
-    private function getOrderExtensionDependencyFactory()
+    private function getOrderExtensionFactory()
     {
         if (!$this->orderExtensionFactory instanceof OrderExtensionFactory) {
             $this->orderExtensionFactory = \Magento\Framework\App\ObjectManager::getInstance()->get(

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

@@ -75,7 +75,7 @@ public function testGetList()
 
         $extensionAttributes = $this->getMock(
             '\Magento\Sales\Api\Data\OrderExtension',
-            [],
+            ['getShippingAssignments'],
             [],
             '',
             false