Merge pull request #407 from magento-l3/MC-40746

MC-40746: Add support for variables in fixture parameters

Author: bubasuma

app/code/Magento/Catalog/Test/Fixture/AddAttributeToAttributeSet.php

@@ -10,12 +10,10 @@
 use Magento\Catalog\Api\ProductAttributeManagementInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Eav\Setup\EavSetup;
+use Magento\Framework\DataObject;
 use Magento\TestFramework\Fixture\Api\ServiceFactory;
 use Magento\TestFramework\Fixture\DataFixtureInterface;
 
-/**
- * Add product attribute to attribute set
- */
 class AddAttributeToAttributeSet implements DataFixtureInterface
 {
     /**
@@ -43,7 +41,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function apply(array $data = []): ?array
+    public function apply(array $data = []): ?DataObject
     {
         $attributeSetId = $this->eavSetup->getAttributeSetId(Product::ENTITY, 'Default');
         $attributeGroupId = $this->eavSetup->getDefaultAttributeGroupId(Product::ENTITY, $attributeSetId);
@@ -60,6 +58,6 @@ public function apply(array $data = []): ?array
         $service = $this->serviceFactory->create(ProductAttributeManagementInterface::class, 'assign');
         $service->execute($data);
 
-        return $data;
+        return null;
     }
 }

app/code/Magento/Catalog/Test/Fixture/Attribute.php

@@ -8,13 +8,11 @@
 namespace Magento\Catalog\Test\Fixture;
 
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\DataObject;
 use Magento\TestFramework\Fixture\Api\ServiceFactory;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 
-/**
- * Creates product attribute fixture
- */
 class Attribute implements RevertibleDataFixtureInterface
 {
     private const DEFAULT_DATA = [
@@ -74,31 +72,40 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function apply(array $data = []): ?array
+    public function apply(array $data = []): ?DataObject
     {
         $service = $this->serviceFactory->create(ProductAttributeRepositoryInterface::class, 'save');
-        $fixtureData = array_merge(self::DEFAULT_DATA, $data);
-        $result = $service->execute(
+
+        return $service->execute(
             [
-                'attribute' => $this->dataProcessor->process($this, $fixtureData)
+                'attribute' => $this->prepareData($data)
             ]
         );
-
-        return [
-            'attribute' => $result
-        ];
     }
 
     /**
      * @inheritdoc
      */
-    public function revert(array $data = []): void
+    public function revert(DataObject $data): void
     {
         $service = $this->serviceFactory->create(ProductAttributeRepositoryInterface::class, 'deleteById');
         $service->execute(
             [
-                'attributeCode' => $data['attribute']->getAttributeCode()
+                'attributeCode' => $data->getAttributeCode()
             ]
         );
     }
+
+    /**
+     * Prepare attribute data
+     *
+     * @param array $data
+     * @return array
+     */
+    private function prepareData(array $data): array
+    {
+        $data = array_merge(self::DEFAULT_DATA, $data);
+
+        return $this->dataProcessor->process($this, $data);
+    }
 }

app/code/Magento/Catalog/Test/Fixture/Category.php

@@ -7,77 +7,86 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
-use Magento\Catalog\Model\CategoryFactory;
-use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Fixture\Api\DataMerger;
+use Magento\TestFramework\Fixture\Api\ServiceFactory;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
-/**
- * Creates category fixture
- */
 class Category implements RevertibleDataFixtureInterface
 {
-    private const DEFAULT_PARENT_ID = 2;
-
-    private const DEFAULT_PARENT_PATH = '1/2';
-
     private const DEFAULT_DATA = [
+        'id' => null,
         'name' => 'Category%uniqid%',
-        'parent_id' => self::DEFAULT_PARENT_ID,
+        'parent_id' => 2,
         'is_active' => true,
         'position' => 1,
-        'available_sort_by' => ['position', 'name'],
-        'default_sort_by' => 'name'
+        'level' => 1,
+        'path' => null,
+        'include_in_menu' => true,
+        'available_sort_by' => [],
+        'custom_attributes' => [
+            'default_sort_by' => ['name']
+        ],
+        'extension_attributes' => [],
+        'created_at' => null,
+        'updated_at' => null,
     ];
 
     /**
-     * @var CategoryFactory
-     */
-    private $categoryFactory;
-
-    /**
-     * @var CategoryResource
+     * @var ServiceFactory
      */
-    private $categoryResource;
+    private $serviceFactory;
 
     /**
      * @var ProcessorInterface
      */
     private $dataProcessor;
+    /**
+     * @var DataMerger
+     */
+    private $dataMerger;
 
     /**
-     * @param CategoryFactory $categoryFactory
-     * @param CategoryResource $categoryResource
+     * @param ServiceFactory $serviceFactory
      * @param ProcessorInterface $dataProcessor
      */
     public function __construct(
-        CategoryFactory $categoryFactory,
-        CategoryResource $categoryResource,
-        ProcessorInterface $dataProcessor
+        ServiceFactory $serviceFactory,
+        ProcessorInterface $dataProcessor,
+        DataMerger $dataMerger
     ) {
-        $this->categoryFactory = $categoryFactory;
-        $this->categoryResource = $categoryResource;
+        $this->serviceFactory = $serviceFactory;
         $this->dataProcessor = $dataProcessor;
+        $this->dataMerger = $dataMerger;
     }
 
     /**
      * @inheritdoc
      */
-    public function apply(array $data = []): ?array
+    public function apply(array $data = []): ?DataObject
     {
-        $data = $this->prepareData($data);
-        /** @var \Magento\Catalog\Model\Category $category */
-        $category = $this->categoryFactory->create();
-        $category->isObjectNew(true);
-        $category->setData($data);
-        if (isset($data['id'])) {
-            $category->setId($data['id']);
-        }
-        $this->categoryResource->save($category);
+        $service = $this->serviceFactory->create(CategoryRepositoryInterface::class, 'save');
+
+        return $service->execute(
+            [
+                'category' => $this->prepareData($data)
+            ]
+        );
+    }
 
-        return [
-            'category' => $category
-        ];
+    /**
+     * @inheritdoc
+     */
+    public function revert(DataObject $data): void
+    {
+        $service = $this->serviceFactory->create(CategoryRepositoryInterface::class, 'deleteByIdentifier');
+        $service->execute(
+            [
+                'categoryId' => $data->getId()
+            ]
+        );
     }
 
     /**
@@ -88,32 +97,8 @@ public function apply(array $data = []): ?array
      */
     private function prepareData(array $data): array
     {
-        $data = $this->dataProcessor->process($this, array_merge(self::DEFAULT_DATA, $data));
-        if (!isset($data['path'])) {
-            $data['path'] = self::DEFAULT_PARENT_PATH;
-            if ((int) $data['parent_id'] !== self::DEFAULT_PARENT_ID) {
-                /** @var \Magento\Catalog\Model\Category $parentCategory */
-                $parentCategory = $this->categoryFactory->create();
-                $this->categoryResource->load($parentCategory, $data['parent_id']);
-                $data['path'] = $parentCategory->getPath();
-            }
-            if (isset($data['id'])) {
-                $data['path'] .= '/' . $data['id'];
-            }
-        }
-        return $data;
-    }
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
 
-    /**
-     * @inheritdoc
-     */
-    public function revert(array $data = []): void
-    {
-        /** @var \Magento\Catalog\Model\Category $category */
-        $category = $this->categoryFactory->create();
-        $this->categoryResource->load($category, $data['category']->getId());
-        if ($category->getId()) {
-            $this->categoryResource->delete($category);
-        }
+        return $this->dataProcessor->process($this, $data);
     }
 }