Commit b1bbd49a authored by Łukasz Nowak's avatar Łukasz Nowak

- renamed test methods, as their classes contain proper information

 - some formatting


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27037 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d34950d9
...@@ -3262,11 +3262,11 @@ class TestInvoiceRule(TestDeliveryRule): ...@@ -3262,11 +3262,11 @@ class TestInvoiceRule(TestDeliveryRule):
rule_portal_type = 'Invoice Rule' rule_portal_type = 'Invoice Rule'
delivery_line_portal_type = 'Invoice Line' delivery_line_portal_type = 'Invoice Line'
def test_delivery_rule_simulation_ready(self): def test_rule_simulation_ready(self):
# not available on invoice # not available on invoice
return return
def test_delivery_rule_simulation_confirm(self): def test_rule_simulation_confirm(self):
self.createDocuments() self.createDocuments()
self.delivery.plan() self.delivery.plan()
self.assertEqual('planned', self.delivery.getSimulationState()) self.assertEqual('planned', self.delivery.getSimulationState())
...@@ -3275,12 +3275,11 @@ class TestInvoiceRule(TestDeliveryRule): ...@@ -3275,12 +3275,11 @@ class TestInvoiceRule(TestDeliveryRule):
self.checkDeliverySimulation() self.checkDeliverySimulation()
self.modifyDelivery() self.modifyDelivery()
transaction.commit() ; self.tic() transaction.commit() ; self.tic()
self.checkDeliverySimulation() self.checkDeliverySimulation()
class TestInvoiceRuleSaleInvoiceTransaction(TestInvoiceRule): class TestInvoiceRuleSaleInvoiceTransaction(TestInvoiceRule):
delivery_portal_type = 'Sale Invoice Transaction' delivery_portal_type = 'Sale Invoice Transaction'
......
...@@ -1503,7 +1503,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase): ...@@ -1503,7 +1503,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase):
if change_expected: if change_expected:
self.expected_quantity = new_quantity self.expected_quantity = new_quantity
def test_delivery_rule_simulation_confirm(self): def test_rule_simulation_confirm(self):
self.createDocuments() self.createDocuments()
self.delivery.confirm() self.delivery.confirm()
self.assertEqual('confirmed', self.delivery.getSimulationState()) self.assertEqual('confirmed', self.delivery.getSimulationState())
...@@ -1517,7 +1517,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase): ...@@ -1517,7 +1517,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase):
self.checkDeliverySimulation() self.checkDeliverySimulation()
def test_delivery_rule_simulation_ready(self): def test_rule_simulation_ready(self):
self.createDocuments() self.createDocuments()
self.delivery.confirm() self.delivery.confirm()
self.delivery.setReady() self.delivery.setReady()
...@@ -1533,7 +1533,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase): ...@@ -1533,7 +1533,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase):
self.checkDeliverySimulation() self.checkDeliverySimulation()
def test_delivery_rule_simulation_start(self): def test_rule_simulation_start(self):
self.createDocuments() self.createDocuments()
self.delivery.confirm() self.delivery.confirm()
self.delivery.setReady() self.delivery.setReady()
...@@ -1550,7 +1550,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase): ...@@ -1550,7 +1550,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase):
self.checkDeliverySimulation() self.checkDeliverySimulation()
def test_delivery_rule_simulation_stop(self): def test_rule_simulation_stop(self):
self.createDocuments() self.createDocuments()
self.delivery.confirm() self.delivery.confirm()
self.delivery.setReady() self.delivery.setReady()
...@@ -1569,7 +1569,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase): ...@@ -1569,7 +1569,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase):
self.checkDeliverySimulation() self.checkDeliverySimulation()
def test_delivery_rule_simulation_deliver(self): def test_rule_simulation_deliver(self):
self.createDocuments() self.createDocuments()
self.delivery.confirm() self.delivery.confirm()
self.delivery.setReady() self.delivery.setReady()
...@@ -1589,7 +1589,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase): ...@@ -1589,7 +1589,7 @@ class TestDeliveryRule(TestPackingListMixin, ERP5TypeTestCase):
self.checkDeliverySimulation() self.checkDeliverySimulation()
def test_delivery_rule_simulation_cancel(self): def test_rule_simulation_cancel(self):
self.createDocuments() self.createDocuments()
self.delivery.confirm() self.delivery.confirm()
self.assertEqual('confirmed', self.delivery.getSimulationState()) self.assertEqual('confirmed', self.delivery.getSimulationState())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment