Merge remote-tracking branch 'origin/dev' into dev

Author: Sravan Kottam

test-complete/myHelp.txt

@@ -1,18 +1,18 @@
-Step 1: 
- Build dev source code by doing the following on your dev branch
+Step 1:  Build dev source code by doing the following on your dev branch 
+~/java-client-api$
+mvn clean
+mvn compile
+mvn �Dmaven.test.skip=true install
 
-Mvn clean
-Mvn �Dmaven.test.skip=true install
+Step2:   Go to the test complete directory 
 
-Step2:
-Go to the directory where you ../test-complete/
+~/java-client-api/test-complete$
+ gradlew clean
+ gradlew test    => to run all the functional tests, which will take about couple of hours
+ gradlew -Dtest.single=TestBulkWriteMetadata1 test    => to run individual tests
 
-Gradlew clean
+Step3:  Each test is independent and you can find the results under 
+~/java-client-api/test-complete/build/test-results
 
-Gradlew test    => to run all the functional tests, which will take about couple of hours
-
-gradlew -Dtest.single=TestBulkWriteMetadata1 test    => to run individual tests
-
-each test is independent and you can find the results under Java-client-api-qa\build\test-results
-
-and if you run all the functional tests then you can find a report under Java-client-api-qa\build\reports\tests\index.html
+and if you run all the functional tests then you can find a report under 
+~/java-client-api/test-complete/build/reports/tests/index.html

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

@@ -338,7 +338,7 @@ public static void setupJavaRESTServer(String dbName, String fName, String restS
 		Date d = cal.getTime();
 		long beforeSetup =cal.getTimeInMillis();
 		long before =cal.getTimeInMillis();
-		logger.info("### Starting TESTCASE SETUP. ### "+d);
+		logger.info("### Starting TESTCASE SETUP."+ dbName+"### "+d);
 
 		createDB(dbName);
 		logTestMessages("CREATE-DB",before);
@@ -360,8 +360,8 @@ public static void setupJavaRESTServer(String dbName, String fName, String restS
 		long after =cal.getTimeInMillis();
 		long diff = after - beforeSetup;
 
-		String msg = "### Ending TESTCASE SETUP ###: "+diff/1000+" seconds";
-		logger.info(msg);
+//		String msg = "### Ending TESTCASE SETUP ###: "+diff/1000+" seconds";
+//		logger.info(msg);
 
 	}
 	public static void setupJavaRESTServer(String dbName, String fName, String restServerName, int restPort,boolean attachRestContextDB)throws Exception{
@@ -673,7 +673,7 @@ public static void deleteRESTServerWithDB(String restServerName)	{
 
 			HttpResponse response = client.execute(delete);
 			if(response.getStatusLine().getStatusCode()== 202){
-				Thread.sleep(3500);
+				Thread.sleep(9500);
 			}
 		}catch (Exception e) {
 			// writing error to Log
@@ -802,15 +802,15 @@ public static void waitForServerRestart()
 				try{
 					HttpGet getrequest = new HttpGet("http://localhost:8001/admin/v1/timestamp");
 					HttpResponse response = client.execute(getrequest);
-					if(response.getStatusLine().getStatusCode() == 503){Thread.sleep(4000);}
+					if(response.getStatusLine().getStatusCode() == 503){Thread.sleep(5000);}
 					else if(response.getStatusLine().getStatusCode() == 200){
 						break;
 					}
 					else {
 						System.out.println("Waiting for response from server, Trial :"+response.getStatusLine().getStatusCode()+count);
-						Thread.sleep(2000);
+						Thread.sleep(6000);
 					}
-				}catch(Exception e){Thread.sleep(2000);}
+				}catch(Exception e){Thread.sleep(6000);}
 			}
 		}catch(Exception e){
 			System.out.println("Inside wait for server restart is throwing an error");
@@ -820,11 +820,11 @@ else if(response.getStatusLine().getStatusCode() == 200){
 
 	public static void logTestMessages(String txt, long before)
 	{
-		Calendar  cal = Calendar.getInstance();
-		long after =cal.getTimeInMillis();
-		long diff = after - before;
-		String msg = "### "+txt+" ### "+diff/1000+" seconds";
-		logger.info(msg);
+//		Calendar  cal = Calendar.getInstance();
+//		long after =cal.getTimeInMillis();
+//		long diff = after - before;
+//		String msg = "### "+txt+" ### "+diff/1000+" seconds";
+//		logger.info(msg);
 	}
 	/*
 	 * This function move rest server first to documents and deletes forests and databases in separate calls
@@ -833,7 +833,7 @@ public static void tearDownJavaRESTServer(String dbName, String [] fNames, Strin
 		Calendar  cal = Calendar.getInstance();
 		Date d = cal.getTime();
 		long beforeTeardown =cal.getTimeInMillis();
-		logger.info("### StartingTestCase TEARDOWN ### "+d);
+		logger.info("### StartingTestCase TEARDOWN "+dbName+" ### "+d);
 
 		long before =cal.getTimeInMillis();
 		try{

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

@@ -1816,6 +1816,9 @@ public void testSystemTimeUsingInvalidTime() throws Exception {
         .parseDateTime("2010-01-01T00:00:01");
     insertJSONSingleDocument(temporalLsqtCollectionName, docId, null, null,
         firstInsertTime);
+    
+    // Sleep for 2 seconds for LSQT to be advanced
+    Thread.sleep(2000);
 
     // Update by passing a system time that is less than previous one
     Calendar updateTime = DatatypeConverter

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

@@ -409,7 +409,7 @@ public void testBulkWritewithTransactionCommitTimeOut() throws Exception {
 	int count=1;
 	String docId[] = {"Sega-4MB.jpg"};
 	//	boolean tstatus =false;
-	Transaction t= client.openTransaction("timeoutTrans",3);
+	Transaction t= client.openTransaction("timeoutTrans",1);
 	BinaryDocumentManager docMgr = client.newBinaryDocumentManager();
 
 	DocumentWriteSet writeset =docMgr.newWriteSet();