diff --git a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingSlapOSRequestUpdateHostingSubscriptionOpenSaleOrderAlarm.py b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingSlapOSRequestUpdateHostingSubscriptionOpenSaleOrderAlarm.py index 5f7bc4afe2021d29dd0d56e4b5676513d2d282f2..adad5fb6db5acdd91d33937d10f6d6a91cfe2fbe 100644 --- a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingSlapOSRequestUpdateHostingSubscriptionOpenSaleOrderAlarm.py +++ b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingSlapOSRequestUpdateHostingSubscriptionOpenSaleOrderAlarm.py @@ -75,6 +75,11 @@ class TestOpenSaleOrderAlarm(testSlapOSMixin): self.assertEqual('SlapOS Subscription Open Sale Order', open_sale_order.getTitle()) + self.assertEqual(0, len(open_sale_order.contentValues())) + open_sale_order_template = self.portal.restrictedTraverse( + self.portal.portal_preferences.getPreferredOpenSaleOrderTemplate()) + self.assertTrue(all([q in open_sale_order.getCategoryList() \ + for q in open_sale_order_template.getCategoryList()])) @simulateHostingSubscription_requestUpdateOpenSaleOrder def test_alarm_HS_validated(self): @@ -235,6 +240,8 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin): self.portal.portal_preferences.getPreferredOpenSaleOrderLineTemplate()) self.assertEqual(open_sale_order_line_template.getResource(), line.getResource()) + self.assertTrue(all([q in line.getCategoryList() \ + for q in open_sale_order_line_template.getCategoryList()])) self.assertEqual(None, line.getStartDate()) def test_usualLifetime_HostingSubscription(self): @@ -280,6 +287,8 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin): self.assertEqual(subscription.getRelativeUrl(), line.getAggregate()) open_sale_order_line_template = self.portal.restrictedTraverse( self.portal.portal_preferences.getPreferredOpenSaleOrderLineTemplate()) + self.assertTrue(all([q in line.getCategoryList() \ + for q in open_sale_order_line_template.getCategoryList()])) self.assertEqual(open_sale_order_line_template.getResource(), line.getResource()) self.assertEqual(request_time, line.getStartDate()) @@ -329,6 +338,8 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin): self.assertEqual(subscription.getRelativeUrl(), archived_line.getAggregate()) + self.assertTrue(all([q in archived_line.getCategoryList() \ + for q in open_sale_order_line_template.getCategoryList()])) self.assertEqual(open_sale_order_line_template.getResource(), archived_line.getResource()) self.assertEqual(request_time, archived_line.getStartDate()) diff --git a/master/bt5/slapos_accounting/bt/revision b/master/bt5/slapos_accounting/bt/revision index 3f10ffe7a4c473619c926cfb1e8d95e726e5a0ec..19c7bdba7b1e9bfe80365a50420a6d538ca503c3 100644 --- a/master/bt5/slapos_accounting/bt/revision +++ b/master/bt5/slapos_accounting/bt/revision @@ -1 +1 @@ -15 \ No newline at end of file +16 \ No newline at end of file