Refactor tests to use '_' and '$proplist'

1 files changed, 64 insertions, 55 deletions

diff --git a/lib/common_test/test/ct_suite_callback_SUITE.erl b/lib/common_test/test/ct_suite_callback_SUITE.erl
index 059d76822a..e4bc524162 100644
--- a/lib/common_test/test/ct_suite_callback_SUITE.erl
+++ b/lib/common_test/test/ct_suite_callback_SUITE.erl
@@ -199,18 +199,21 @@ test_events(one_empty_scb) ->
      {?eh,scb,{empty_scb,init,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scb_empty_SUITE,init_per_suite}},
-     {?eh,scb,{empty_scb,pre_init_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_init_per_suite,[ct_scb_empty_SUITE,[]]}},
+     {?eh,scb,{empty_scb,pre_init_per_suite,
+	       [ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{empty_scb,post_init_per_suite,
+	       [ct_scb_empty_SUITE,'$proplist',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,init_per_suite,ok}},
 
      {?eh,tc_start,{ct_scb_empty_SUITE,test_case}},
-     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
+     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,'_',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,test_case,ok}},
      
      {?eh,tc_start,{ct_scb_empty_SUITE,end_per_suite}},
-     {?eh,scb,{empty_scb,pre_end_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scb_empty_SUITE,[]]}},
+     {?eh,scb,{empty_scb,pre_end_per_suite,
+	       [ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scb_empty_SUITE,'_',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,scb,{empty_scb,terminate,[[]]}},
@@ -220,32 +223,32 @@ test_events(one_empty_scb) ->
 test_events(two_empty_scb) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,scb,{empty_scb,init,[[]]}},
-     {?eh,scb,{empty_scb,init,[[]]}},
+     {?eh,scb,{'_',init,[[]]}},
+     {?eh,scb,{'_',init,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scb_empty_SUITE,init_per_suite}},
-     {?eh,scb,{empty_scb,pre_init_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,pre_init_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_init_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_init_per_suite,[ct_scb_empty_SUITE,[]]}},
+     {?eh,scb,{'_',pre_init_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',pre_init_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_init_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_init_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,init_per_suite,ok}},
 
      {?eh,tc_start,{ct_scb_empty_SUITE,test_case}},
-     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
+     {?eh,scb,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,scb,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_testcase,[test_case,ok,[]]}},
+     {?eh,scb,{'_',post_end_per_testcase,[test_case,ok,[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,test_case,ok}},
      
      {?eh,tc_start,{ct_scb_empty_SUITE,end_per_suite}},
-     {?eh,scb,{empty_scb,pre_end_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,pre_end_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scb_empty_SUITE,[]]}},
+     {?eh,scb,{'_',pre_end_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',pre_end_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_suite,[ct_scb_empty_SUITE,'_',[]]}},
+     {?eh,scb,{'_',post_end_per_suite,[ct_scb_empty_SUITE,'_',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
-     {?eh,scb,{empty_scb,terminate,[[]]}},
-     {?eh,scb,{empty_scb,terminate,[[]]}},
+     {?eh,scb,{'_',terminate,[[]]}},
+     {?eh,scb,{'_',terminate,[[]]}},
      {?eh,stop_logging,[]}
     ];
 
@@ -268,7 +271,7 @@ test_events(faulty_scb_no_init) ->
 test_events(minimal_scb) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,scb,{minimal_scb,init,[[]]}},
+     {?eh,scb,{'_',init,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scb_empty_SUITE,init_per_suite}},
      {?eh,tc_done,{ct_scb_empty_SUITE,init_per_suite,ok}},
@@ -285,25 +288,25 @@ test_events(minimal_scb) ->
 test_events(minimal_and_maximal_scb) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,scb,{minimal_scb,init,[[]]}},
-     {?eh,scb,{empty_scb,init,[[]]}},
+     {?eh,scb,{'_',init,[[]]}},
+     {?eh,scb,{'_',init,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scb_empty_SUITE,init_per_suite}},
-     {?eh,scb,{empty_scb,pre_init_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_init_per_suite,[ct_scb_empty_SUITE,[]]}},
+     {?eh,scb,{'_',pre_init_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_init_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,init_per_suite,ok}},
 
      {?eh,tc_start,{ct_scb_empty_SUITE,test_case}},
-     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
+     {?eh,scb,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_testcase,[test_case,ok,[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,test_case,ok}},
      
      {?eh,tc_start,{ct_scb_empty_SUITE,end_per_suite}},
-     {?eh,scb,{empty_scb,pre_end_per_suite,[ct_scb_empty_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scb_empty_SUITE,[]]}},
+     {?eh,scb,{'_',pre_end_per_suite,[ct_scb_empty_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_suite,[ct_scb_empty_SUITE,'_',[]]}},
      {?eh,tc_done,{ct_scb_empty_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
-     {?eh,scb,{empty_scb,terminate,[[]]}},
+     {?eh,scb,{'_',terminate,[[]]}},
      {?eh,stop_logging,[]}
     ];
 
@@ -313,16 +316,21 @@ test_events(faulty_scb_undef) ->
 		  {failed,FailReasonStr}},
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,scb,{undef_scb,init,[[]]}},
+     {?eh,scb,{'_',init,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scb_empty_SUITE,init_per_suite}},
      {?eh,tc_done,{ct_scb_empty_SUITE,init_per_suite,
 		  {failed, {error,FailReasonStr}}}},
+     {?eh,scb,{'_',on_tc_fail,'_'}},
 
      {?eh,tc_auto_skip,{ct_scb_empty_SUITE,test_case,
 			{failed, FailReason}}},
+     {?eh,scb,{'_',on_tc_skip,'_'}},
+     
      {?eh,tc_auto_skip,{ct_scb_empty_SUITE,end_per_suite,
 			{failed, FailReason}}},
+     {?eh,scb,{'_',on_tc_skip,'_'}},
+     
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -332,19 +340,20 @@ test_events(scope_per_suite_scb) ->
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scope_per_suite_scb_SUITE,init_per_suite}},
-     {?eh,scb,{empty_scb,init,[[]]}},
-     {?eh,scb,{empty_scb,post_init_per_suite,[ct_scope_per_suite_scb_SUITE,[]]}},
+     {?eh,scb,{'_',init,[[]]}},
+     {?eh,scb,{'_',post_init_per_suite,[ct_scope_per_suite_scb_SUITE,'$proplist',[]]}},
      {?eh,tc_done,{ct_scope_per_suite_scb_SUITE,init_per_suite,ok}},
 
      {?eh,tc_start,{ct_scope_per_suite_scb_SUITE,test_case}},
-     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
+     {?eh,scb,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_testcase,[test_case,ok,[]]}},
      {?eh,tc_done,{ct_scope_per_suite_scb_SUITE,test_case,ok}},
      
      {?eh,tc_start,{ct_scope_per_suite_scb_SUITE,end_per_suite}},
-     {?eh,scb,{empty_scb,pre_end_per_suite,[ct_scope_per_suite_scb_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scope_per_suite_scb_SUITE,[]]}},
-     {?eh,scb,{empty_scb,terminate,[[]]}},
+     {?eh,scb,{'_',pre_end_per_suite,
+	       [ct_scope_per_suite_scb_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_suite,[ct_scope_per_suite_scb_SUITE,'_',[]]}},
+     {?eh,scb,{'_',terminate,[[]]}},
      {?eh,tc_done,{ct_scope_per_suite_scb_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -355,20 +364,20 @@ test_events(scope_suite_scb) ->
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_scope_suite_scb_SUITE,init_per_suite}},
-     {?eh,scb,{empty_scb,init,[[]]}},
-     {?eh,scb,{empty_scb,pre_init_per_suite,[ct_scope_suite_scb_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_init_per_suite,[ct_scope_suite_scb_SUITE,[]]}},
+     {?eh,scb,{'_',init,[[]]}},
+     {?eh,scb,{'_',pre_init_per_suite,[ct_scope_suite_scb_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_init_per_suite,[ct_scope_suite_scb_SUITE,'$proplist',[]]}},
      {?eh,tc_done,{ct_scope_suite_scb_SUITE,init_per_suite,ok}},
 
      {?eh,tc_start,{ct_scope_suite_scb_SUITE,test_case}},
-     {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
+     {?eh,scb,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_testcase,[test_case,ok,[]]}},
      {?eh,tc_done,{ct_scope_suite_scb_SUITE,test_case,ok}},
      
      {?eh,tc_start,{ct_scope_suite_scb_SUITE,end_per_suite}},
-     {?eh,scb,{empty_scb,pre_end_per_suite,[ct_scope_suite_scb_SUITE,[]]}},
-     {?eh,scb,{empty_scb,post_end_per_suite,[ct_scope_suite_scb_SUITE,[]]}},
-     {?eh,scb,{empty_scb,terminate,[[]]}},
+     {?eh,scb,{'_',pre_end_per_suite,[ct_scope_suite_scb_SUITE,'$proplist',[]]}},
+     {?eh,scb,{'_',post_end_per_suite,[ct_scope_suite_scb_SUITE,'_',[]]}},
+     {?eh,scb,{'_',terminate,[[]]}},
      {?eh,tc_done,{ct_scope_suite_scb_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -401,19 +410,19 @@ test_events(scope_per_group_scb) ->
      {?eh,tc_done,{ct_scope_per_group_scb_SUITE,init_per_suite,ok}},
 
      [{?eh,tc_start,{ct_scope_per_group_scb_SUITE,{init_per_group,group1,[]}}},
-      {?eh,scb,{empty_scb,init,[[]]}},
-      {?eh,scb,{empty_scb,post_init_per_group,[group1,[]]}},
+      {?eh,scb,{'_',init,[[]]}},
+      {?eh,scb,{'_',post_init_per_group,[group1,'$proplist',[]]}},
       {?eh,tc_done,{ct_scope_per_group_scb_SUITE,{init_per_group,group1,[]},ok}},
       
       {?eh,tc_start,{ct_scope_per_group_scb_SUITE,test_case}},
-      {?eh,scb,{empty_scb,pre_init_per_testcase,[test_case,[]]}},
-      {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
+      {?eh,scb,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+      {?eh,scb,{'_',post_end_per_testcase,[test_case,ok,[]]}},
       {?eh,tc_done,{ct_scope_per_group_scb_SUITE,test_case,ok}},
       
       {?eh,tc_start,{ct_scope_per_group_scb_SUITE,{end_per_group,group1,[]}}},
-      {?eh,scb,{empty_scb,pre_end_per_group,[group1,[]]}},
-      {?eh,scb,{empty_scb,post_end_per_group,[group1,[]]}},
-      {?eh,scb,{empty_scb,terminate,[[]]}},
+      {?eh,scb,{'_',pre_end_per_group,[group1,'$proplist',[]]}},
+      {?eh,scb,{'_',post_end_per_group,[group1,'_',[]]}},
+      {?eh,scb,{'_',terminate,[[]]}},
       {?eh,tc_done,{ct_scope_per_group_scb_SUITE,{end_per_group,group1,[]},ok}}],
      
      {?eh,tc_start,{ct_scope_per_group_scb_SUITE,end_per_suite}},