MAGETWO-55066: Reviewed and updated variations and constraints.

(cherry picked from commit 85a0dde)

Author: jilu1

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php

@@ -27,6 +27,7 @@ class CreateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = 'extended_acceptance_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.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\Cms\Test\TestCase\CreateCmsBlockEntityTest" summary="Create CMS Block" ticketId="MAGETWO-25578">
         <variation name="CreateCmsBlockEntityTestVariation1">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
             <data name="cmsBlock/data/title" xsi:type="string">block_%isolation%</data>
             <data name="cmsBlock/data/identifier" xsi:type="string">identifier_%isolation%</data>
@@ -19,13 +20,13 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockOnCategoryPage" />
         </variation>
         <variation name="CreateCmsBlockEntityTestVariation2">
+            <data name="tag" xsi:type="string">severity:S2</data>
             <data name="cmsBlock/data/title" xsi:type="string">block_%isolation%</data>
             <data name="cmsBlock/data/identifier" xsi:type="string">identifier_%isolation%</data>
             <data name="cmsBlock/data/stores/dataset/option_0" xsi:type="string">default</data>
             <data name="cmsBlock/data/is_active" xsi:type="string">No</data>
             <data name="cmsBlock/data/content" xsi:type="string">description_%isolation%</data>
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockSuccessSaveMessage" />
-            <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockInGrid" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotOnCategoryPage" />
         </variation>
     </testCase>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php

@@ -29,6 +29,7 @@ class CreateCmsPageEntityTest extends Injectable
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml

@@ -8,18 +8,20 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityTest" summary="Create Cms Page" ticketId="MAGETWO-25580">
         <variation name="CreateCmsPageEntityTestVariation1" summary="Create CMS Content Page" ticketId="MAGETWO-12399">
+            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="fixtureType" xsi:type="string">cmsPage</data>
             <data name="data/is_active" xsi:type="string">Yes</data>
             <data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
             <data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
             <data name="data/store_id" xsi:type="string">All Store Views</data>
             <data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
         </variation>
         <variation name="CreateCmsPageEntityTestVariation2" summary="Create page for default store view">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="fixtureType" xsi:type="string">cmsPage</data>
             <data name="data/is_active" xsi:type="string">Yes</data>
             <data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
@@ -30,6 +32,7 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
         </variation>
         <variation name="CreateCmsPageEntityTestVariation3" summary="Create page with widget and system variable">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="fixtureType" xsi:type="string">cmsPage</data>
             <data name="data/is_active" xsi:type="string">Yes</data>
             <data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
@@ -39,20 +42,17 @@
             <data name="data/content/widget/dataset" xsi:type="string">default</data>
             <data name="data/content/variable" xsi:type="string">General Contact Name</data>
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
-            <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
-            <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
         </variation>
         <variation name="CreateCmsPageEntityTestVariation4" summary="Create disabled page">
+            <data name="tag" xsi:type="string">severity:S3</data>
             <data name="fixtureType" xsi:type="string">cmsPage</data>
             <data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
             <data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
             <data name="data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="data/is_active" xsi:type="string">No</data>
             <data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
-            <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
-            <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsPageDisabledOnFrontend" />
         </variation>
     </testCase>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php

@@ -33,6 +33,7 @@ class CreateCmsPageRewriteEntityTest extends Injectable
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = 'extended_acceptance_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.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\Cms\Test\TestCase\CreateCmsPageRewriteEntityTest" summary="Create CMS Page URL Rewrites" ticketId="MAGETWO-24847">
         <variation name="CreateCmsPageRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
@@ -19,6 +20,7 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
         </variation>
         <variation name="CreateCmsPageRewriteEntityTestVariation2">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.html</data>
@@ -29,6 +31,7 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
         </variation>
         <variation name="CreateCmsPageRewriteEntityTestVariation3">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.htm</data>
@@ -39,6 +42,7 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
         </variation>
         <variation name="CreateCmsPageRewriteEntityTestVariation4">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.aspx</data>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml

@@ -8,25 +8,25 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateCustomUrlRewriteEntityTest" summary="Create Custom URL Rewrites" ticketId="MAGETWO-25474">
         <variation name="CreateCustomUrlRewriteEntityTestVariation3">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">cms_page_request_path%isolation%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">No</data>
             <data name="urlRewrite/data/description" xsi:type="string">test description_full path</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
-            <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteInGrid" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCustomRedirect" />
         </variation>
         <variation name="CreateCustomUrlRewriteEntityTestVariation4">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">cms_page_request_path%isolation%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">Temporary (302)</data>
             <data name="urlRewrite/data/description" xsi:type="string">test description_full path</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
-            <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteInGrid" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCustomRedirect" />
         </variation>
     </testCase>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php

@@ -31,6 +31,7 @@ class DeleteCmsBlockEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.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\Cms\Test\TestCase\DeleteCmsBlockEntityTest" summary="Delete CMS Block" ticketId="MAGETWO-25698">
         <variation name="DeleteCmsBlockEntityTestVariation1">
+            <data name="tag" xsi:type="string">severity:S1</data>
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockDeleteMessage" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotInGrid" />
             <constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotOnCategoryPage" />

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php

@@ -29,6 +29,7 @@ class DeleteCmsPageEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**