Merge remote-tracking branch 'origin/MAGETWO-50937' into PR

igrybkov · igrybkov · commit 7a57c97457de · 2016-04-08T14:38:45.000+03:00
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -202,7 +202,7 @@ public function getAssociatedProducts($product)
             $collection = $this->getAssociatedProductCollection(
                 $product
             )->addAttributeToSelect(
-                '*'
+                ['name', 'price']
             )->addFilterByRequiredOptions()->setPositionOrder()->addStoreFilter(
                 $this->getStoreFilter($product)
             )->addAttributeToFilter(
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php
@@ -41,34 +41,21 @@ public function testGetLinkedItemsByType()
             [
                 'sku' => 'grouped-product',
                 'link_type' => 'associated',
-                'linked_product_sku' => 'simple-1',
+                'linked_product_sku' => 'simple',
                 'linked_product_type' => 'simple',
                 'position' => 1,
+                'extension_attributes' => ['qty' => 1]
             ],
             [
                 'sku' => 'grouped-product',
                 'link_type' => 'associated',
                 'linked_product_sku' => 'virtual-product',
                 'linked_product_type' => 'virtual',
                 'position' => 2,
+                'extension_attributes' => ['qty' => 2]
             ],
         ];
 
-        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            array_walk(
-                $expected,
-                function (&$item) {
-                    $item['extension_attributes'] = ['qty' => 1.0000];
-                }
-            );
-        } else {
-            array_walk(
-                $expected,
-                function (&$item) {
-                    $item['extension_attributes'] = ['qty' => 1.0000];
-                }
-            );
-        }
         $this->assertEquals($expected, $actual);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkRepositoryTest.php
@@ -15,16 +15,17 @@ class ProductLinkRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAb
     const RESOURCE_PATH = '/V1/products/';
 
     /**
-     * @var \Magento\Framework\ObjectManager
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;
 
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
     }
+
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products_new.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_duplicated.php
      * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped.php
      */
     public function testSave()
@@ -35,7 +36,7 @@ public function testSave()
             'sku' => $productSku,
             'link_type' => $linkType,
             'linked_product_type' => 'simple',
-            'linked_product_sku' => 'simple',
+            'linked_product_sku' => 'simple-1',
             'position' => 3,
             'extension_attributes' => [
                 'qty' =>  (float) 300.0000,
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
@@ -13,11 +13,12 @@
             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
             <data name="product/data/category" xsi:type="string">category_%isolation%</data>
-            <data name="product/data/associated/products" xsi:type="string">catalogProductSimple::simple_big_qty,downloadableProduct::one_dollar_product_with_no_separated_link,catalogProductVirtual::required_fields_with_category</data>
+            <data name="product/data/associated/products" xsi:type="string">catalogProductSimple::simple_big_qty,downloadableProduct::one_dollar_product_with_no_separated_link,catalogProductVirtual::default</data>
             <data name="product/data/associated/dataset" xsi:type="string">simple_downloadable_virtual</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
+            <constraint name="Magento\GroupedProduct\Test\Constraint\AssertGroupedProductsDefaultQty" />
         </variation>
         <variation name="CreateGroupedProductEntityTestVariation2" summary="Create with required products and description">
             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
@@ -7,16 +7,21 @@
 
 class GroupedTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
     /**
      * @var \Magento\Catalog\Model\Product\Type
      */
     protected $_productType;
 
     protected function setUp()
     {
-        $this->_productType = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Catalog\Model\Product\Type'
-        );
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->_productType = $this->objectManager->get('Magento\Catalog\Model\Product\Type');
     }
 
     public function testFactory()
@@ -26,4 +31,53 @@ public function testFactory()
         $type = $this->_productType->factory($product);
         $this->assertInstanceOf('\Magento\GroupedProduct\Model\Product\Type\Grouped', $type);
     }
+
+    /**
+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php
+     * @magentoAppArea frontend
+     */
+    public function testGetAssociatedProducts()
+    {
+        $productRepository = $this->objectManager->create('Magento\Catalog\Api\ProductRepositoryInterface');
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $productRepository->get('grouped-product');
+        $type = $product->getTypeInstance();
+        $this->assertInstanceOf('\Magento\GroupedProduct\Model\Product\Type\Grouped', $type);
+
+        $associatedProducts = $type->getAssociatedProducts($product);
+        $this->assertCount(2, $associatedProducts);
+
+        $this->assertProductInfo($associatedProducts[0]);
+        $this->assertProductInfo($associatedProducts[1]);
+    }
+
+    /**
+     * @param \Magento\Catalog\Model\Product $product
+     */
+    private function assertProductInfo($product)
+    {
+        $data = [
+            1 => [
+                'sku' => 'simple',
+                'name' => 'Simple Product',
+                'price' => '10',
+                'qty' => '1',
+                'position' => '1'
+            ],
+            21 => [
+                'sku' => 'virtual-product',
+                'name' => 'Virtual Product',
+                'price' => '10',
+                'qty' => '2',
+                'position' => '2'
+            ]
+        ];
+        $productId = $product->getId();
+        $this->assertEquals($data[$productId]['sku'], $product->getSku());
+        $this->assertEquals($data[$productId]['name'], $product->getName());
+        $this->assertEquals($data[$productId]['price'], $product->getPrice());
+        $this->assertEquals($data[$productId]['qty'], $product->getQty());
+        $this->assertEquals($data[$productId]['position'], $product->getPosition());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollectionTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollectionTest.php
@@ -30,7 +30,7 @@ public function testGetColumnValues()
         $resultData = $collection->getColumnValues('sku');
         $this->assertNotEmpty($resultData);
 
-        $expected = ['virtual-product', 'simple-1'];
+        $expected = ['virtual-product', 'simple'];
         sort($expected);
         sort($resultData);
         $this->assertEquals($expected, $resultData);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
@@ -4,14 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_simple_duplicated.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_associated.php';
 require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $productRepository = $objectManager->get('Magento\Catalog\Api\ProductRepositoryInterface');
 
-$productId = $productRepository->get('simple-1')->getId();
-
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
 $product->isObjectNew(true);
@@ -37,9 +35,10 @@
 
 $newLinks = [];
 $productLinkFactory = $objectManager->get('Magento\Catalog\Api\Data\ProductLinkInterfaceFactory');
+
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
 $productLink = $productLinkFactory->create();
-$linkedProduct = $productRepository->getById($productId);
+$linkedProduct = $productRepository->getById(1);
 $productLink->setSku($product->getSku())
     ->setLinkType('associated')
     ->setLinkedProductSku($linkedProduct->getSku())
@@ -48,6 +47,7 @@
     ->getExtensionAttributes()
     ->setQty(1);
 $newLinks[] = $productLink;
+
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
 $productLink = $productLinkFactory->create();
 $linkedProduct = $productRepository->getById(21);
@@ -57,7 +57,7 @@
     ->setLinkedProductType($linkedProduct->getTypeId())
     ->setPosition(2)
     ->getExtensionAttributes()
-    ->setQty(1);
+    ->setQty(2);
 $newLinks[] = $productLink;
 $product->setProductLinks($newLinks);
 $product->save();
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_rollback.php
@@ -18,7 +18,7 @@
 $registry->register('isSecureArea', true);
 try {
     /** @var $simpleProduct \Magento\Catalog\Model\Product */
-    $simpleProduct = $productRepository->get('simple-1', false, null, true);
+    $simpleProduct = $productRepository->get('simple', false, null, true);
     $simpleProduct->delete();
 } catch (NoSuchEntityException $e) {
     //already deleted
