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 f5360f05ad32cfe4e268cea68d7b8804407429d1 Author: Julien Herr <[email protected]> Date: Fri Jun 12 16:00:17 2015 +0200 Rework timeout tests --- src/test/java/test/BaseTest.java | 8 +++ .../test/timeout/InvocationTimeOutSampleTest.java | 10 ++- .../java/test/timeout/TestTimeOutSampleTest.java | 5 +- src/test/java/test/timeout/TimeOutFromXmlTest.java | 78 ++++++++++------------ src/test/java/test/timeout/TimeOutSample2Test.java | 10 +-- src/test/java/test/timeout/TimeOutSampleTest.java | 12 ++-- src/test/java/test/timeout/TimeOutTest.java | 53 ++------------- 7 files changed, 65 insertions(+), 111 deletions(-) diff --git a/src/test/java/test/BaseTest.java b/src/test/java/test/BaseTest.java index 6f01103..4898ae8 100644 --- a/src/test/java/test/BaseTest.java +++ b/src/test/java/test/BaseTest.java @@ -374,6 +374,14 @@ public class BaseTest extends BaseDistributedTest { Assert.assertEqualsNoOrder(actualNames.toArray(), expected); } + protected void verifyPassedTests(String... expectedPassed) { + verifyTests("Passed", expectedPassed, getPassedTests()); + } + + protected void verifyFailedTests(String... expectedFailed) { + verifyTests("Failed", expectedFailed, getFailedTests()); + } + /** * * @param fileName The filename to parse diff --git a/src/test/java/test/timeout/InvocationTimeOutSampleTest.java b/src/test/java/test/timeout/InvocationTimeOutSampleTest.java index bc37193..75c8f24 100644 --- a/src/test/java/test/timeout/InvocationTimeOutSampleTest.java +++ b/src/test/java/test/timeout/InvocationTimeOutSampleTest.java @@ -4,22 +4,20 @@ import org.testng.annotations.Test; public class InvocationTimeOutSampleTest { - @Test(invocationCount = 5, invocationTimeOut = 2000) + @Test(invocationCount = 5, invocationTimeOut = 2_000) public void shouldPass() { try { Thread.sleep(250); - } - catch (InterruptedException handled) { + } catch (InterruptedException handled) { Thread.currentThread().interrupt(); } } - @Test(invocationCount = 5, invocationTimeOut = 1000) + @Test(invocationCount = 5, invocationTimeOut = 1_000) public void shouldFail() { try { Thread.sleep(250); - } - catch (InterruptedException handled) { + } catch (InterruptedException handled) { Thread.currentThread().interrupt(); } } diff --git a/src/test/java/test/timeout/TestTimeOutSampleTest.java b/src/test/java/test/timeout/TestTimeOutSampleTest.java index bfdf31d..c92a510 100644 --- a/src/test/java/test/timeout/TestTimeOutSampleTest.java +++ b/src/test/java/test/timeout/TestTimeOutSampleTest.java @@ -7,10 +7,9 @@ public class TestTimeOutSampleTest { @Test public void timeoutTest() { try { - Thread.sleep(2000); + Thread.sleep(2_000); } catch (InterruptedException handled) { - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); } -// System.out.println("Finished normally"); } } diff --git a/src/test/java/test/timeout/TimeOutFromXmlTest.java b/src/test/java/test/timeout/TimeOutFromXmlTest.java index 15f21a5..7b373e6 100644 --- a/src/test/java/test/timeout/TimeOutFromXmlTest.java +++ b/src/test/java/test/timeout/TimeOutFromXmlTest.java @@ -1,9 +1,7 @@ package test.timeout; -import org.testng.Assert; -import org.testng.TestListenerAdapter; -import org.testng.TestNG; import org.testng.annotations.Test; +import org.testng.xml.SuiteXmlParser; import org.testng.xml.XmlClass; import org.testng.xml.XmlInclude; import org.testng.xml.XmlSuite; @@ -11,31 +9,25 @@ import org.testng.xml.XmlTest; import test.BaseTest; +import java.io.FileInputStream; +import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; public class TimeOutFromXmlTest extends BaseTest { private void timeOutTest(boolean onSuite) { - addClass("test.timeout.TestTimeOutSampleTest"); + addClass(TestTimeOutSampleTest.class); if (onSuite) { - setSuiteTimeOut(1000); + setSuiteTimeOut(1_000); } else { - setTestTimeOut(1000); + setTestTimeOut(1_000); } run(); - String[] passed = { - }; - String[] failed = { - "timeoutTest" - }; -// dumpResults("Passed", getPassedTests()); -// dumpResults("Failed", getFailedTests()); - - verifyTests("Passed", passed, getPassedTests()); - verifyTests("Failed", failed, getFailedTests()); + verifyPassedTests(); + verifyFailedTests("timeoutTest"); } @Test @@ -50,16 +42,11 @@ public class TimeOutFromXmlTest extends BaseTest { @Test public void noTimeOut() { - addClass("test.timeout.TestTimeOutSampleTest"); + addClass(TestTimeOutSampleTest.class); run(); - String[] passed = { - "timeoutTest" - }; - String[] failed = { - }; - - verifyTests("Passed", passed, getPassedTests()); - verifyTests("Failed", failed, getFailedTests()); + + verifyPassedTests("timeoutTest"); + verifyFailedTests(); } @Test @@ -68,19 +55,13 @@ public class TimeOutFromXmlTest extends BaseTest { result.setName("Suite"); createXmlTest(result, "WithoutTimeOut"); - createXmlTest(result, "WithTimeOut").setTimeOut(1000); - - TestNG tng = new TestNG(); - tng.setVerbose(0); - tng.setXmlSuites(Arrays.asList(new XmlSuite[] { result })); - TestListenerAdapter tla = new TestListenerAdapter(); - tng.addListener(tla); - tng.run(); - -// System.out.println("Passed:" + tla.getPassedTests().size() -// + " Failed:" + tla.getFailedTests().size()); - Assert.assertEquals(tla.getPassedTests().size(), 1); - Assert.assertEquals(tla.getFailedTests().size(), 1); + createXmlTest(result, "WithTimeOut").setTimeOut(1_000); + + setSuite(result); + run(); + + verifyPassedTests("timeoutTest"); + verifyFailedTests("timeoutTest"); } private XmlTest createXmlTest(XmlSuite suite, String name) { @@ -89,9 +70,24 @@ public class TimeOutFromXmlTest extends BaseTest { List<XmlClass> classes = new ArrayList<>(); XmlClass cls = new XmlClass(TestTimeOutSampleTest.class); cls.setIncludedMethods( - Arrays.asList(new XmlInclude[] { new XmlInclude("timeoutTest") })); + Collections.singletonList(new XmlInclude("timeoutTest"))); classes.add(cls); result.setXmlClasses(classes); return result; - }} + } + + @Test + public void timeOutInParallelTestsFromXml() throws IOException { + String file = "src/test/java/test/timeout/issue575.xml"; + try (FileInputStream stream = new FileInputStream(file)) { + SuiteXmlParser suiteParser = new SuiteXmlParser(); + XmlSuite suite = suiteParser.parse(file, stream, true); + setSuite(suite); + run(); + + verifyPassedTests("timeoutShouldPass"); + verifyFailedTests("timeoutShouldFailByException", "timeoutShouldFailByTimeOut"); + } + } +} diff --git a/src/test/java/test/timeout/TimeOutSample2Test.java b/src/test/java/test/timeout/TimeOutSample2Test.java index b3f7b4d..b5ecded 100644 --- a/src/test/java/test/timeout/TimeOutSample2Test.java +++ b/src/test/java/test/timeout/TimeOutSample2Test.java @@ -7,13 +7,9 @@ import org.testng.annotations.Test; * @author cbeust */ public class TimeOutSample2Test { - @Test(timeOut = 1500) - public void timeoutShouldFailByTimeOut() throws InterruptedException { - Thread.sleep(10 * 1000); - } - public static void ppp(String s) { - System.out.println("[TimeOutTest]@@@@@@@@@@@@@@@ " + s); + @Test(timeOut = 1_500) + public void timeoutShouldFailByTimeOut() throws InterruptedException { + Thread.sleep(10_000); } - } diff --git a/src/test/java/test/timeout/TimeOutSampleTest.java b/src/test/java/test/timeout/TimeOutSampleTest.java index b9dfbca..3e3a037 100644 --- a/src/test/java/test/timeout/TimeOutSampleTest.java +++ b/src/test/java/test/timeout/TimeOutSampleTest.java @@ -9,21 +9,17 @@ import org.testng.annotations.Test; */ public class TimeOutSampleTest { - @Test(timeOut = 5000 /* 5 seconds */) + @Test(timeOut = 5_000 /* 5 seconds */) public void timeoutShouldPass() { } - @Test(timeOut = 5 * 1000 /* 5 seconds */) + @Test(timeOut = 5_000 /* 5 seconds */) public void timeoutShouldFailByException() { throw new RuntimeException("EXCEPTION SHOULD MAKE THIS METHOD FAIL"); } - @Test(timeOut = 1000 /* 1 second */) + @Test(timeOut = 1_000 /* 1 second */) public void timeoutShouldFailByTimeOut() throws InterruptedException { - Thread.sleep(10 * 1000 /* 10 seconds */); - } - - public static void ppp(String s) { - System.out.println("[TimeOutTest]@@@@@@@@@@@@@@@ " + s); + Thread.sleep(10_000 /* 10 seconds */); } } diff --git a/src/test/java/test/timeout/TimeOutTest.java b/src/test/java/test/timeout/TimeOutTest.java index fd9935d..85dc41a 100644 --- a/src/test/java/test/timeout/TimeOutTest.java +++ b/src/test/java/test/timeout/TimeOutTest.java @@ -2,48 +2,28 @@ package test.timeout; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import org.testng.xml.SuiteXmlParser; import org.testng.xml.XmlSuite; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.Iterator; import test.BaseTest; - -/** - * This class - * - * @author cbeust - */ public class TimeOutTest extends BaseTest { - private Long m_id; + private final long m_id; public TimeOutTest() { m_id = System.currentTimeMillis(); } private void privateTimeOutTest(String parallel) { - addClass("test.timeout.TimeOutSampleTest"); + addClass(TimeOutSampleTest.class); if (parallel != null) { setParallel(parallel); } - runAndVerify(); - } - - private void runAndVerify() { run(); - String[] passed = { - "timeoutShouldPass", - }; - String[] failed = { - "timeoutShouldFailByException", "timeoutShouldFailByTimeOut" - }; - verifyTests("Passed", passed, getPassedTests()); - verifyTests("Failed", failed, getFailedTests()); + verifyPassedTests("timeoutShouldPass"); + verifyFailedTests("timeoutShouldFailByException", "timeoutShouldFailByTimeOut"); } @DataProvider(name = "parallelModes") @@ -69,39 +49,20 @@ public class TimeOutTest extends BaseTest { } @Test - public void timeOutInParallelTestsFromXml() throws IOException { - String file = "src/test/java/test/timeout/issue575.xml"; - try (FileInputStream stream = new FileInputStream(file)) { - SuiteXmlParser suiteParser = new SuiteXmlParser(); - XmlSuite suite = suiteParser.parse(file, stream, true); - setSuite(suite); - runAndVerify(); - } - } - - @Test public void timeOutInNonParallel() { privateTimeOutTest(null); } @Test public void verifyInvocationTimeOut() { - addClass("test.timeout.InvocationTimeOutSampleTest"); + addClass(InvocationTimeOutSampleTest.class); run(); - String[] passed = { - "shouldPass", - }; - String[] failed = { - "shouldFail" - }; - verifyTests("Passed", passed, getPassedTests()); - verifyTests("Failed", failed, getFailedTests()); + verifyPassedTests("shouldPass"); + verifyFailedTests("shouldFail"); } @Override public Long getId() { return m_id; } - - } -- 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
