[Checkins] SVN: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py Full coverage for z.c.xmlconfig.exclude.
Tres Seaver
cvs-admin at zope.org
Thu May 10 23:26:31 UTC 2012
Log message for revision 125830:
Full coverage for z.c.xmlconfig.exclude.
Changed:
U zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py
-=-
Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py 2012-05-10 23:26:23 UTC (rev 125829)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py 2012-05-10 23:26:27 UTC (rev 125830)
@@ -577,13 +577,56 @@
self.assertTrue(fqn3 in context._seen_files)
-class Test_exclude(unittest.TestCase):
+class Test_exclude(_Catchable, unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.configuration.xmlconfig import exclude
return exclude(*args, **kw)
+ def test_both_file_and_files_passed(self):
+ context = FauxContext()
+ exc = self.assertRaises(ValueError,
+ self._callFUT, context, 'tests//sample.zcml',
+ files=['tests/*.zcml'])
+ self.assertEqual(str(exc), "Must specify only one of file or files")
+ def test_neither_file_nor_files_passed(self):
+ from zope.configuration.config import ConfigurationMachine
+ from zope.configuration.tests import samplepackage
+ context = ConfigurationMachine()
+ context.package = samplepackage
+ fqn = _packageFile(samplepackage, 'configure.zcml')
+ self._callFUT(context)
+ self.assertEqual(len(context.actions), 0)
+ self.assertEqual(len(context._seen_files), 1)
+ self.assertTrue(fqn in context._seen_files)
+
+ def test_w_file_passed(self):
+ from zope.configuration.config import ConfigurationMachine
+ from zope.configuration import tests
+ context = ConfigurationMachine()
+ context.package = tests
+ fqn = _packageFile(tests, 'simple.zcml')
+ self._callFUT(context, 'simple.zcml')
+ self.assertEqual(len(context.actions), 0)
+ self.assertEqual(len(context._seen_files), 1)
+ self.assertTrue(fqn in context._seen_files)
+
+ def test_w_files_passed_and_package(self):
+ from zope.configuration.config import ConfigurationMachine
+ from zope.configuration.tests import samplepackage
+ context = ConfigurationMachine()
+ fqn1 = _packageFile(samplepackage, 'baz1.zcml')
+ fqn2 = _packageFile(samplepackage, 'baz2.zcml')
+ fqn3 = _packageFile(samplepackage, 'baz3.zcml')
+ self._callFUT(context, package=samplepackage, files='baz*.zcml')
+ self.assertEqual(len(context.actions), 0)
+ self.assertEqual(len(context._seen_files), 3)
+ self.assertTrue(fqn1 in context._seen_files)
+ self.assertTrue(fqn2 in context._seen_files)
+ self.assertTrue(fqn3 in context._seen_files)
+
+
class Test_includeOverrides(unittest.TestCase):
def _callFUT(self, *args, **kw):
More information about the checkins
mailing list