From 9bc1ff325ebc338bdf1c40c9cb2c975fd7a4a11c Mon Sep 17 00:00:00 2001
From: Alex Calandra <acalandra@magento.com>
Date: Fri, 6 Jul 2018 11:22:50 -0500
Subject: [PATCH] MQE-1068: Require Issue ID for Skipped Test

- Adding changes to skipped tests
---
 .../AdminConfigurationEnableDisableAnalyticsTest.xml   |  5 +++--
 .../Test/Mftf/Test/AdminConfigurationIndustryTest.xml  |  5 +++--
 .../Mftf/Test/AdminConfigurationPermissionTest.xml     |  5 +++--
 .../Mftf/Test/MassEnableDisableBundleProductsTest.xml  |  5 +++--
 ...minUnassignProductAttributeFromAttributeSetTest.xml |  5 +++--
 .../Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml    |  5 +++--
 .../StorefrontPurchaseProductWithCustomOptions.xml     |  5 +++--
 ...ConfigurableProductPriceAdditionalStoreViewTest.xml |  4 +++-
 .../Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml  | 10 ++++++----
 .../Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml   |  5 +++--
 .../SampleTests/Test/AdvancedSampleTest.xml            |  4 +++-
 .../FunctionalTest/SampleTests/Test/AssertsTest.xml    |  4 +++-
 .../Test/CreateConfigurableProductByApiTest.xml        |  4 +++-
 .../SampleTests/Test/CreateSalesRuleByApiTest.xml      |  4 +++-
 .../SampleTests/Test/PersistMultipleEntitiesTest.xml   |  4 +++-
 .../SampleTests/Test/SetPaymentConfigurationTest.xml   |  8 ++++++--
 .../SampleTests/Test/UpdateSimpleProductByApiTest.xml  |  4 +++-
 17 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
index 8b0714cd2ef65..15c9727cc8c79 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
@@ -16,8 +16,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-66465"/>
             <group value="analytics"/>
-            <!-- MAGETWO-90659 -->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-90659"/>
+            </skip>
         </annotations>
         <after>
             <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
index 6b38bccf33dd5..d4f30737bae3e 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
@@ -17,8 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
-            <!-- MAGETWO-90659 -->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-90659"/>
+            </skip>
         </annotations>
 
         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
index 501dba3dba23b..b3ccd3afd1bf7 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
@@ -17,8 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-82648"/>
             <group value="analytics"/>
-            <!-- MAGETWO-90659 -->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-90659"/>
+            </skip>
         </annotations>
         <before>
             <createData stepKey="noReportUserRole" entity="adminNoReportRole"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index 27d95cfb5cfa5..5354ce28b73ac 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -17,8 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-217"/>
             <group value="Bundle"/>
-            <!--Skipped due to MAGETWO-92898-->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-92898"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
index 1441e2175d08e..5a07b11a204af 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
@@ -17,8 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-194"/>
             <group value="Catalog"/>
-            <!-- Skip because of MAGETWO-92780 -->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-92780"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="productDropDownAttribute" stepKey="attribute"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index a9829b67189cb..d5d9de2648ecf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -16,8 +16,9 @@
             <description value="Admin creates products, creates and manages categories, creates promotions, creates an order, processes an order, processes a return, uses admin grids"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-87014"/>
-            <!-- Skipped, see: https://jira.corp.magento.com/browse/MQE-891 -->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MQE-891"/>
+            </skip>
         </annotations>
         <after>
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
index 3a7feb34354d7..8628ae9b99d3a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
@@ -16,8 +16,9 @@
             <description value="Admin should be able to sell products with different variants of their own"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
-            <!--Skip because of issue MAGETWO-90719-->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-90719"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
index 9467f82ebae24..676c23f1cfb88 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -15,7 +15,9 @@
             <description value="Configurable product price should not disappear for additional stores on frontEnd if disabled for default store"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-92247"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-92247"/>
+            </skip>
         </annotations>
         <before>
             
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 752585830638f..c0b32e4bc71e7 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -248,8 +248,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-297"/>
             <group value="Tax"/>
-            <group value="skip"/>
-            <!-- skipped due to MAGETWO-90539 -->
+            <skip>
+                <issueId value="MAGETWO-90539"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -356,8 +357,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-298"/>
             <group value="Tax"/>
-            <group value="skip"/>
-            <!-- Skipped due to MAGETWO-90539 -->
+            <skip>
+                <issueId value="MAGETWO-90539"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 4a1c7e07c38c6..0806011e8ffbc 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -17,8 +17,9 @@
             <description value="Admin should able to switch between versions of TinyMCE"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-82936"/>
-            <!--Skip because of issue MAGETWO-89417-->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MAGETWO-89417"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml
index d7a03d4f0198f..4fead0e51497e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AdvancedSampleTest.xml
@@ -16,7 +16,9 @@
             <description value=""/>
             <severity value="CRITICAL"/>
             <testCaseId value="#"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SamplePerson" stepKey="beforeData"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
index e1e0602d6103d..200c52cab797d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
@@ -11,7 +11,9 @@
     <test name="AssertsTest">
         <annotations>
             <features value="SampleTests"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
 
         <createData entity="Simple_US_Customer" stepKey="createData2"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
index cf0ea0225a4b1..d759d1ab27498 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
@@ -12,7 +12,9 @@
         <annotations>
             <features value="SampleTests"/>
             <stories value="Create a Configurable Product By API"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <before>
             <createData stepKey="categoryHandle" entity="SimpleSubCategory" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml
index 8e9336dd6f149..8cd83fd62067f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateSalesRuleByApiTest.xml
@@ -12,7 +12,9 @@
         <annotations>
             <features value="SampleTests"/>
             <stories value="Create a Sales Rule By API"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <before>
             <createData stepKey="saleRule" entity="SimpleSalesRule" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml
index b809ab89cba52..6a196c2c32c02 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/PersistMultipleEntitiesTest.xml
@@ -11,7 +11,9 @@
     <test name="PersistMultipleEntitiesTest">
         <annotations>
             <features value="SampleTests"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="simplesubcategory" stepKey="simplecategory"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml
index 1bc6bd1865f7c..f908c5cb4572e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SetPaymentConfigurationTest.xml
@@ -11,7 +11,9 @@
     <test name="SetPaypalConfigurationTest">
         <annotations>
             <features value="SampleTests"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <createData entity="SamplePaypalConfig" stepKey="createSamplePaypalConfig"/>
         <createData entity="DefaultPayPalConfig" stepKey="restoreDefaultPaypalConfig"/>
@@ -19,7 +21,9 @@
     <test name="SetBraintreeConfigurationTest">
         <annotations>
             <features value="SampleTests"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <createData entity="SampleBraintreeConfig" stepKey="createSampleBraintreeConfig"/>
         <createData entity="DefaultBraintreeConfig" stepKey="restoreDefaultBraintreeConfig"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml
index fbf203834b45e..b18c24050d3a6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/UpdateSimpleProductByApiTest.xml
@@ -11,7 +11,9 @@
         <annotations>
             <features value="SampleTests"/>
             <stories value="Update simple product by api test."/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="SAMPLE"/>
+            </skip>
         </annotations>
         <before>
             <createData stepKey="categoryHandle" entity="SimpleSubCategory"/>