MAGETWO-95429: ShipOrder API with No Tracking Number Error Message

- Changed class to use existing collection
- Added api test

Author: nathanjosiah

app/code/Magento/Sales/Model/Order/Shipment.php

@@ -574,13 +574,10 @@ public function setItems($items)
     public function getTracks()
     {
         if ($this->getData(ShipmentInterface::TRACKS) === null) {
-            $collection =  $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
-            if ($this->getId()) {
-                foreach ($collection as $item) {
-                    $item->setShipment($this);
-                }
-                $this->setData(ShipmentInterface::TRACKS, $collection->getItems());
+            foreach ($this->getTracksCollection() as $item) {
+                $item->setShipment($this);
             }
+            $this->setData(ShipmentInterface::TRACKS, $this->getTracksCollection()->getItems());
         }
         return $this->getData(ShipmentInterface::TRACKS);
     }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php

@@ -25,7 +25,6 @@ class ShipOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 
     protected function setUp()
     {
-        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1335');
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         $this->shipmentRepository = $this->objectManager->get(
@@ -38,6 +37,7 @@ protected function setUp()
      */
     public function testConfigurableShipOrder()
     {
+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1335');
         $productsQuantity = 1;
 
         /** @var \Magento\Sales\Model\Order $existingOrder */
@@ -132,6 +132,35 @@ public function testShipOrder()
         );
     }
 
+    /**
+     * Tests that not providing a tracking number produces the correct error. See MAGETWO-95429
+     * @expectedException \Exception
+     * @expectedExceptionMessageRegExp /Shipment Document Validation Error\(s\):(?:\n|\\n)Please enter a tracking number./
+     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
+     */
+    public function testShipOrderWithoutTrackingNumberReturnsError()
+    {
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'comment' => [
+                'comment' => 'Test Comment',
+                'is_visible_on_front' => 1,
+            ],
+            'tracks' => [
+                [
+                    'title' => 'Simple shipment track',
+                    'carrier_code' => 'UPS'
+                ]
+            ]
+        ];
+
+        $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Bundle/_files/order_with_bundle_shipped_separately.php
      */