Changed Eval Result check to not use array based return value because

new functions added to server tend to break these checks.

Author: Ajit George

test-complete/src/test/java/com/marklogic/client/functionaltest/TestEvalXquery.java

@@ -107,7 +107,7 @@ void validateReturnTypes(EvalResultIterator evr) throws Exception{
 		boolean inDST = TimeZone.getDefault().inDaylightTime( new Date() );
 		 while(evr.hasNext())
 		 {
-			 EvalResult er =evr.next();
+			 EvalResult er =evr.next();			 
 			 if(er.getType().equals(Type.XML)){
 				 DOMHandle dh = new DOMHandle();
 				 dh=er.get(dh);
@@ -152,7 +152,7 @@ else if(er.getType().equals(Type.STRING)){
 			 }else if(er.getType().equals(Type.OTHER)){
 				//There is git issue 151
 //				 System.out.println("Testing is Others? "+er.getAs(String.class));
-				  assertTrue("Returns OTHERs",(er.getString().contains("xdmp:forest-restart#1") || er.getString().contains("PT0S")));
+				  assertTrue("Returns OTHERs",er.getString().contains("PT0S"));
 
 			 }else if(er.getType().equals(Type.ANYURI)){
 //				 System.out.println("Testing is AnyUri? "+er.getAs(String.class));
@@ -210,7 +210,7 @@ else if(er.getType().equals(Type.STRING)){
 				 assertEquals("Returns me a HEXBINARY :","BEEF",er.getAs(String.class));
 			 }else if(er.getType().equals(Type.QNAME)){
 //				 System.out.println("Testing is QNAME integer"+er.getAs(String.class));
-				 assertEquals("Returns me a QNAME :","integer",er.getAs(String.class));
+				 assertTrue("Returns me a QNAME :",er.getString().contains("integer") || er.getString().contains("fn:empty"));
 			 }else if(er.getType().equals(Type.TIME)){
 //				 System.out.println("Testing is TIME? "+er.getAs(String.class));
 				 assertEquals("Returns me a TIME :","10:00:00",er.getAs(String.class));

test-complete/src/test/java/com/marklogic/client/functionaltest/data/xqueries.txt

@@ -28,8 +28,8 @@ math:acos(.5);
 (:returns NULL:)
 ();
 
-(:returns OTHER:)
-xdmp:functions()[2];
+(:returns QNAME:)
+xdmp:function-name(xdmp:function(xs:QName("fn:empty")));
 
 (: returns XML document :)
 cts:search(fn:doc(), cts:directory-query(("/"),"1"));