Merge pull request #3200 from YutingZhang-A/support-to-execlude-somes-test-in-option-of-command-line

juherr · web-flow · commit e162179c22ad · 2025-01-09T18:43:13.000+01:00
Support excluding some tests in the option of command line
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,6 +6,7 @@ Fixed: GITHUB-3122: Update JCommander to 1.83 (Antoine Dessaigne)
 Fixed: GITHUB-3135: assertEquals on arrays - Failure message is missing information about the array index when an array element is unexpectedly null or non-null (Albert Choi)
 Fixed: GITHUB-3140: assertEqualsDeep on Sets - Deep comparison was using the wrong expected value
 Fixed: GITHUB-3189: Incorrect number of ignored tests displayed in the XML results
+Fixed: GITHUB-3196: support to execlude somes tests in option of command line
 
 7.10.2
 Fixed: GITHUB-3117: ListenerComparator doesn't work (Krishnan Mahadevan)
diff --git a/README.md b/README.md
@@ -142,4 +142,4 @@ gpg: Good signature from "Krishnan Mahadevan (krmahadevan-key) <krishnan.mahadev
 For more details regarding keys please refer:
 
 * [Verifying Signature](https://infra.apache.org/release-signing.html#verifying-signature)
-* [How to Trust Imported GPG Keys](https://classroom.anir0y.in/post/blog-how-to-trust-imported-gpg-keys/)
+* [How to Trust Imported GPG Keys](https://classroom.anir0y.in/post/blog-how-to-trust-imported-gpg-keys/)
diff --git a/testng-core-api/src/main/java/org/testng/xml/XmlTest.java b/testng-core-api/src/main/java/org/testng/xml/XmlTest.java
@@ -1,6 +1,7 @@
 package org.testng.xml;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import org.testng.TestNGException;
 import org.testng.collections.Lists;
 import org.testng.collections.Maps;
@@ -624,6 +625,15 @@ public XmlGroups getXmlGroups() {
    * @return <code>true</code> if the current test's name matches with any of the given names.
    */
   public boolean nameMatchesAny(List<String> names) {
-    return names.contains(getName());
+    return names.contains(getName())
+        || names.stream()
+            .anyMatch(
+                regex -> {
+                  if (regex.startsWith("/") && regex.endsWith("/")) {
+                    String trimmedRegex = regex.substring(1, regex.length() - 1);
+                    return Pattern.matches(trimmedRegex, getName());
+                  }
+                  return false;
+                });
   }
 }
diff --git a/testng-core/src/main/java/org/testng/xml/internal/TestNamesMatcher.java b/testng-core/src/main/java/org/testng/xml/internal/TestNamesMatcher.java
@@ -1,6 +1,7 @@
 package org.testng.xml.internal;
 
 import java.util.List;
+import java.util.regex.Pattern;
 import org.testng.TestNGException;
 import org.testng.collections.Lists;
 import org.testng.log4testng.Logger;
@@ -89,7 +90,18 @@ public boolean validateMissMatchedTestNames() {
   public List<String> getMissedTestNames() {
     List<String> missedTestNames = Lists.newArrayList();
     missedTestNames.addAll(testNames);
-    missedTestNames.removeIf(matchedTestNames::contains);
+    missedTestNames.removeIf(
+        regex ->
+            matchedTestNames.contains(regex)
+                || matchedTestNames.stream()
+                    .anyMatch(
+                        name -> {
+                          if (regex.startsWith("/") && regex.endsWith("/")) {
+                            String trimmedRegex = regex.substring(1, regex.length() - 1);
+                            return Pattern.matches(trimmedRegex, name);
+                          }
+                          return false;
+                        }));
     return missedTestNames;
   }
 
diff --git a/testng-core/src/test/java/org/testng/xml/XmlTestTest.java b/testng-core/src/test/java/org/testng/xml/XmlTestTest.java
@@ -20,6 +20,14 @@ public void testNameMatchesAny() {
     assertThat(xmlTest.nameMatchesAny(Collections.singletonList("test2"))).isFalse();
   }
 
+  @Test(description = "GITHUB-3196")
+  public void testNameMatchesAnyWithRegex() {
+    XmlSuite xmlSuite = createDummySuiteWithTestNamesAs("test1");
+    XmlTest xmlTest = xmlSuite.getTests().get(0);
+    assertThat(xmlTest.nameMatchesAny(Collections.singletonList("/^(test1$).*/"))).isTrue();
+    assertThat(xmlTest.nameMatchesAny(Collections.singletonList("/^(?!test1$).*/"))).isFalse();
+  }
+
   @Test(dataProvider = "dp", description = "GITHUB-1716")
   public void testNullOrEmptyParameter(Map<String, String> data) {
     XmlTest test = createXmlTest("suite", "test", Issue1716TestSample.class);
diff --git a/testng-core/src/test/java/test/methodselectors/CommandLineTest.java b/testng-core/src/test/java/test/methodselectors/CommandLineTest.java
@@ -170,6 +170,27 @@ public void testOverrideExcludedMethodsSuiteExclusions() {
     verifyTests("Failed", failed, tla.getFailedTests());
   }
 
+  @Test(description = "GITHUB-2407")
+  public void testSpecificTestNamesWithRegexCommandLineExclusions() {
+    String[] args =
+        new String[] {
+          "src/test/resources/testnames/main-suite.xml",
+          "-log",
+          "0",
+          "-d",
+          OutputDirectoryPatch.getOutputDirectory(),
+          "-testnames",
+          "/^testGroup1.*/"
+        };
+
+    TestNG.privateMain(args, tla);
+
+    String[] passed = {"sampleOutputTest1"};
+    String[] failed = {};
+    verifyTests("Passed", passed, tla.getPassedTests());
+    verifyTests("Failed", failed, tla.getFailedTests());
+  }
+
   private void verifyTests(String title, String[] expected, List<ITestResult> found) {
 
     Assertions.assertThat(found.stream().map(ITestResult::getName).toArray(String[]::new))
