Updating the JUnit Tests

tupilabs · Apr 19, 2016 · 69e840e · 69e840e
1 parent 9913b91
commit 69e840e
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .project
 .classpath
 .settings/
+.idea
 target/
 test-output/
diff --git 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<Suite> 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<Suite> parseResourceSuite(String name) {
 		File file = new File(TestTestNGParser.class.getResource(name).getFile());
-		Suite suite = null;
+		//Suite suite = null;
+		List<Suite> 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<Suite> 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
@@ -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<Suite> 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
@@ -65,4 +65,67 @@
       </class> <!-- com.tupilabs.test.yahoonews.MyTest -->
     </test> <!-- Default test -->
   </suite> <!-- Default suite -->
+  <suite name="suite2" duration-ms="49" started-at="2013-04-16T22:14:29Z" finished-at="2013-04-16T22:14:29Z">
+    <groups>
+    </groups>
+    <test name="Default test" duration-ms="49" started-at="2013-04-16T22:14:29Z" finished-at="2013-04-16T22:14:29Z">
+      <class name="com.tupilabs.test.yahoonews.MyTest">
+        <test-method status="PASS" signature="validateNameField(java.lang.String)[pri:0, instance:com.tupilabs.test.yahoonews.MyTest@c75e4fc]" name="validateNameField" duration-ms="24" started-at="2013-04-16T19:14:29Z" data-provider="validateFieldBase" finished-at="2013-04-16T19:14:29Z">
+          <params>
+            <param index="0">
+              <value>
+                <![CDATA[<script language='JavaScript'> alert('Hello') </script>]]>
+              </value>
+            </param>
+          </params>
+          <reporter-output>
+          </reporter-output>
+        </test-method> <!-- validateNameField -->
+        <test-method status="PASS" signature="validateNameField(java.lang.String)[pri:0, instance:com.tupilabs.test.yahoonews.MyTest@c75e4fc]" name="validateNameField" duration-ms="1" started-at="2013-04-16T19:14:29Z" data-provider="validateFieldBase" finished-at="2013-04-16T19:14:29Z">
+          <params>
+            <param index="0">
+              <value>
+                <![CDATA[ASDGFFLKLKLKlddvddsghdsh]]>
+              </value>
+            </param>
+          </params>
+          <reporter-output>
+          </reporter-output>
+        </test-method> <!-- validateNameField -->
+        <test-method status="FAIL" signature="validateNameField(java.lang.String)[pri:0, instance:com.tupilabs.test.yahoonews.MyTest@c75e4fc]" name="validateNameField" duration-ms="1" started-at="2013-04-16T19:14:29Z" data-provider="validateFieldBase" finished-at="2013-04-16T19:14:29Z">
+          <params>
+            <param index="0">
+              <value>
+                <![CDATA[12344557688008853]]>
+              </value>
+            </param>
+          </params>
+          <reporter-output>
+          </reporter-output>
+        </test-method> <!-- validateNameField -->
+        <test-method status="PASS" signature="validateNameField(java.lang.String)[pri:0, instance:com.tupilabs.test.yahoonews.MyTest@c75e4fc]" name="validateNameField" duration-ms="1" started-at="2013-04-16T19:14:29Z" data-provider="validateFieldBase" finished-at="2013-04-16T19:14:29Z">
+          <params>
+            <param index="0">
+              <value>
+                <![CDATA[:!@#$%^&*()_.]]>
+              </value>
+            </param>
+          </params>
+          <reporter-output>
+          </reporter-output>
+        </test-method> <!-- validateNameField -->
+        <test-method status="PASS" signature="validateNameField(java.lang.String)[pri:0, instance:com.tupilabs.test.yahoonews.MyTest@c75e4fc]" name="validateNameField" duration-ms="0" started-at="2013-04-16T19:14:29Z" data-provider="validateFieldBase" finished-at="2013-04-16T19:14:29Z">
+          <params>
+            <param index="0">
+              <value>
+                <![CDATA[ASDASDasdas-123123211212&^%&^%]]>
+              </value>
+            </param>
+          </params>
+          <reporter-output>
+          </reporter-output>
+        </test-method> <!-- validateNameField -->
+      </class> <!-- com.tupilabs.test.yahoonews.MyTest -->
+    </test> <!-- Default test -->
+  </suite> <!--suite2 -->
 </testng-results>