Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit e87537c

Browse files
allenshihgoogallenshihgoog
committed
apply refactoring to wdm service tests
1 parent 1d52290 commit e87537c

File tree

44 files changed

+2333
-1303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2333
-1303
lines changed

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,15 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_01(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_01(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
wdm_next_args['total_client_count'] = 0
38-
wdm_next_args['timer_client_period'] = 0
39-
wdm_next_args['final_client_status'] = 0
40-
wdm_next_args['enable_client_flip'] = 0
41-
wdm_next_args['test_client_iterations'] = 10
42-
wdm_next_args['client_clear_state_between_iterations'] = True
43-
44-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
45-
('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
46-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
47-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
48-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
49-
50-
wdm_next_args['test_tag'] = self.__class__.__name__
51-
wdm_next_args['test_case_name'] = ['Wdm-NestService-E01: Mutual Subscribe: Root path. Null Version. Client in initiator cancels',
52-
'Wdm-NestService-M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels']
5335

5436
print 'test file: ' + self.__class__.__name__
5537
print "weave-wdm-next test E01 and M01"
56-
super(test_weave_wdm_next_service_mutual_subscribe_01, self).weave_wdm_next_test_service_base(wdm_next_args)
38+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
39+
super(test_weave_wdm_next_service_mutual_subscribe_01,
40+
self).weave_wdm_next_test_service_base(wdm_next_args)
5741

5842

5943
if __name__ == "__main__":
6044
unittest.main()
61-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_02.py‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_02(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_02(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
wdm_next_args['total_client_count'] = 0
38-
wdm_next_args['timer_client_period'] = 0
39-
wdm_next_args['final_client_status'] = 1
40-
wdm_next_args['enable_client_flip'] = 0
41-
wdm_next_args['test_client_iterations'] = 10
42-
wdm_next_args['client_clear_state_between_iterations'] = True
43-
44-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
45-
('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
46-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
47-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
48-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
49-
50-
wdm_next_args['test_tag'] = self.__class__.__name__
51-
wdm_next_args['test_case_name'] = ['Wdm-NestService-E02: Mutual Subscribe: Root path, Null Version, Publisher in initiator Cancel',
52-
'Wdm-NestService-M02: Stress Mutual Subscribe: Root path, Null Version, Publisher in initiator Cancel']
5335
print 'test file: ' + self.__class__.__name__
5436
print "weave-wdm-next test E02 and M02"
55-
super(test_weave_wdm_next_service_mutual_subscribe_02, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_02,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5640

5741

5842
if __name__ == "__main__":
5943
unittest.main()
60-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_03.py‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_03(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_03(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
wdm_next_args['final_client_status'] = 2
38-
wdm_next_args['total_client_count'] = 0
39-
wdm_next_args['timer_client_period'] = 0
40-
wdm_next_args['enable_client_flip'] = 0
41-
wdm_next_args['test_client_iterations'] = 10
42-
wdm_next_args['client_clear_state_between_iterations'] = True
43-
44-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
45-
('Client\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
46-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
47-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
48-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
49-
50-
wdm_next_args['test_tag'] = self.__class__.__name__
51-
wdm_next_args['test_case_name'] = ['Wdm-NestService-E03: Mutual Subscribe: Root path. Null Version. Client in initiator aborts',
52-
'Wdm-NestService-M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts']
5335
print 'test file: ' + self.__class__.__name__
5436
print "weave-wdm-next test E03 and M03"
55-
super(test_weave_wdm_next_service_mutual_subscribe_03, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_03,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5640

5741

5842
if __name__ == "__main__":
5943
unittest.main()
60-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_04.py‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_04(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_04(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
38-
wdm_next_args['final_client_status'] = 3
39-
wdm_next_args['total_client_count'] = 0
40-
wdm_next_args['timer_client_period'] = 0
41-
wdm_next_args['enable_client_flip'] = 0
42-
wdm_next_args['test_client_iterations'] = 10
43-
wdm_next_args['client_clear_state_between_iterations'] = True
44-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
45-
('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
46-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
47-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
48-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
49-
50-
wdm_next_args['test_tag'] = self.__class__.__name__
51-
wdm_next_args['test_case_name'] = ['Wdm-NestService-E04: Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts',
52-
'Wdm-NestService-M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts']
5335
print 'test file: ' + self.__class__.__name__
5436
print "weave-wdm-next test E04 and M04"
55-
super(test_weave_wdm_next_service_mutual_subscribe_04, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_04,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5640

5741

5842
if __name__ == "__main__":
5943
unittest.main()
60-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_05.py‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,14 @@
3131

3232

3333
class test_weave_wdm_next_service_mutual_subscribe_05(weave_wdm_next_test_service_base):
34+
3435
def test_weave_wdm_next_service_mutual_subscribe_05(self):
35-
wdm_next_args = {}
36-
37-
wdm_next_args['wdm_option'] = "mutual_subscribe"
38-
wdm_next_args['final_client_status'] = 0
39-
wdm_next_args['enable_client_flip'] = 0
40-
wdm_next_args['test_client_iterations'] = 10
41-
wdm_next_args['client_clear_state_between_iterations'] = True
42-
43-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
44-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
45-
('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
46-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
47-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
48-
49-
wdm_next_args['test_tag'] = self.__class__.__name__
50-
wdm_next_args['test_case_name'] = ['Wdm-NestService-F01: Mutual Subscribe: Root path, Null Version, Idle, Client in initiator Cancel',
51-
'Wdm-NestService-M05: Stress Mutual Subscribe: Root path, Null Version, Idle, Client in initiator Cancel']
5236
print 'test file: ' + self.__class__.__name__
5337
print "weave-wdm-next test F01 and M05"
54-
super(test_weave_wdm_next_service_mutual_subscribe_05, self).weave_wdm_next_test_service_base(wdm_next_args)
38+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
39+
super(test_weave_wdm_next_service_mutual_subscribe_05,
40+
self).weave_wdm_next_test_service_base(wdm_next_args)
5541

5642

5743
if __name__ == "__main__":
5844
unittest.main()
59-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_06.py‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_06(weave_wdm_next_test_service_base):
33-
def test_weave_wdm_next_service_mutual_subscribe_06(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
38-
wdm_next_args['final_client_status'] = 1
39-
wdm_next_args['enable_client_flip'] = 0
40-
wdm_next_args['test_client_iterations'] = 10
41-
wdm_next_args['client_clear_state_between_iterations'] = True
4233

43-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
44-
('Handler\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
45-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
46-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
47-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
48-
49-
wdm_next_args['test_tag'] = self.__class__.__name__
50-
wdm_next_args['test_case_name'] = ['Wdm-NestService-F02: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels',
51-
'Wdm-NestService-M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels']
34+
def test_weave_wdm_next_service_mutual_subscribe_06(self):
5235
print 'test file: ' + self.__class__.__name__
5336
print "weave-wdm-next test F02 and M06"
54-
super(test_weave_wdm_next_service_mutual_subscribe_06, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_06,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5540

5641

5742
if __name__ == "__main__":
5843
unittest.main()
59-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_07.py‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_07(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_07(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
wdm_next_args['final_client_status'] = 2
38-
wdm_next_args['enable_client_flip'] = 0
39-
wdm_next_args['test_client_iterations'] = 10
40-
wdm_next_args['client_clear_state_between_iterations'] = True
41-
42-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
43-
('Client\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
44-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
45-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
46-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
47-
48-
wdm_next_args['test_tag'] = self.__class__.__name__
49-
wdm_next_args['test_case_name'] = ['Wdm-NestService-F03: Mutual Subscribe: Root path. Null Version. Idle. Client in initiator aborts',
50-
'Wdm-NestService-M07: Stress Mutual Subscribe: Root path. Null Version. Idle. Client in initiator aborts']
5135
print 'test file: ' + self.__class__.__name__
5236
print "weave-wdm-next test F03 and M07"
53-
super(test_weave_wdm_next_service_mutual_subscribe_07, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_07,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5440

5541

5642
if __name__ == "__main__":
5743
unittest.main()
58-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_08.py‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_08(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_08(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
wdm_next_args['final_client_status'] = 3
38-
wdm_next_args['enable_client_flip'] = 0
39-
wdm_next_args['test_client_iterations'] = 10
40-
wdm_next_args['client_clear_state_between_iterations'] = True
41-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
42-
('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
43-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
44-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
45-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
46-
47-
wdm_next_args['test_tag'] = self.__class__.__name__
48-
wdm_next_args['test_case_name'] = ['Wdm-NestService-F04: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts',
49-
'Wdm-NestService-M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts']
5035
print 'test file: ' + self.__class__.__name__
5136
print "weave-wdm-next test F04 and M08"
52-
super(test_weave_wdm_next_service_mutual_subscribe_08, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_08,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5340

5441

5542
if __name__ == "__main__":
5643
unittest.main()
57-

‎src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_09.py‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,14 @@
3030

3131

3232
class test_weave_wdm_next_service_mutual_subscribe_09(weave_wdm_next_test_service_base):
33+
3334
def test_weave_wdm_next_service_mutual_subscribe_09(self):
34-
wdm_next_args = {}
35-
36-
wdm_next_args['wdm_option'] = "mutual_subscribe"
37-
wdm_next_args['final_client_status'] = 0
38-
wdm_next_args['enable_client_flip'] = 1
39-
wdm_next_args['test_client_iterations'] = 10
40-
wdm_next_args['client_clear_state_between_iterations'] = True
41-
wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
42-
('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
43-
('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
44-
('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
45-
('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
46-
47-
wdm_next_args['test_tag'] = self.__class__.__name__
48-
wdm_next_args['test_case_name'] = ['Wdm-NestService-F05: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels',
49-
'Wdm-NestService-M09: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels']
5035
print 'test file: ' + self.__class__.__name__
5136
print "weave-wdm-next test F05 and M09"
52-
super(test_weave_wdm_next_service_mutual_subscribe_09, self).weave_wdm_next_test_service_base(wdm_next_args)
37+
wdm_next_args = self.get_test_param_json(self.__class__.__name__)
38+
super(test_weave_wdm_next_service_mutual_subscribe_09,
39+
self).weave_wdm_next_test_service_base(wdm_next_args)
5340

5441

5542
if __name__ == "__main__":
5643
unittest.main()
57-

0 commit comments

Comments
 (0)