From 15a3c6f561563eb53ff1cc3637fc6afa75da9e89 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 20 Nov 2009 05:38:38 +0000 Subject: Passable stab at supporting an imperative mode. ZCML directives which accept paths now register absolute paths, while imperative registrations now register resource specifications. --- repoze/bfg/tests/test_resource.py | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'repoze/bfg/tests/test_resource.py') diff --git a/repoze/bfg/tests/test_resource.py b/repoze/bfg/tests/test_resource.py index efdc15c63..f14d9860d 100644 --- a/repoze/bfg/tests/test_resource.py +++ b/repoze/bfg/tests/test_resource.py @@ -341,27 +341,32 @@ class TestDirectoryOverride(unittest.TestCase): result = o('baz/notfound.pt') self.assertEqual(result, None) -class Test_resource_spec(unittest.TestCase): - def _callFUT(self, path, package): - from repoze.bfg.resource import resource_spec - return resource_spec(path, package) +class Test_resolve_resource_spec(unittest.TestCase): + def _callFUT(self, spec, package_name='__main__'): + from repoze.bfg.resource import resolve_resource_spec + return resolve_resource_spec(spec, package_name) def test_abspath(self): import os here = os.path.dirname(__file__) - path= os.path.abspath(here) - self.assertEqual(self._callFUT(path, 'apackage'), path) + path = os.path.abspath(here) + package_name, filename = self._callFUT(path, 'apackage') + self.assertEqual(filename, path) + self.assertEqual(package_name, None) def test_rel_spec(self): - pkg, path = 'repoze.bfg.tests', 'test_resource.py' - self.assertEqual(self._callFUT(path, pkg), - 'repoze.bfg.tests:test_resource.py') + pkg = 'repoze.bfg.tests' + path = 'test_resource.py' + package_name, filename = self._callFUT(path, pkg) + self.assertEqual(package_name, 'repoze.bfg.tests') + self.assertEqual(filename, 'test_resource.py') def test_abs_spec(self): - pkg, path = 'repoze.bfg.tests', 'repoze.bfg.nottests:test_resource.py' - self.assertEqual(self._callFUT(path, pkg), - 'repoze.bfg.nottests:test_resource.py') - + pkg = 'repoze.bfg.tests' + path = 'repoze.bfg.nottests:test_resource.py' + package_name, filename = self._callFUT(path, pkg) + self.assertEqual(package_name, 'repoze.bfg.nottests') + self.assertEqual(filename, 'test_resource.py') class TestFileOverride(unittest.TestCase): def _getTargetClass(self): -- cgit v1.2.3