From 371b2b865bba5c554dd3e2dff2e167b3641beb16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 11 Mar 2010 10:11:29 +0000 Subject: [PATCH] - check behaviour of CategoryTool_importCategoryFile when there is already expired category not present in coming spreadsheet git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33626 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5OOo/tests/testOOoImport.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/product/ERP5OOo/tests/testOOoImport.py b/product/ERP5OOo/tests/testOOoImport.py index 337dae53ee..379b763ac9 100644 --- a/product/ERP5OOo/tests/testOOoImport.py +++ b/product/ERP5OOo/tests/testOOoImport.py @@ -1049,9 +1049,12 @@ class TestOOoImportWeb(TestOOoImportMixin, ERP5TypeTestCase): return ('erp5_base', 'erp5_web', 'erp5_ooo_import') def test_CategoryTool_importCategoryFileExpirationSupport(self): - # tests simple use of CategoryTool_importCategoryFile script + """Import category file with expiration request, and do it again to be + sure that expired categories will not be expired again.""" region = self.portal.portal_categories.region dummy_region = region.newContent(id='dummy_region') + dummy_expired_region = region.newContent(id='dummy_expired_region') + dummy_expired_region.expire() transaction.commit() self.tic() self.portal.portal_categories.CategoryTool_importCategoryFile( @@ -1059,9 +1062,11 @@ class TestOOoImportWeb(TestOOoImportMixin, ERP5TypeTestCase): existing_category_list='expire') transaction.commit() self.tic() - self.assertEqual(3, len(region)) + self.assertEqual(4, len(region)) self.assertTrue('dummy_region' in region.objectIds()) self.assertEqual(region.dummy_region.getValidationState(), 'expired') + self.assertTrue('dummy_expired_region' in region.objectIds()) + self.assertEqual(region.dummy_expired_region.getValidationState(), 'expired') self.assertTrue('europe' in region.objectIds()) self.assertTrue('germany' in region.europe.objectIds()) self.assertTrue('france' in region.europe.objectIds()) -- 2.30.9