X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-automation%2FTestNg-UI-half.xml;h=fe192da6e2b52020a8e2adbde8387a257d1695b8;hb=HEAD;hp=025bd3f7df18968b773d77f5f78023ba9701140b;hpb=91b057331b92ecf7f3c2d495681b05295dc8346c;p=vid.git

diff --git a/vid-automation/TestNg-UI-half.xml b/vid-automation/TestNg-UI-half.xml
index 025bd3f7d..fe192da6e 100644
--- a/vid-automation/TestNg-UI-half.xml
+++ b/vid-automation/TestNg-UI-half.xml
@@ -2,7 +2,7 @@
 
 <suite verbose="1" name="VID UI Tests" annotations="JDK">
     <listeners>
-        <listener class-name="vid.automation.test.infra.FeatureTogglingTestngTransformer"/>
+        <listener class-name="vid.automation.test.infra.SkipTestsTestngTransformer"/>
     </listeners>
     <test name="test">
         <method-selectors>
@@ -18,18 +18,21 @@
                         };
                         String [] classes2 = new String [] {
                             "vid.automation.test.test.AddNetworkTest",
-                            "vid.automation.test.test.ALaCarteflowTest",
-                            "vid.automation.test.test.AssociatePnfTest",
                             "vid.automation.test.test.BrowseASDCTest",
                             "vid.automation.test.test.ChangeManagementTest",
-                            "vid.automation.test.test.CreateNewInstanceTest",
-                            "vid.automation.test.test.CreatePortMirroringConfigurationTest"
+                            "vid.automation.test.test.ALaCarteflowTest",
+                            "vid.automation.test.test.VlanTagSubInterfaceTest",
+                            "vid.automation.test.test.CreatePortMirroringConfigurationTest",
+                            "vid.automation.test.test.CreateNewInstanceTest"
                         };
+
                         String [] classes3 = new String [] {
-                            "vid.automation.test.test.DrawingBoardTest"
+                            "vid.automation.test.test.NewServiceInstanceTest"
                         };
+
                         String [] classes4 = new String [] {
-                            "vid.automation.test.test.NewServiceInstanceTest"
+                            "vid.automation.test.test.DrawingBoardTest",
+                            "vid.automation.test.test.ViewEditServiceInstanceTest"
                         };
 
                         int selectPart = 0;
@@ -40,6 +43,16 @@
 
                         if (selectPart == 0) return true;
 
+                        for (groupName: groups.keySet()) {
+                            // There's a non-obvious case here:
+                            // If there's a "partialGroup" group, and it is *not* for current `selectPart` then
+                            // don't run the test -- even if it is in a Class which does belong to the `selectPart`
+                            // classes list
+                            if (groupName.startsWith("partialGroup_")) {
+                                return groupName.equals("partialGroup_" + selectPart);
+                            }
+                        }
+
                         methodClass = method.getDeclaringClass().toString();
                         for (c: classes2) {
                             if (methodClass.contains(c)) return selectPart==2;
@@ -56,31 +69,9 @@
                 </script>
             </method-selector>
         </method-selectors>
-        <groups>
-            <run>
-                <!-- These tests are legacy tests that should be converted from
-                working against IST to working against vid's 3rd party simulator-->
-                <exclude name="shouldBeMigratedToWorkWithSimulator"/>
-
-                <!-- These tests require the settings in asdc.properties to be like
-                asdc.client.type=LOCAL so cannot run on pipeline-->
-                <exclude name="worksOnlyWithLocalASDC"/>
-
-                <!-- these tests call to MaintenanceController which is restricted to
-                localhost, so it can not run on jenkins pipeline -->
-                <exclude name="worksOnlyWithLocalhostVID"/>
-
-                <!-- angular2 is not supported in CI yet. These tests can run only on
-                developers environment -->
-                <exclude name="Angular2Tests"/>
-
-                <!-- tests and features that are still under development but are pushed to develop -->
-                <exclude name="underDevelopment"/>
 
-            </run>
-        </groups>
         <packages>
             <package name="vid.automation.test.test.*"/>
         </packages>
     </test>
-</suite>
\ No newline at end of file
+</suite>