[testng] 108/160: Add test for #575

[Eugene Zhukov]

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 8f6156d02f31da3b4f4c2944a63c33fb4ca07a53
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Fri Jun 12 14:54:10 2015 +0200

    Add test for #575
---
 src/test/java/test/BaseTest.java            |  4 ++++
 src/test/java/test/timeout/TimeOutTest.java | 31 ++++++++++++++++++++++-------
 src/test/java/test/timeout/issue575.xml     |  9 +++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/test/java/test/BaseTest.java b/src/test/java/test/BaseTest.java
index 2bb1be4..6f01103 100644
--- a/src/test/java/test/BaseTest.java
+++ b/src/test/java/test/BaseTest.java
@@ -326,6 +326,10 @@ public class BaseTest extends BaseDistributedTest {
     return m_suite;
   }
 
+  public void setSuite(XmlSuite suite) {
+    m_suite = suite;
+  }
+
   /**
    * Used for instanceCount testing, when we need to look inside the
    * TestResult to count the various SUCCESS/FAIL/FAIL_BUT_OK
diff --git a/src/test/java/test/timeout/TimeOutTest.java b/src/test/java/test/timeout/TimeOutTest.java
index 7d9ff5d..fd9935d 100644
--- a/src/test/java/test/timeout/TimeOutTest.java
+++ b/src/test/java/test/timeout/TimeOutTest.java
@@ -2,8 +2,12 @@ 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;
@@ -26,18 +30,20 @@ public class TimeOutTest extends BaseTest {
     if (parallel != null) {
       setParallel(parallel);
     }
+    runAndVerify();
+  }
+
+  private void runAndVerify() {
     run();
     String[] passed = {
         "timeoutShouldPass",
-      };
-      String[] failed = {
+    };
+    String[] failed = {
         "timeoutShouldFailByException", "timeoutShouldFailByTimeOut"
-      };
-
-//      dumpResults("Passed", getPassedTests());
+    };
 
-      verifyTests("Passed", passed, getPassedTests());
-      verifyTests("Failed", failed, getFailedTests());
+    verifyTests("Passed", passed, getPassedTests());
+    verifyTests("Failed", failed, getFailedTests());
   }
 
   @DataProvider(name = "parallelModes")
@@ -63,6 +69,17 @@ 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);
   }
diff --git a/src/test/java/test/timeout/issue575.xml b/src/test/java/test/timeout/issue575.xml
new file mode 100644
index 0000000..7b91fcf
--- /dev/null
+++ b/src/test/java/test/timeout/issue575.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="TestNG test" parallel="tests">
+    <test name="Test TestNG" >
+        <classes>
+            <class name="test.timeout.TimeOutSampleTest" />
+        </classes>
+    </test>
+</suite>
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git