Merge branch 'master' of git://github.com/cbeust/testng

testng-team · Jul 6, 2010 · bd52e4e · bd52e4e
2 parents 3ea3d26 + b519fa0
commit bd52e4e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/org/testng/xml/XmlClass.java b/src/org/testng/xml/XmlClass.java
@@ -135,13 +135,9 @@ public String toXml(String indent) {
       xsb.push("methods");
 
       for (XmlInclude m : getIncludedMethods()) {
-        Properties p = new Properties();
-        p.setProperty("name", m.getName());
-        if (m.getInvocationNumbers().size() > 0) {
-          p.setProperty("invocation-numbers", listToString(m.getInvocationNumbers()).toString());
-        }
-        xsb.addEmptyElement("include", p);
+        xsb.getStringBuffer().append(m.toXml(indent + "    "));
       }
+
       for (String m: getExcludedMethods()) {
         Properties p= new Properties();
         p.setProperty("name", m);
@@ -154,13 +150,12 @@ public String toXml(String indent) {
     else {
       xsb.addEmptyElement("class", pro);
     }
-
 
     return xsb.toXML();
 
   }
 
-  private String listToString(List<Integer> invocationNumbers) {
+  public static String listToString(List<Integer> invocationNumbers) {
     StringBuilder result = new StringBuilder();
     int i = 0;
     for (Integer n : invocationNumbers) {

diff --git a/src/org/testng/xml/XmlInclude.java b/src/org/testng/xml/XmlInclude.java
@@ -2,6 +2,9 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Properties;
+
+import org.testng.reporters.XMLStringBuffer;
 
 import com.google.inject.internal.Lists;
 
@@ -36,4 +39,15 @@ public int getIndex() {
     return m_index;
   }
 
+  public String toXml(String indent) {
+    XMLStringBuffer xsb = new XMLStringBuffer(indent);
+    Properties p = new Properties();
+    p.setProperty("name", getName());
+    if (getInvocationNumbers().size() > 0) {
+      p.setProperty("invocation-numbers", XmlClass.listToString(getInvocationNumbers()).toString());
+    }
+    xsb.addEmptyElement("include", p);
+
+    return xsb.toXML();
+  }
 }
diff --git a/test/testng-single.xml b/test/testng-single.xml
@@ -26,7 +26,7 @@
     </groups>
     <parameter name="count" value="10"/>
     <classes>
-      <class name="test.preserveorder.PreserveOrderTest" />
+      <class name="test.tmp.TestFactory" />
 <!-- 
       <class name="test.tmp.A" />
       <class name="test.thread.MultiThreadedDependentTest" />