MQE-1441: Deliver weekly PR

- Add mftf_migrated:yes tag to MTF tests
- Fix many incorrect testCaseIds

Author: tomreece

app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml

@@ -15,7 +15,7 @@
             <title value="Admin should be able to add cross-sell to products."/>
             <description value="Create products, add products to cross sells, and check that they appear in the Shopping Cart page."/>
             <severity value="MAJOR"/>
-            <testCaseId value="MC-113"/>
+            <testCaseId value="MC-9143"/>
             <group value="Catalog"/>
         </annotations>
         <before>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

@@ -67,7 +67,7 @@
             <title value="Admin should be able to switch a new product from virtual to simple"/>
             <description value="After selecting a virtual product when adding Admin should be switch to simple implicitly"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MC-10925"/>
+            <testCaseId value="MC-10928"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

@@ -15,7 +15,7 @@
             <title value="Admin should be able to switch a new product from configurable to simple"/>
             <description value="After selecting a configurable product when adding Admin should be switch to simple implicitly"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MC-10925"/>
+            <testCaseId value="MC-10926"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -34,7 +34,7 @@
             <title value="Admin should be able to switch a new product from configurable to virtual"/>
             <description value="After selecting a configurable product when adding Admin should be switch to virtual implicitly"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MC-10925"/>
+            <testCaseId value="MC-10927"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -43,14 +43,14 @@
         </actionGroup>
         <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product"  stepKey="seeProductTypeInGrid"/>
     </test>
-    <test name="AdminCreateSimpleProductSwitchToConfigurableTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
+    <test name="AdminCreateVirtualProductSwitchToConfigurableTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Product Type Switching"/>
-            <title value="Admin should be able to switch a new product from simple to configurable"/>
-            <description value="After selecting a simple product when adding Admin should be switch to configurable implicitly"/>
+            <title value="Admin should be able to switch a new product from virtual to configurable"/>
+            <description value="After selecting a virtual product when adding Admin should be switch to configurable implicitly"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MC-10925"/>
+            <testCaseId value="MC-10930"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -64,7 +64,7 @@
             <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
         </after>
         <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
-            <argument name="productType" value="simple"/>
+            <argument name="productType" value="virtual"/>
         </actionGroup>
         <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
             <argument name="product" value="_defaultProduct"/>

app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

@@ -15,7 +15,7 @@
             <title value="Admin should be able to switch a new product from downloadable to simple"/>
             <description value="After selecting a downloadable product when adding Admin should be switch to simple implicitly"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MC-10925"/>
+            <testCaseId value="MC-10929"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\AddToCartCrossSellTest" summary="Promote Products as Cross-Sells" ticketId="MAGETWO-12390">
         <variation name="AddToCartCrossSellTestVariation1" method="test">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
             <data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
             <data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ManageProductsStockTest.xml

@@ -15,6 +15,7 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
         </variation>
         <variation name="ManageProductsStockTestVariation2" summary="Checking that Out of Stock products are not visible in category" ticketId="MAGETWO-13645">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">product_with_category</data>
             <data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">5</data>
@@ -33,6 +34,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
         </variation>
         <variation name="ManageProductsStockTestVariation3" summary="Add In Stock product to cart" ticketId="MAGETWO-13645">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">product_with_category</data>
             <data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">5</data>
@@ -51,6 +53,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
         </variation>
         <variation name="ManageProductsStockTestVariation4" summary="Enable displaying of out of stock products in category" ticketId="MAGETWO-13645">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">product_with_category</data>
             <data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">5</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml

@@ -8,10 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest" summary="Product Type Switching on Creation" ticketId="MAGETWO-29398">
         <variation name="ProductTypeSwitchingOnCreationTestVariation1">
-            <data name="tag" xsi:type="string">stable:no</data>
+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
             <data name="createProduct" xsi:type="string">simple</data>
             <data name="product" xsi:type="string">configurableProduct::default</data>
-            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -36,6 +35,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnCreationTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">MSI-1624</data>
             <data name="createProduct" xsi:type="string">configurable</data>
             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
@@ -50,7 +50,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnCreationTestVariation6">
-            <data name="tag" xsi:type="string">stable:no</data>
+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
             <data name="createProduct" xsi:type="string">virtual</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateAttributeSetEntityTest" summary="Create Attribute Set (Attribute Set)" ticketId="MAGETWO-25104">
         <variation name="CreateAttributeSetEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="attributeSet/data/attribute_set_name" xsi:type="string">AttributeSet%isolation%</data>
             <data name="attributeSet/data/skeleton_set/dataset" xsi:type="string">default</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeSetSuccessSaveMessage" />

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityFromProductPageTest" summary="Create Product Attribute from Product Page" ticketId="MAGETWO-30528">
         <variation name="CreateProductAttributeEntityFromProductPageTestVariation1_Searchable_Global_Visible_Comparable_HtmlAllowed_UsedForSorting">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
             <data name="attribute/data/frontend_input" xsi:type="string">Text Field</data>
             <data name="attribute/data/is_required" xsi:type="string">No</data>
@@ -33,6 +34,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsUsedInSortOnFrontend" />
         </variation>
         <variation name="CreateProductAttributeEntityFromProductPageTestVariation2_Filterable">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="attribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
             <data name="attribute/data/frontend_input" xsi:type="string">Dropdown</data>
             <data name="attribute/data/options/dataset" xsi:type="string">two_options</data>
@@ -50,6 +52,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductAttributeIsConfigurable" />
         </variation>
         <variation name="CreateProductAttributeEntityFromProductPageTestVariation3_Required">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
             <data name="attribute/data/frontend_input" xsi:type="string">Text Field</data>
             <data name="attribute/data/is_required" xsi:type="string">Yes</data>
@@ -59,6 +62,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsRequired" />
         </variation>
         <variation name="CreateProductAttributeEntityFromProductPageTestVariation4_Unique">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="attribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
             <data name="attribute/data/frontend_input" xsi:type="string">Text Field</data>
             <data name="attribute/data/is_required" xsi:type="string">No</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteSystemProductAttributeTest" summary="Delete System Product Attribute" ticketId="MAGETWO-24771">
         <variation name="DeleteSystemProductAttributeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="productAttribute/data/attribute_code" xsi:type="string">news_from_date</data>
             <data name="productAttribute/data/is_user_defined" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertAbsenceDeleteAttributeButton" />