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

diff --git a/vid-automation/TestNg-UI-half.xml b/vid-automation/TestNg-UI-half.xml
index b19073869..fe192da6e 100644
--- a/vid-automation/TestNg-UI-half.xml
+++ b/vid-automation/TestNg-UI-half.xml
@@ -2,8 +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.SkipTestUntilTestngTransformer"/>
+        <listener class-name="vid.automation.test.infra.SkipTestsTestngTransformer"/>
     </listeners>
     <test name="test">
         <method-selectors>
@@ -23,12 +22,12 @@
                             "vid.automation.test.test.ChangeManagementTest",
                             "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.NewServiceInstanceTest",
-                            "vid.automation.test.test.CreatePortMirroringConfigurationTest"
+                            "vid.automation.test.test.NewServiceInstanceTest"
                         };
 
                         String [] classes4 = new String [] {
@@ -44,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;