MTO-127: [Test] Import Advanced Pricing

- Stabilization

Author: SiarheiAndreyeu

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php

@@ -86,9 +86,6 @@ private function getPreparePrices()
             foreach ($tierPrices as $tierPrice) {
                 $resultProductArray[$productSku][] = $tierPrice;
             }
-            if (isset($resultProductArray[$productSku])) {
-                $resultProductArray[$productSku] = array_reverse($resultProductArray[$productSku]);
-            }
         }
 
         // Prepare tier prices data from csv file.

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataTest.xml

@@ -26,7 +26,7 @@
                     </item>
                 </item>
             </data>
-            <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportSuccessMessage" />
+            <constraint name="Magento\ImportExport\Test\Constraint\AssertImportSuccessMessage" />
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportAdvancedPricing" />
         </variation>
         <variation name="ImportProductsVariation2" ticketId="MAGETWO-46156" summary="Replace product tier prices">
@@ -48,7 +48,7 @@
                     </item>
                 </item>
             </data>
-            <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportSuccessMessage" />
+            <constraint name="Magento\ImportExport\Test\Constraint\AssertImportSuccessMessage" />
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportAdvancedPricing" />
         </variation>
         <variation name="ImportProductsVariation3" ticketId="MAGETWO-46157" summary="Delete product tier prices">
@@ -70,7 +70,7 @@
                     </item>
                 </item>
             </data>
-            <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportSuccessMessage" />
+            <constraint name="Magento\ImportExport\Test\Constraint\AssertImportSuccessMessage" />
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportAdvancedPricing" />
         </variation>
         <variation name="ImportProductsVariation4" ticketId="MAGETWO-46159" summary="Replace product tier prices in two websites">

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_1.php

@@ -9,17 +9,17 @@
         'data_0' => [
             'sku' => '%sku%',
             'tier_price_website' => "All Websites [USD]",
-            'tier_price_customer_group' => 'General',
+            'tier_price_customer_group' => "NOT LOGGED IN",
             'tier_price_qty' => '10',
-            'tier_price' => '8.00',
+            'tier_price' => '9.00',
             'tier_price_value_type' => 'Fixed',
         ],
         'data_1' => [
             'sku' => '%sku%',
             'tier_price_website' => "All Websites [USD]",
-            'tier_price_customer_group' => "NOT LOGGED IN",
+            'tier_price_customer_group' => 'General',
             'tier_price_qty' => '10',
-            'tier_price' => '9.00',
+            'tier_price' => '8.00',
             'tier_price_value_type' => 'Fixed',
         ]
     ],

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php renamed to dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php

@@ -3,7 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\AdvancedPricingImportExport\Test\Constraint;
+namespace Magento\ImportExport\Test\Constraint;
 
 use Magento\ImportExport\Test\Page\Adminhtml\AdminImportIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;

dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php

@@ -206,15 +206,15 @@ private function preparePlaceHolders()
         $key = 0;
         foreach ($this->entities as $entity) {
             $entityData = $this->prepareEntityData($entity);
-            foreach ($this->csvTemplate['entity_' . $key] as $tierKey => $tier) {
-                $values = implode('', array_values($tier));
+            foreach ($this->csvTemplate['entity_' . $key] as $entityKey => $importedEntityData) {
+                $values = implode('', array_values($importedEntityData));
                 preg_match_all('/\%(.*)\%/U', $values, $indexes);
                 foreach ($indexes[1] as $index) {
                     if (isset($entityData[$index])) {
-                        $placeholders['entity_' . $key][$tierKey]["%{$index}%"] = $entityData[$index];
+                        $placeholders['entity_' . $key][$entityKey]["%{$index}%"] = $entityData[$index];
                     }
                     if (isset($entityData['code'])) {
-                        $placeholders['entity_' . $key][$tierKey][$entityData['code']]
+                        $placeholders['entity_' . $key][$entityKey][$entityData['code']]
                             = isset($entityData[$entityData['code']])
                             ? $entityData[$entityData['code']]
                             : 'Main Website';

dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminExportIndex.xml

@@ -7,8 +7,8 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
   <page name="AdminExportIndex" area="Adminhtml" mca="admin/export/index" module="Magento_ImportExport">
-    <block name="filterExport" class="Magento\ImportExport\Test\Block\Adminhtml\Export\Filter" locator="#export_filter_container" strategy="css selector"/>
-    <block name="exportForm" class="Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form" locator="#container" strategy="css selector"/>
+    <block name="filterExport" class="Magento\ImportExport\Test\Block\Adminhtml\Export\Filter" locator="#export_filter_container" strategy="css selector" />
+    <block name="exportForm" class="Magento\ImportExport\Test\Block\Adminhtml\Export\Edit\Form" locator="#container" strategy="css selector" />
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
   </page>
 </config>

dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/ChangeCurrencyOnCustomWebsiteStep.php

@@ -10,7 +10,7 @@
 use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
- * Create custom store step.
+ * Change currency on custom website step.
  */
 class ChangeCurrencyOnCustomWebsiteStep implements TestStepInterface
 {
@@ -38,12 +38,12 @@ class ChangeCurrencyOnCustomWebsiteStep implements TestStepInterface
     /**
      * @param FixtureFactory $fixtureFactory
      * @param ImportData $import
-     * @param bool|null $changeCurrency
+     * @param bool $changeCurrency
      */
     public function __construct(
         FixtureFactory $fixtureFactory,
         ImportData $import,
-        $changeCurrency
+        $changeCurrency = false
     ) {
         $this->fixtureFactory = $fixtureFactory;
         $this->import = $import;
@@ -53,7 +53,7 @@ public function __construct(
     /**
      * Fill import form.
      *
-     * @return void
+     * @return array
      */
     public function run()
     {