@@ -336,20 +336,31 @@ public static void setupJavaRESTServer(String dbName, String fName, String restS
336336
337337 Calendar cal = Calendar .getInstance ();
338338 Date d = cal .getTime ();
339+ long beforeSetup =cal .getTimeInMillis ();
339340 long before =cal .getTimeInMillis ();
340- logger .info ("###Entering Application SETUP.###" +d );
341- createDB (dbName );
342- createForest (fName ,dbName );
343- Thread .sleep (1500 );
341+ logger .info ("### Starting TESTCASE SETUP. ### " +d );
342+
343+ createDB (dbName );
344+ logTestMessages ("CREATE-DB" ,before );
345+
346+ before =Calendar .getInstance ().getTimeInMillis ();
347+ createForest (fName ,dbName );
348+ logTestMessages ("CREATE-FOREST" ,before );
349+
350+ before =Calendar .getInstance ().getTimeInMillis ();
344351 assocRESTServer (restServerName , dbName ,restPort );
352+ logTestMessages ("REST-SERVER-ASSOCIATION" ,before );
353+
354+ before =Calendar .getInstance ().getTimeInMillis ();
345355 createRESTUser ("rest-admin" ,"x" ,"rest-admin" );
346356 createRESTUser ("rest-writer" ,"x" ,"rest-writer" );
347357 createRESTUser ("rest-reader" ,"x" ,"rest-reader" );
358+ logTestMessages ("REST-USER-CREATION-CHK" ,before );
348359 cal = Calendar .getInstance ();
349360 long after =cal .getTimeInMillis ();
350- long diff = after - before ;
361+ long diff = after - beforeSetup ;
351362
352- String msg = "###Ending Application SETUP. ###:" +diff /1000 +" seconds" ;
363+ String msg = "### Ending TESTCASE SETUP ###: " +diff /1000 +" seconds" ;
353364 logger .info (msg );
354365
355366 }
@@ -806,44 +817,63 @@ else if(response.getStatusLine().getStatusCode() == 200){
806817 e .printStackTrace ();
807818 }
808819 }
820+
821+ public static void logTestMessages (String txt , long before )
822+ {
823+ Calendar cal = Calendar .getInstance ();
824+ long after =cal .getTimeInMillis ();
825+ long diff = after - before ;
826+ String msg = "### " +txt +" ### " +diff /1000 +" seconds" ;
827+ logger .info (msg );
828+ }
809829 /*
810830 * This function move rest server first to documents and deletes forests and databases in separate calls
811831 */
812832 public static void tearDownJavaRESTServer (String dbName , String [] fNames , String restServerName ) throws Exception {
813833 Calendar cal = Calendar .getInstance ();
814834 Date d = cal .getTime ();
815- long before =cal .getTimeInMillis ();
816- logger .info ("###Entering Application Teardown. ###" +d );
835+ long beforeTeardown =cal .getTimeInMillis ();
836+ logger .info ("### StartingTestCase TEARDOWN ### " +d );
817837
838+ long before =cal .getTimeInMillis ();
818839 try {
819840 associateRESTServerWithDB (restServerName ,"Documents" );
820841 }catch (Exception e ){
821842 System .out .println ("From Deleting Rest server called funnction is throwing an error" );
822843 e .printStackTrace ();
823844 }
824-
845+ logTestMessages ("REST-SERVER-ASSOCIATION" ,before );
846+
847+ before =Calendar .getInstance ().getTimeInMillis ();
825848 try {
826849 for (int i = 0 ; i < fNames .length ; i ++){
827850 detachForest (dbName , fNames [i ]);
828851 }
829852 }catch (Exception e ){
830853 e .printStackTrace ();
831854 }
832-
855+ logTestMessages ("DETACH-FOREST-FROM-DB" ,before );
856+
857+ before =Calendar .getInstance ().getTimeInMillis ();
833858 try {
834859 for (int i = 0 ; i < fNames .length ; i ++){
835860 deleteForest (fNames [i ]);
836861 }
837862 }catch (Exception e ){
838863 e .printStackTrace ();
839864 }
840-
865+ logTestMessages ("DELETE-FOREST" ,before );
866+
867+ before =Calendar .getInstance ().getTimeInMillis ();
841868 deleteDB (dbName );
869+ logTestMessages ("DELETE-DB" ,before );
870+
871+
842872 cal = Calendar .getInstance ();
843873 long after =cal .getTimeInMillis ();
844- long diff = after - before ;
874+ long diff = after - beforeTeardown ;
845875
846- String msg = "###Ending Application SETUP. ###:- " +diff /1000 +" seconds" ;
876+ String msg = "### Ending TestCase TEARDOWN ### " +diff /1000 +" seconds" ;
847877 logger .info (msg );
848878
849879 }
0 commit comments