diff --git a/product/ERP5/tests/testOrderBuilder.py b/product/ERP5/tests/testOrderBuilder.py index 7c3915b6996ce668198eb6dfa91a30ae7e4201c2..9788fdf8e1e8f5900733b98cd1b7dd92f03759d9 100644 --- a/product/ERP5/tests/testOrderBuilder.py +++ b/product/ERP5/tests/testOrderBuilder.py @@ -59,14 +59,6 @@ class TestOrderBuilderMixin(TestOrderMixin): max_delay = 0.0 min_flow = 0.0 - def stepClearActivities(self, sequence=None, sequence_list=None, - **kw): - """ - Clear activity tables - """ - activity_tool = self.getPortal().portal_activities - activity_tool.manageClearActivities(keep=0) - def stepSetMaxDelayOnResource(self, sequence=None, sequence_list=None, **kw): """ @@ -364,7 +356,6 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase): run_all_test = 1 common_sequence_string = '\ - ClearActivities \ CreateOrganisation \ CreateNotVariatedResource \ SetMaxDelayOnResource \ @@ -407,7 +398,6 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase): if not run: return sequence_string = '\ - ClearActivities \ CreateOrganisation \ CreateVariatedResource \ SetMaxDelayOnResource \ diff --git a/product/ERP5/tests/testProductionOrder.py b/product/ERP5/tests/testProductionOrder.py index 5c02e7afcfdae79b467b4419231f3932dd40baa3..4f80cb6844b6166259c96594334a2eb57442136e 100644 --- a/product/ERP5/tests/testProductionOrder.py +++ b/product/ERP5/tests/testProductionOrder.py @@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrderMixin): resource_list.append(resource) sequence.edit( resource_list = resource_list ) - def stepClearActivities(self, sequence=None, sequence_list=None, - **kw): - """ - Clear activity tables - """ - activity_tool = self.getPortal().portal_activities - activity_tool.manageClearActivities(keep=0) - def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None, **kw): """ @@ -1297,7 +1289,6 @@ class TestProductionOrderMixin(TestOrderMixin): self.assertEquals(0, len(supply_movement.objectValues())) SOURCING_ORDER_SEQUENCE = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1333,7 +1324,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateNotVariatedResource \ @@ -1359,7 +1349,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1384,7 +1373,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionOrganisation2 \ CreateSupplyOrganisation1 \ @@ -1414,7 +1402,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateNotVariatedResource \ @@ -1453,7 +1440,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionOrganisation2 \ CreateSupplyOrganisation1 \ @@ -1508,7 +1494,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return bootstrap_sequence_string = '\ - ClearActivities \ CreateNotVariatedResource \ CreateOrder \ ' @@ -1593,7 +1578,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1725,7 +1709,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): } sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1770,7 +1753,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return sequence_list = SequenceList() sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CopyPasteSupplyChain \ @@ -1848,7 +1830,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return sequence_list = SequenceList() sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateEmptySC \ diff --git a/product/ERP5/tests/testProductionOrderApparel.py b/product/ERP5/tests/testProductionOrderApparel.py index 2b0005501790de99f73f76efd7b6cd91544a118b..608fbf5544aded6a1a7db004c53c03ef543e7ec9 100644 --- a/product/ERP5/tests/testProductionOrderApparel.py +++ b/product/ERP5/tests/testProductionOrderApparel.py @@ -72,14 +72,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin): portal_type='Category', id=category_id) - def stepClearActivities(self, sequence=None, sequence_list=None, - **kw): - """ - Clear activity tables - """ - activity_tool = self.getPortal().portal_activities - activity_tool.manageClearActivities(keep=0) - def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None, **kw): """ @@ -916,7 +908,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin): self.assertEquals(0, len(supply_movement.objectValues())) SOURCING_ORDER_SEQUENCE = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -952,7 +943,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateVariatedResource \ @@ -978,7 +968,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1003,7 +992,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionOrganisation2 \ CreateSupplyOrganisation1 \ @@ -1033,7 +1021,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateVariatedResource \ @@ -1072,7 +1059,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionOrganisation2 \ CreateSupplyOrganisation1 \ @@ -1127,7 +1113,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa if not run: return bootstrap_sequence_string = '\ - ClearActivities \ CreateNotVariatedResource \ CreateOrder \ ' @@ -1224,7 +1209,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa if not run: return sequence_list = SequenceList() sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CopyPasteSupplyChain \ @@ -1302,7 +1286,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa if not run: return sequence_list = SequenceList() sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateEmptySC \ diff --git a/product/ERP5Legacy/tests/testLegacyProductionOrder.py b/product/ERP5Legacy/tests/testLegacyProductionOrder.py index 25875c44e2af58504848f98c757b84361a368139..84ddddb85b7c721e4ebd5714cde417d27e31e9c4 100644 --- a/product/ERP5Legacy/tests/testLegacyProductionOrder.py +++ b/product/ERP5Legacy/tests/testLegacyProductionOrder.py @@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrderMixin): resource_list.append(resource) sequence.edit( resource_list = resource_list ) - def stepClearActivities(self, sequence=None, sequence_list=None, - **kw): - """ - Clear activity tables - """ - activity_tool = self.getPortal().portal_activities - activity_tool.manageClearActivities(keep=0) - def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None, **kw): """ @@ -1281,7 +1273,6 @@ class TestProductionOrderMixin(TestOrderMixin): self.assertEquals(0, len(supply_movement.objectValues())) SOURCING_ORDER_SEQUENCE = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1317,7 +1308,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateNotVariatedResource \ @@ -1343,7 +1333,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1368,7 +1357,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionOrganisation2 \ CreateSupplyOrganisation1 \ @@ -1398,7 +1386,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateNotVariatedResource \ @@ -1437,7 +1424,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): sequence_list = SequenceList() # Test when order is sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionOrganisation2 \ CreateSupplyOrganisation1 \ @@ -1492,7 +1478,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return bootstrap_sequence_string = '\ - ClearActivities \ CreateNotVariatedResource \ CreateOrder \ ' @@ -1577,7 +1562,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1709,7 +1693,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): } sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateSupplyOrganisation1 \ CreateSourcingSC \ @@ -1754,7 +1737,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return sequence_list = SequenceList() sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CopyPasteSupplyChain \ @@ -1832,7 +1814,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): if not run: return sequence_list = SequenceList() sequence_string = '\ - ClearActivities \ CreateProductionOrganisation1 \ CreateProductionSC \ CreateEmptySC \