MTA-2343: Move all test data to repositories

Dmytro Aponasenko · Dmytro Aponasenko · commit a359c4712e79 · 2015-06-30T12:05:08.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
@@ -16,6 +16,20 @@
  */
 class BundleSelections extends DataSource
 {
+    /**
+     * Repository factory instance.
+     *
+     * @var RepositoryFactory
+     */
+    protected $repositoryFactory;
+
+    /**
+     * Fixture factory instance.
+     *
+     * @var RepositoryFactory
+     */
+    protected $fixtureFactory;
+
     /**
      * @constructor
      * @param RepositoryFactory $repositoryFactory
@@ -29,11 +43,24 @@ public function __construct(
         array $data,
         array $params = []
     ) {
+        $this->repositoryFactory = $repositoryFactory;
+        $this->fixtureFactory = $fixtureFactory;
         $this->params = $params;
         $this->data = !isset($data['dataset']) ? $data : [];
+        $this->getDataset($data);
+        $this->prepareProducts();
+    }
 
+    /**
+     * Get dataset for a field.
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function getDataset(array $data)
+    {
         if (isset($data['dataset']) && isset($this->params['repository'])) {
-            $this->data = $repositoryFactory->get($this->params['repository'])->get($data['dataset']);
+            $this->data = $this->repositoryFactory->get($this->params['repository'])->get($data['dataset']);
             if (!empty($data['products'])) {
                 $this->data['products'] = [];
                 $this->data['products'] = explode('|', $data['products']);
@@ -42,7 +69,15 @@ public function __construct(
                 }
             }
         }
+    }
 
+    /**
+     * Prepare products for bundle items.
+     *
+     * @return void
+     */
+    protected function prepareProducts()
+    {
         if (!empty($this->data['products'])) {
             $productsSelections = $this->data['products'];
             $this->data['products'] = [];
@@ -54,7 +89,7 @@ public function __construct(
                         continue;
                     }
                     list($fixture, $dataset) = explode('::', $product);
-                    $productSelection[$key] = $fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
+                    $productSelection[$key] = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
                     $productSelection[$key]->persist();
                     $this->data['bundle_options'][$index]['assigned_products'][$key]['search_data']['name'] =
                         $productSelection[$key]->getName();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Price.php
@@ -38,14 +38,6 @@ public function __construct(RepositoryFactory $repositoryFactory, array $params,
 
         if (isset($data['value'])) {
             $this->data = $data['value'];
-//            if (is_array($this->data)) {
-//                $this->data = array_filter(
-//                    $this->data,
-//                    function ($value) {
-//                        return $value !== '-';
-//                    }
-//                );
-//            }
         }
 
         if (isset($data['dataset']) && isset($this->params['repository'])) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
@@ -9,8 +9,6 @@
 use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
- * Test Flow:
- *
  * Preconditions:
  * 1. Create products.
  * 2. Assign promoted products.
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Fixture/CmsPage/Content.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Fixture/CmsPage/Content.php
@@ -31,6 +31,8 @@ class Content extends DataSource
      * @param FixtureFactory $fixtureFactory
      * @param array $params
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function __construct(
         RepositoryFactory $repositoryFactory,
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php
@@ -12,7 +12,6 @@
 use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Mtf\Repository\RepositoryFactory;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 
 /**
  * Source configurable attributes data of the configurable products.
@@ -94,7 +93,7 @@ public function __construct(
      */
     protected function prepareAttributes(array $data)
     {
-        if (isset($data['attributes'])) {
+        if (!isset($data['attributes'])) {
             return;
         }
 
@@ -145,7 +144,7 @@ protected function prepareAttributesData(array $data)
      */
     protected function prepareProducts(array $data)
     {
-        if (isset($data['products'])) {
+        if (!isset($data['products'])) {
             return;
         }
 
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
@@ -5,8 +5,7 @@
  * See COPYING.txt for license details.
  */
  -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest">
         <variation name="CreateConfigurableProductEntityTestVariation1">
             <data name="description" xsi:type="string">Create product with category and two new options</data>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.xml
@@ -64,7 +64,7 @@
         <field name="samples_title" is_required="1" />
         <field name="short_description" is_required="0" group="autosettings" />
         <field name="downloadable" is_required="0" group="downloadable_information" />
-        <field name="downloadable_links" is_required="0" group="downloadable_information" source="Magento\Downloadable\Test\Fixture\DownloadableProduct\Links" />
+        <field name="downloadable_links" is_required="0" group="downloadable_information" repository="Magento\Downloadable\Test\Repository\DownloadableProduct\Links" />
         <field name="downloadable_sample" is_required="0" group="downloadable_information" repository="Magento\Downloadable\Test\Repository\DownloadableProduct\Samples" />
         <field name="sku" is_required="1" group="product-details" />
         <field name="small_image" is_required="0" />
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
@@ -28,7 +28,7 @@
         <field name="country_of_manufacture" is_required="0" />
         <field name="created_at" is_required="1" />
         <field name="custom_design" is_required="0" />
-        <field name="associated" is_required="1" group="grouped" source="Magento\GroupedProduct\Test\Fixture\GroupedProduct\Associated" repository="Magento\GroupedProduct\Test\Fixture\GroupedProduct\Associated" />
+        <field name="associated" is_required="1" group="grouped" source="Magento\GroupedProduct\Test\Fixture\GroupedProduct\Associated" repository="Magento\GroupedProduct\Test\Repository\GroupedProduct\Associated" />
         <field name="custom_design_from" is_required="0" />
         <field name="custom_design_to" is_required="0" />
         <field name="custom_layout_update" is_required="0" />
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProduct/Associated.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProduct/Associated.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\GroupedProduct\Test\Repository\Associated">
+    <repository class="Magento\GroupedProduct\Test\Repository\GroupedProduct\Associated">
         <dataset name="defaultSimpleProduct">
             <field name="assigned_products" xsi:type="array">
                 <item name="0" xsi:type="array">

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`use Magento\Mtf\Fixture\InjectableFixture;`
`13`	`13`	`use Magento\Mtf\Repository\RepositoryFactory;`
`14`	`14`	`use Magento\Catalog\Test\Fixture\CatalogProductSimple;`
`15`		`-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;`
`16`	`15`
`17`	`16`	`/**`
`18`	`17`	`* Source configurable attributes data of the configurable products.`
`@@ -94,7 +93,7 @@ public function __construct(`
`94`	`93`	`*/`
`95`	`94`	`protected function prepareAttributes(array $data)`
`96`	`95`	`{`
`97`		`- if (isset($data['attributes'])) {`
	`96`	`+ if (!isset($data['attributes'])) {`
`98`	`97`	`return;`
`99`	`98`	`}`
`100`	`99`
`@@ -145,7 +144,7 @@ protected function prepareAttributesData(array $data)`
`145`	`144`	`*/`
`146`	`145`	`protected function prepareProducts(array $data)`
`147`	`146`	`{`
`148`		`- if (isset($data['products'])) {`
	`147`	`+ if (!isset($data['products'])) {`
`149`	`148`	`return;`
`150`	`149`	`}`
`151`	`150`