This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag testng-6.9.5 in repository testng.
commit 62945e0691b278e932affc230547a3d6f1dfa7f3 Author: Julien Herr <[email protected]> Date: Fri Jun 12 14:39:08 2015 +0200 Test each parallel mode --- src/test/java/test/timeout/TimeOutTest.java | 34 +++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/test/java/test/timeout/TimeOutTest.java b/src/test/java/test/timeout/TimeOutTest.java index 46ce74b..7d9ff5d 100644 --- a/src/test/java/test/timeout/TimeOutTest.java +++ b/src/test/java/test/timeout/TimeOutTest.java @@ -1,8 +1,11 @@ package test.timeout; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.testng.xml.XmlSuite; +import java.util.Iterator; + import test.BaseTest; @@ -18,10 +21,10 @@ public class TimeOutTest extends BaseTest { m_id = System.currentTimeMillis(); } - private void privateTimeOutTest(boolean parallel) { + private void privateTimeOutTest(String parallel) { addClass("test.timeout.TimeOutSampleTest"); - if (parallel) { - setParallel(XmlSuite.PARALLEL_METHODS); + if (parallel != null) { + setParallel(parallel); } run(); String[] passed = { @@ -37,14 +40,31 @@ public class TimeOutTest extends BaseTest { verifyTests("Failed", failed, getFailedTests()); } - @Test - public void timeOutInParallel() { - privateTimeOutTest(true); + @DataProvider(name = "parallelModes") + public Iterator<Object[]> createData() { + final Iterator<String> parallelModes = XmlSuite.PARALLEL_MODES.iterator(); + return new Iterator<Object[]>() { + @Override + public boolean hasNext() { + return parallelModes.hasNext(); + } + + @Override + public Object[] next() { + return new Object[]{ parallelModes.next() }; + } + }; + } + + + @Test(dataProvider = "parallelModes") + public void timeOutInParallel(String parallelMode) { + privateTimeOutTest(parallelMode); } @Test public void timeOutInNonParallel() { - privateTimeOutTest(false); + privateTimeOutTest(null); } @Test -- 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
