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

Author: sravanr

test-complete/myHelp.txt

@@ -1,18 +1,20 @@
-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
+you can avoid  the above steps by updating build.gradle to use appropriate client dependencies from maven central.
 
-Step2:
-Go to the directory where you ../test-complete/
+Step2:   Go to the test complete directory 
 
-Gradlew clean
+~/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 test    => to run all the functional tests, which will take about couple of hours
+Step3:  Each test is independent and you can find the results under 
+~/java-client-api/test-complete/build/test-results
 
-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{
@@ -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{