Remove XMLUnit and DST changes

Author: Ajit George

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

@@ -20,8 +20,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -103,10 +101,7 @@ public void testBug19443() throws Exception
 	    System.out.println("Output is :  \n");
 	    System.out.println(output);
 
-	    XMLUnit.setIgnoreWhitespace(true);
-	    XMLUnit.setNormalizeWhitespace(true);
-	    Diff diff = XMLUnit.compareXML( actual, output );
-	    assertTrue( "Not Similar", diff.similar() );
+	    assertTrue( "Element geo-option not available", actual.contains("<search:geo-option>type=long-lat-point</search:geo-option>") );
 
 		// release client
 	    client.release();	

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

@@ -21,6 +21,9 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.StringReader;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -101,7 +104,7 @@ public void tearDown() throws Exception {
  This method is validating all the return values from xquery
   */
 	void validateReturnTypes(EvalResultIterator evr) throws Exception{
-		
+		boolean inDST = TimeZone.getDefault().inDaylightTime( new Date() );
 		 while(evr.hasNext())
 		 {
 			 EvalResult er =evr.next();
@@ -157,11 +160,22 @@ else if(er.getType().equals(Type.STRING)){
 
 			 }else if(er.getType().equals(Type.DATE)){
 //				 System.out.println("Testing is DATE? "+er.getAs(String.class));
-				 assertEquals("Returns me a date :","2002-03-07-08:00",er.getAs(String.class));
+				if (inDST)
+					assertEquals("Returns me a date :", "2002-03-07-07:00",
+							er.getAs(String.class));
+				else
+					assertEquals("Returns me a date :", "2002-03-07-08:00",
+							er.getAs(String.class));
 			 }else if(er.getType().equals(Type.DATETIME)){
 //				 System.out.println("Testing is DATETIME? "+er.getAs(String.class));
-				 assertEquals("Returns me a dateTime :","2010-01-06T18:13:50.874-07:00",er.getAs(String.class));
-				 
+				 if (inDST)
+					assertEquals("Returns me a dateTime :",
+							"2010-01-06T18:13:50.874-07:00",
+							er.getAs(String.class));
+				else
+					assertEquals("Returns me a dateTime :",
+							"2010-01-06T18:13:50.874-08:00",
+							er.getAs(String.class));
 			 }else if(er.getType().equals(Type.DECIMAL)){
 //				 System.out.println("Testing is Decimal? "+er.getAs(String.class));
 				 assertEquals("Returns me a Decimal :","10.5",er.getAs(String.class));