[Erp5-report] r31894 kazuhiko - /erp5/trunk/products/ERP5/tests/testInvoice.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Jan 22 09:25:22 2010
New Revision: 31894

URL: http://svn.erp5.org?rev=31894&view=rev
Log:
move _acceptDivergenceOnInvoice and _adoptDivergenceOnInvoice to TestInvoice class because they are also used in TestPurchaseInvoice

Modified:
    erp5/trunk/products/ERP5/tests/testInvoice.py

Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=31894&r1=31893&r2=31894&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Fri Jan 22 09:25:22 2010
@@ -1448,6 +1448,13 @@
 
  
 
+  def _acceptDivergenceOnInvoice(self, invoice, divergence_list):
+    builder_list = invoice.getBuilderList()
+    self.assertEquals(2, len(builder_list))
+    for builder in builder_list:
+      builder.solveDivergence(invoice.getRelativeUrl(),
+                              divergence_to_accept_list=divergence_list)
+
   def test_accept_quantity_divergence_on_invoice_with_stopped_packing_list(
                 self, quiet=quiet):
     sequence_list = SequenceList()
@@ -1501,6 +1508,13 @@
     self.assertEquals([], packing_list.getDivergenceList())
     self.assertEquals('solved', packing_list.getCausalityState())
  
+  def _adoptDivergenceOnInvoice(self, invoice, divergence_list):
+    builder_list = invoice.getBuilderList()
+    self.assertEquals(2, len(builder_list))
+    for builder in builder_list:
+      builder.solveDivergence(invoice.getRelativeUrl(),
+                              divergence_to_adopt_list=divergence_list)
+
   def test_adopt_quantity_divergence_on_invoice_line_with_stopped_packing_list(
                 self, quiet=quiet):
     # #1053
@@ -3346,24 +3360,10 @@
       """)
     sequence_list.play(self, quiet=quiet)
 
-  def _acceptDivergenceOnInvoice(self, invoice, divergence_list):
-    builder_list = invoice.getBuilderList()
-    self.assertEquals(2, len(builder_list))
-    for builder in builder_list:
-      builder.solveDivergence(invoice.getRelativeUrl(),
-                              divergence_to_accept_list=divergence_list)
-
   def _adoptDivergenceOnPackingList(self, packing_list, divergence_list):
     builder_list = packing_list.getBuilderList()
     for builder in builder_list:
       builder.solveDivergence(packing_list.getRelativeUrl(),
-                              divergence_to_adopt_list=divergence_list)
-
-  def _adoptDivergenceOnInvoice(self, invoice, divergence_list):
-    builder_list = invoice.getBuilderList()
-    self.assertEquals(2, len(builder_list))
-    for builder in builder_list:
-      builder.solveDivergence(invoice.getRelativeUrl(),
                               divergence_to_adopt_list=divergence_list)
 
   def test_accept_quantity_divergence_on_invoice_with_started_packing_list(