MTA-1899: Re-factor existing tests for MAP

Oleksandr Manchenko · Oleksandr Manchenko · commit 133c332a647e · 2015-03-30T15:24:39.000+03:00
- Fixed logical and code style errors
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpInShoppingCart.php
@@ -50,7 +50,6 @@ public function processAssert(
         $catalogProductView->getMessagesBlock()->waitSuccessMessage();
 
         $checkoutCart->open();
-        sleep(3);
         $productPrice = $product->hasData('checkout_data')
             ? $product->getCheckoutData()['cartItem']['price']
             : $product->getPrice();
@@ -62,7 +61,6 @@ public function processAssert(
      * Return string representation of object.
      *
      * @return string
-     * @return string
      */
     public function toString()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnCategoryPage.php
@@ -37,14 +37,14 @@ public function processAssert(
         $productBlock = $catalogCategoryView->getListProductBlock()->getProductItem($product);
         \PHPUnit_Framework_Assert::assertTrue(
             $productBlock->isVisible(),
-            'Product is invisible on Category page'
+            'Product is invisible on Category page.'
         );
 
         $priceBlock = $productBlock->getPriceBlock();
         \PHPUnit_Framework_Assert::assertEquals(
             $product->getMsrp(),
             $priceBlock->getOldPrice(),
-            'Displayed on Category page MAP is incorrect'
+            'Displayed on Category page MAP is incorrect.'
         );
         \PHPUnit_Framework_Assert::assertFalse(
             $priceBlock->isRegularPriceVisible(),
@@ -56,12 +56,12 @@ public function processAssert(
         \PHPUnit_Framework_Assert::assertContains(
             $product->getMsrp(),
             $mapBlock->getMapOldPrice(),
-            'Displayed on Category page MAP is incorrect'
+            'Displayed on Category page MAP is incorrect.'
         );
         \PHPUnit_Framework_Assert::assertEquals(
             $product->getPrice(),
             $mapBlock->getActualPrice(),
-            'Displayed on Category page price is incorrect'
+            'Displayed on Category page price is incorrect.'
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnProductView.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnProductView.php
@@ -54,12 +54,12 @@ public function processAssert(
         \PHPUnit_Framework_Assert::assertContains(
             $product->getMsrp(),
             $mapBlock->getMapOldPrice(),
-            'Displayed on Product view page MAP is incorrect'
+            'Displayed on Product view page MAP is incorrect.'
         );
         \PHPUnit_Framework_Assert::assertEquals(
             $product->getPrice(),
             $mapBlock->getActualPrice(),
-            'Displayed on Product view page price is incorrect'
+            'Displayed on Product view page price is incorrect.'
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/CatalogProductSimple.xml
@@ -7,7 +7,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\Catalog\Test\Repository\CatalogProductSimple">
-        <dataset name="with_msrp">
+        <dataset name="msrp_before_order_confirmation">
             <field name="attribute_set_id" xsi:type="array">
                 <item name="dataSet" xsi:type="string">default</item>
             </field>
@@ -36,7 +36,7 @@
             <field name="msrp_display_actual_price_type" xsi:type="string">Before Order Confirmation</field>
         </dataset>
 
-        <dataset name="simple_with_map">
+        <dataset name="msrp_on_gesture">
             <field name="name" xsi:type="string">Simple Product with msrp %isolation%</field>
             <field name="url_key" xsi:type="string">simple-product-with-msrp-%isolation%</field>
             <field name="sku" xsi:type="string">sku_simple_product_with_msrp_%isolation%</field>
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/ConfigData.xml
@@ -9,11 +9,19 @@
     <repository class="Magento\Config\Test\Repository\ConfigData">
         <dataset name="msrp">
             <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="Yes" xsi:type="string">1</field>
-            <field path="sales/msrp/display_price_type" scope="sales" scope_id="1" label="Before Order Confirmation" xsi:type="string">3</field>
         </dataset>
 
         <dataset name="msrp_rollback">
             <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="No" xsi:type="string">0</field>
+        </dataset>
+
+        <dataset name="msrp_before_order_confirmation">
+            <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="Yes" xsi:type="string">1</field>
+            <field path="sales/msrp/display_price_type" scope="sales" scope_id="1" label="Before Order Confirmation" xsi:type="string">3</field>
+        </dataset>
+
+        <dataset name="msrp_before_order_confirmation_rollback">
+            <field path="sales/msrp/enabled" scope="sales" scope_id="1" label="No" xsi:type="string">0</field>
             <field path="sales/msrp/display_price_type" scope="sales" scope_id="1" label="On Gesture" xsi:type="string">1</field>
         </dataset>
     </repository>
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.php
@@ -9,18 +9,18 @@
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Preconditions:
- * 1. Create product
- *
  * Steps:
- * 1. Perform all assertions
+ * 1. Create product.
+ * 2. Perform all assertions.
  *
  * @group MAP_(MX)
  * @ZephyrId MAGETWO-12430, MAGETWO-12847
  */
 class ApplyMapTest extends Injectable
 {
     /* tags */
+    const DOMAIN = 'MX';
+    const MVP = 'yes';
     const TEST_TYPE = 'acceptance_test';
     /* end tags */
 
@@ -40,9 +40,9 @@ public function test($product)
         $product = $this->objectManager->create(
             'Magento\Catalog\Test\TestStep\CreateProductStep',
             ['product' => $product]
-        )->run()['product'];
+        )->run();
 
-        return ['product' => $product];
+        return $product;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.xml b/dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.xml
@@ -9,19 +9,18 @@
     <testCase name="Magento\Msrp\Test\TestCase\ApplyMapTest">
         <variation name="ApplyMapTestVariation1">
             <data name="description" xsi:type="string">MAGETWO-12430: Apply Minimum Advertised Price Setting to Simple Product</data>
-            <data name="product" xsi:type="string">catalogProductSimple::simple_with_map</data>
-            <data name="tag" xsi:type="string">test_type:acceptance_test</data>
-            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnCategoryPage"/>
-            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnProductView"/>
-            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpInShoppingCart"/>
+            <data name="product" xsi:type="string">catalogProductSimple::msrp_on_gesture</data>
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnCategoryPage" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnProductView" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpInShoppingCart" />
         </variation>
         <variation name="ApplyMapTestVariation2">
             <data name="description" xsi:type="string">MAGETWO-12847: Apply Minimum Advertised Price to the Configurable Product</data>
             <data name="product" xsi:type="string">configurableProduct::msrp_on_gesture_one_variation</data>
             <data name="tag" xsi:type="string">test_type:acceptance_test</data>
-            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnCategoryPage"/>
-            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnProductView"/>
-            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpInShoppingCart"/>
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnCategoryPage" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnProductView" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpInShoppingCart" />
         </variation>
     </testCase>
 </config>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ public function processAssert(`
`50`	`50`	`$catalogProductView->getMessagesBlock()->waitSuccessMessage();`
`51`	`51`
`52`	`52`	`$checkoutCart->open();`
`53`		`- sleep(3);`
`54`	`53`	`$productPrice = $product->hasData('checkout_data')`
`55`	`54`	`? $product->getCheckoutData()['cartItem']['price']`
`56`	`55`	`: $product->getPrice();`
`@@ -62,7 +61,6 @@ public function processAssert(`
`62`	`61`	`* Return string representation of object.`
`63`	`62`	`*`
`64`	`63`	`* @return string`
`65`		`- * @return string`
`66`	`64`	`*/`
`67`	`65`	`public function toString()`
`68`	`66`	`{`