Issue#128 Fixing failing due to passing string as part of multi state… (#132)

* Issue#128 Fixing failing due to passing string as part of multi statement result return

* Fixing review comment

* Fixing additional review comment

Author: venuiyengar

marklogic-unit-test-client/src/main/java/com/marklogic/test/unit/JaxpServiceResponseUnmarshaller.java

@@ -17,14 +17,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.xml.sax.InputSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JAXP-based implementation. Not the prettiest code, but doesn't have any 3rd-party dependencies,
  * only relies on what Java provides by itself.
  */
 public class JaxpServiceResponseUnmarshaller implements ServiceResponseUnmarshaller {
 
+	protected final Logger logger = LoggerFactory.getLogger(getClass());
 	private DocumentBuilder documentBuilder;
+	private static int ELEMENT_TYPE = 1;	
 
 	@Override
 	public List<TestModule> parseTestList(String xml) {
@@ -67,10 +71,16 @@ public TestSuiteResult parseTestSuiteResult(String xml) {
 			NodeList resultNodes = testNode.getChildNodes();
 			String failureXml = null;
 			for (int j = 0; j < resultNodes.getLength(); j++) {
-				Element resultNode = (Element) resultNodes.item(j);
-				if ("fail".equals(resultNode.getAttribute("type"))) {
-					failureXml = toXml(resultNode);
-					break;
+				// An XQuery test module may return additional nodes, such as text nodes, which should be
+				// ignored unless they are element nodes. 				
+				if (resultNodes.item(j).getNodeType() == ELEMENT_TYPE) {
+					Element resultNode = (Element) resultNodes.item(j);
+					if ("fail".equals(resultNode.getAttribute("type"))) {
+						failureXml = toXml(resultNode);
+						break;						
+					}
+				} else {
+					logger.debug("Ignoring Node Type [" + resultNodes.item(j).getNodeType() + "]");
 				}
 			}
 			testSuiteResult.addTestResult(new TestResult(testName, testTime, failureXml));

marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-multi-statement.xqy

@@ -0,0 +1,26 @@
+(: 
+This module returns two assertions and then a text node; the intent is to verify that the text node
+is ignored by the Java code that parses the response into JUnit assertion results.
+:)
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
+
+let $doc1 := 
+<ul>
+  <li>Supp1: Item1, Item2</li>
+  <li>Supp2: Item1</li>
+  <li>Supp3: Item2</li>
+</ul>
+let $doc2 := 
+<ul>
+  <li>Supp1: Item1, Item2</li>
+  <li>Supp2: Item1</li>
+  <li>Supp3: Item2</li>
+</ul>
+let $doc3 := 
+<ul>
+  <li>Supp1: Item1, Item3</li>
+  <li>Supp2: Item1</li>
+  <li>Supp3: Item2</li>
+</ul>
+return
+(test:assert-equal($doc1, $doc2), test:assert-not-equal($doc1, $doc3), "failMe")