This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag OpenBSD in repository testng.
commit cf3f9f7f67e95df3e7668a67ffaf00ffdaae1e4b Author: Cedric Beust <[email protected]> Date: Fri Jan 9 11:39:01 2015 -0800 group-by-instances in toXml(). --- src/main/java/org/testng/xml/XmlSuite.java | 20 +++++++++++--------- src/main/java/org/testng/xml/XmlTest.java | 18 +++++++++++------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/testng/xml/XmlSuite.java b/src/main/java/org/testng/xml/XmlSuite.java index 61612eb..bdcc3e5 100755 --- a/src/main/java/org/testng/xml/XmlSuite.java +++ b/src/main/java/org/testng/xml/XmlSuite.java @@ -1,7 +1,12 @@ package org.testng.xml; -import static org.testng.collections.CollectionUtils.hasElements; -import static org.testng.internal.Utils.isStringNotEmpty; +import java.io.Serializable; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import org.testng.ITestObjectFactory; import org.testng.TestNG; @@ -12,13 +17,8 @@ import org.testng.xml.dom.OnElement; import org.testng.xml.dom.OnElementList; import org.testng.xml.dom.Tag; -import java.io.Serializable; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import static org.testng.collections.CollectionUtils.hasElements; +import static org.testng.internal.Utils.isStringNotEmpty; /** * This class describes the tag <suite> in testng.xml. @@ -439,6 +439,8 @@ public class XmlSuite implements Serializable, Cloneable { if(isStringNotEmpty(parallel) && !DEFAULT_PARALLEL.equals(parallel)) { p.setProperty("parallel", parallel); } + XmlUtils.setProperty(p, "group-by-instances", String.valueOf(getGroupByInstances()), + DEFAULT_GROUP_BY_INSTANCES.toString()); XmlUtils.setProperty(p, "configfailurepolicy", getConfigFailurePolicy(), DEFAULT_CONFIG_FAILURE_POLICY); XmlUtils.setProperty(p, "thread-count", String.valueOf(getThreadCount()), diff --git a/src/main/java/org/testng/xml/XmlTest.java b/src/main/java/org/testng/xml/XmlTest.java index 06abec1..cbc8c12 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 org.testng.TestNG; -import org.testng.TestNGException; -import org.testng.collections.Lists; -import org.testng.collections.Maps; -import org.testng.reporters.XMLStringBuffer; -import org.testng.xml.dom.ParentSetter; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -14,6 +7,13 @@ 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; +import org.testng.collections.Maps; +import org.testng.reporters.XMLStringBuffer; +import org.testng.xml.dom.ParentSetter; + /** * This class describes the tag <test> in testng.xml. * @@ -477,6 +477,10 @@ public class XmlTest implements Serializable, Cloneable { if (m_threadCount != -1) { p.setProperty("thread-count", Integer.toString(m_threadCount)); } + if (m_groupByInstances != null) { + XmlUtils.setProperty(p, "group-by-instances", String.valueOf(getGroupByInstances()), + XmlSuite.DEFAULT_GROUP_BY_INSTANCES.toString()); + } xsb.push("test", p); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
