commit 89c030a62862d962f4dd8b47a62a32e27a4818df
author Cedric Beust <cedric@beust.com> Tue Jul 10 06:57:22 2012 -0700
committer Cedric Beust <cedric@beust.com> Tue Jul 10 06:57:22 2012 -0700
tree 9a53f199a2fc84300cfdda0996e51c8f982a17a8
parent 2fc90467f1388cdc683d918d82bb34854336a8c5

XDom changes.

src/main/java/org/testng/xml/XmlSuite.java

diff --git a/src/main/java/org/testng/xml/XmlSuite.java b/src/main/java/org/testng/xml/XmlSuite.java
index 0367d3f..b799b77 100755
--- a/src/main/java/org/testng/xml/XmlSuite.java
+++ b/src/main/java/org/testng/xml/XmlSuite.java
@@ -911,6 +911,7 @@
     if (m_xmlGroups != null) {
       return m_xmlGroups.getRun().getIncludes();
     } else {
+      // deprecated
       return m_includedGroups;
     }
   }

src/main/java/org/testng/xml/XmlTest.java

diff --git a/src/main/java/org/testng/xml/XmlTest.java b/src/main/java/org/testng/xml/XmlTest.java
index 512cae2..ff8ee96 100755
--- a/src/main/java/org/testng/xml/XmlTest.java
+++ b/src/main/java/org/testng/xml/XmlTest.java
@@ -1,12 +1,5 @@
 package org.testng.xml;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-
 import org.testng.TestNG;
 import org.testng.TestNGException;
 import org.testng.collections.Lists;
@@ -14,6 +7,13 @@
 import org.testng.reporters.XMLStringBuffer;
 import org.testng.xml.dom.ParentSetter;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
 /**
  * This class describes the tag <test>  in testng.xml.
  *
@@ -125,8 +125,15 @@
    * Note: do not modify the returned value, use {@link #addIncludedGroup(String)}.
    */
   public List<String> getIncludedGroups() {
-    List<String> result = Lists.newArrayList(m_includedGroups);
-    result.addAll(m_suite.getIncludedGroups());
+    List<String> result;
+    if (m_xmlGroups != null) {
+      result = m_xmlGroups.getRun().getIncludes();
+      result.addAll(m_suite.getIncludedGroups());
+    } else {
+      // deprecated
+      result = Lists.newArrayList(m_includedGroups);
+      result.addAll(m_suite.getIncludedGroups());
+    }
     return result;
   }
 
@@ -850,4 +857,10 @@
   public void setXmlSuite(XmlSuite suite) {
 	  m_suite = suite;
   }
+
+  private XmlGroups m_xmlGroups;
+
+  public void setGroups(XmlGroups xmlGroups) {
+    m_xmlGroups = xmlGroups;
+  }
 }

src/main/java/org/testng/xml/dom/XDom.java

diff --git a/src/main/java/org/testng/xml/dom/XDom.java b/src/main/java/org/testng/xml/dom/XDom.java
index 6971260..dbf347c 100644
--- a/src/main/java/org/testng/xml/dom/XDom.java
+++ b/src/main/java/org/testng/xml/dom/XDom.java
@@ -364,7 +364,7 @@
   private static void testNoPackage(XmlTest t) {
     Assert.assertEquals(t.getThreadCount(), 42);
     Assert.assertTrue(t.getAllowReturnValues());
-    Assert.assertEquals(t.getIncludedGroups(), Arrays.asList("includeThisGroup"));
+    Assert.assertEquals(t.getIncludedGroups(), Arrays.asList("nopackage", "includeThisGroup"));
     Assert.assertEquals(t.getExcludedGroups(), Arrays.asList("excludeThisGroup"));
   }
 }