commit 7ebad47d0569de4505ce99283abe77175ed81af1
author Julien Herr <julien@herr.fr> Fri Oct 23 23:01:43 2015 +0200
committer Julien Herr <julien@herr.fr> Sat Oct 24 00:15:16 2015 +0200
tree 2b6379ab0d248cab5c7325555d185898ef51e2c5
parent 88f474ecfd2b28ac01582ff0ea811a02d41ab04c

Fix #834: Nested suites not supported by 'testnames'

src/main/java/org/testng/TestNG.java

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 6cb522a..6becc09 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -416,6 +416,8 @@
    * original suite.
    */
   private static XmlSuite extractTestNames(XmlSuite s, List<String> testNames) {
+    extractTestNamesFromChildSuites(s, testNames);
+
     List<XmlTest> tests = Lists.newArrayList();
     for (XmlTest xt : s.getTests()) {
       for (String tn : testNames) {
@@ -436,6 +438,18 @@
     }
   }
 
+  private static void extractTestNamesFromChildSuites(XmlSuite s, List<String> testNames) {
+    List<XmlSuite> childSuites = s.getChildSuites();
+    for (int i = 0; i < childSuites.size(); i++) {
+      XmlSuite child = childSuites.get(i);
+      XmlSuite extracted = extractTestNames(child, testNames);
+      // if a new xml suite is created, which means some tests was extracted, then we replace the child
+      if (extracted != child) {
+        childSuites.set(i, extracted);
+      }
+    }
+  }
+
   /**
    * Define the number of threads in the thread pool.
    */
@@ -981,13 +995,13 @@
   private void checkSuiteNamesInternal(List<XmlSuite> suites, Set<String> names) {
     for (XmlSuite suite : suites) {
       final String name = suite.getName();
-      
+
       int count = 0;
       String tmpName = name;
       while (names.contains(tmpName)) {
         tmpName = name + " (" + count++ + ")";
       }
- 
+
       if (count > 0) {
         suite.setName(tmpName);
         names.add(tmpName);
@@ -1603,7 +1617,7 @@
             result.suiteThreadPoolSize=(Integer) suiteThreadPoolSize;
         }
     }
-    
+
     configure(result);
   }