diff --git a/.gitignore b/.gitignore index 0545de2..12ca6f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .project .classpath .settings/ +.idea target/ test-output/ \ No newline at end of file diff --git a/src/test/java/com/tupilabs/testng/parser/TestTestNGParser.java b/src/test/java/com/tupilabs/testng/parser/TestTestNGParser.java index 61108fa..8e8047d 100644 --- a/src/test/java/com/tupilabs/testng/parser/TestTestNGParser.java +++ b/src/test/java/com/tupilabs/testng/parser/TestTestNGParser.java @@ -53,13 +53,16 @@ public void testTestNGParser() { File file = new File(url.getFile()); Suite suite = null; + List suites = null; + try { - suite = this.parser.parse(file); + suites = this.parser.parse(file); + suite = suites.get(0); } catch (ParserException e) { fail("Failed to parse testng file '" + file + "': " + e.getMessage()); } - assertNotNull(suite); + assertNotNull(suites); assertTrue(suite.getName().equals("Command line suite")); assertTrue(suite.getDurationMs().equals("0")); @@ -114,29 +117,32 @@ public void testInvalidTestNGFile() { } - private Suite parseResourceSuite(String name) { + private List parseResourceSuite(String name) { File file = new File(TestTestNGParser.class.getResource(name).getFile()); - Suite suite = null; + //Suite suite = null; + List suites = null; try { - suite = this.parser.parse(file); + suites = this.parser.parse(file); } catch (ParserException e) { fail("Failed to parse testng file '" + file + "': " + e.getMessage()); } - return suite; + return suites; } public void testMethodIterationOrder() { - Suite suite = parseResourceSuite("testng-results-ordered.xml"); + List suites = parseResourceSuite("testng-results-ordered.xml"); String last = null; - for (TestMethod method : suite.getTests().get(0).getClasses().get(0).getTestMethods()) { - String testName = method.getName(); - if (last != null) { - assertTrue("test not in correct order:" + testName, - last.compareTo(method.getName()) < 0); + for (Suite suite : suites) { + for (TestMethod method : suite.getTests().get(0).getClasses().get(0).getTestMethods()) { + String testName = method.getName(); + if (last != null) { + assertTrue("test not in correct order:" + testName, + last.compareTo(method.getName()) < 0); + } + last = testName; } - last = testName; } assertNotNull("did not find any testMethods..", last); } diff --git a/src/test/java/com/tupilabs/testng/parser/issue1/TestDataProviderIssue1.java b/src/test/java/com/tupilabs/testng/parser/issue1/TestDataProviderIssue1.java index a75bd1f..d801ab2 100644 --- a/src/test/java/com/tupilabs/testng/parser/issue1/TestDataProviderIssue1.java +++ b/src/test/java/com/tupilabs/testng/parser/issue1/TestDataProviderIssue1.java @@ -4,6 +4,7 @@ import java.io.File; import java.net.URL; +import java.util.List; import org.junit.Test; @@ -22,8 +23,9 @@ public void testDataProviderIssue1() { .getResource("com/tupilabs/testng/parser/issue1/testng-results.xml"); File file = new File(url.getFile()); - Suite suite = parser.parse(file); - System.out.println(suite.getName()); + List suites = parser.parse(file); + for (Suite suite : suites){ + System.out.println(suite.getName()); for (com.tupilabs.testng.parser.Test test : suite.getTests()) { System.out.println("\t" + test.getName()); for (com.tupilabs.testng.parser.Class clazz : test.getClasses()) { @@ -35,5 +37,6 @@ public void testDataProviderIssue1() { } } } + } } diff --git a/src/test/resources/com/tupilabs/testng/parser/issue1/testng-results.xml b/src/test/resources/com/tupilabs/testng/parser/issue1/testng-results.xml index 1a3f1d9..f26d931 100644 --- a/src/test/resources/com/tupilabs/testng/parser/issue1/testng-results.xml +++ b/src/test/resources/com/tupilabs/testng/parser/issue1/testng-results.xml @@ -65,4 +65,67 @@ + + + + + + + + + + alert('Hello') ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +