Merge pull request #6089 from magento-arcticfoxes/2.4-develop-pr

MC-36959: Remove "compareArraysRecursively" logic duplication

Author: joanhe

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php

@@ -184,61 +184,4 @@ protected function assertResponseFields($actualResponse, $assertionMap)
             );
         }
     }
-
-    /**
-     * Compare arrays recursively regardless of nesting.
-     *
-     * Can compare arrays that have both one level and n-level nesting.
-     * ```
-     *  [
-     * 'products' => [
-     *      'items' => [
-     *      [
-     *          'sku'       => 'bundle-product',
-     *          'type_id'   => 'bundle',
-     *          'items'     => [
-     *          [
-     *              'title'     => 'Bundle Product Items',
-     *              'sku'       => 'bundle-product',
-     *              'options'   => [
-     *              [
-     *                  'price' => 2.75,
-     *                  'label' => 'Simple Product',
-     *                  'product' => [
-     *                      'name'    => 'Simple Product',
-     *                      'sku'     => 'simple',
-     *                  ]
-     *              ]
-     *          ]
-     *      ]
-     *  ];
-     * ```
-     *
-     * @param array $expected
-     * @param array $actual
-     * @return array
-     */
-    public function compareArraysRecursively(array $expected, array $actual): array
-    {
-        $diffResult = [];
-
-        foreach ($expected as $key => $value) {
-            if (array_key_exists($key, $actual)) {
-                if (is_array($value)) {
-                    $recursiveDiff = $this->compareArraysRecursively($value, $actual[$key]);
-                    if (!empty($recursiveDiff)) {
-                        $diffResult[$key] = $recursiveDiff;
-                    }
-                } else {
-                    if (!in_array($value, $actual, true)) {
-                        $diffResult[$key] = $value;
-                    }
-                }
-            } else {
-                $diffResult[$key] = $value;
-            }
-        }
-
-        return $diffResult;
-    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php

@@ -7,13 +7,29 @@
 
 namespace Magento\GraphQl\Bundle;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\CompareArraysRecursively;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * Bundle product with multiple options test.
  */
 class BundleProductMultipleOptionsTest extends GraphQlAbstract
 {
+    /**
+     * @var CompareArraysRecursively
+     */
+    private $compareArraysRecursively;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->compareArraysRecursively = $objectManager->create(CompareArraysRecursively::class);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options.php
      * @param array $bundleProductDataProvider
@@ -85,7 +101,7 @@ private function assertBundleProduct(array $response, array $bundleProductDataPr
         $productItems = $response['products']['items'];
 
         foreach ($bundleProductDataProvider as $key => $data) {
-            $diff = $this->compareArraysRecursively($data, $productItems[$key]);
+            $diff = $this->compareArraysRecursively->execute($data, $productItems[$key]);
             self::assertEquals([], $diff, "Actual response doesn't equal to expected data");
         }
     }