From 8535452ec1e850079f8601c0f14a1bd7212147ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Mon, 19 Nov 2012 14:04:05 +0100
Subject: [PATCH] Check children rule generation.

---
 .../testSlapOSAccountingDefaultInvoicingRule.py       |  6 ++++++
 ...testSlapOSAccountingDefaultSubscriptionItemRule.py | 11 +++++++----
 master/bt5/slapos_accounting/bt/revision              |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultInvoicingRule.py b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultInvoicingRule.py
index 2aea9b0a1..431e1fc6c 100644
--- a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultInvoicingRule.py
+++ b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultInvoicingRule.py
@@ -123,6 +123,12 @@ class TestDefaultInvoicingRule(testSlapOSMixin):
       self.assertEqual(['business_process_module/slapos_sale_business_p'
           'rocess/invoice_path', 'business_process_module/slapos_sale_b'
           'usiness_process/invoice'], simulation_movement.getCausalityList())
+      # check children rules' type
+      child_applied_rule_type_list = [q.getSpecialiseReference() for q in \
+          simulation_movement.contentValues(portal_type='Applied Rule')]
+      self.assertSameSet(
+          ['default_invoice_transaction_rule', 'default_trade_model_rule'],
+          child_applied_rule_type_list)
     finally:
       SimulationMovement.getSimulationState = SimulationMovement\
         .original_getSimulationState
diff --git a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultSubscriptionItemRule.py b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultSubscriptionItemRule.py
index 889c91d0a..9181715ee 100644
--- a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultSubscriptionItemRule.py
+++ b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingDefaultSubscriptionItemRule.py
@@ -117,7 +117,7 @@ class TestHostingSubscriptionSimulation(testSlapOSMixin):
 
       applied_rule_list_level_2 = simulation_movement.contentValues(
           portal_type='Applied Rule')
-      self.assertEqual(0, len(applied_rule_list_level_2))
+      self.assertEqual(1, len(applied_rule_list_level_2))
       # check next simulation movement
       idx += 1
 
@@ -216,9 +216,12 @@ class TestHostingSubscriptionSimulation(testSlapOSMixin):
       self.assertEqual('planned', simulation_movement.getSimulationState())
       self.assertEqual(None, simulation_movement.getDelivery())
 
-      applied_rule_list_level_2 = simulation_movement.contentValues(
-          portal_type='Applied Rule')
-      self.assertEqual(0, len(applied_rule_list_level_2))
+      # check children rules' type
+      child_applied_rule_type_list = [q.getSpecialiseReference() for q in \
+          simulation_movement.contentValues(portal_type='Applied Rule')]
+      self.assertSameSet( ['default_invoicing_rule'],
+          child_applied_rule_type_list)
+
       # check next simulation movement
       idx += 1
     def isFrozen(*args, **kwargs):
diff --git a/master/bt5/slapos_accounting/bt/revision b/master/bt5/slapos_accounting/bt/revision
index 832332893..3d9aebb2c 100644
--- a/master/bt5/slapos_accounting/bt/revision
+++ b/master/bt5/slapos_accounting/bt/revision
@@ -1 +1 @@
-67
\ No newline at end of file
+68
\ No newline at end of file
-- 
2.30.9