[Checkins] SVN: Sandbox/nadako/zope.browserresource/src/zope/browserresource/ Improve test coverage.

[Dan Korostelev]

Log message for revision 103137:
  Improve test coverage.

Changed:
  U   Sandbox/nadako/zope.browserresource/src/zope/browserresource/interfaces.py
  U   Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py
  U   Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directory.py

-=-
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/interfaces.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/interfaces.py	2009-08-24 11:20:44 UTC (rev 103136)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/interfaces.py	2009-08-24 11:29:57 UTC (rev 103137)
@@ -28,7 +28,7 @@
 class IResourceFactory(Interface):
     
     def __call__(request):
-        pass
+        """Return an IResource object"""
 
 class IResourceFactoryFactory(Interface):
     """A factory for IResourceFactory objects

Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py	2009-08-24 11:20:44 UTC (rev 103136)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py	2009-08-24 11:29:57 UTC (rev 103137)
@@ -82,32 +82,6 @@
     def tearDown(self):
         super(Test, self).tearDown()
 
-    def testSkinResource(self):
-        self.assertEqual(
-            component.queryAdapter(Request(IV), name='test'), None)
-
-        xmlconfig(StringIO(template % (
-            '''
-            <browser:resource
-                name="test"
-                factory="zope.component.testfiles.views.RZMI"
-                layer="
-                  zope.browserresource.tests.test_directives.ITestLayer"
-                />
-            <browser:resource
-                name="test"
-                factory="zope.component.testfiles.views.R1"
-                />
-            '''
-            )))
-
-        self.assertEqual(
-            component.queryAdapter(request, name='test').__class__, R1)
-        self.assertEqual(
-            component.queryAdapter(
-                TestRequest(skin=ITestSkin), name='test').__class__,
-            RZMI)
-
     def testI18nResource(self):
         self.assertEqual(component.queryAdapter(request, name='test'), None)
 
@@ -219,7 +193,7 @@
         r = component.getAdapter(request, name='test.gif')
         self.assertTrue(isinstance(r, ImageResource))
 
-    def testSkinResource(self):
+    def test_SkinResource(self):
         self.assertEqual(component.queryAdapter(request, name='test'), None)
 
         path = os.path.join(tests_path, 'testfiles', 'test.pt')
@@ -240,5 +214,6 @@
         r = removeSecurityProxy(r)
         self.assertEqual(r._testData(), open(path, 'rb').read())
 
+
 def test_suite():
     return unittest.makeSuite(Test)

Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directory.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directory.py	2009-08-24 11:20:44 UTC (rev 103136)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directory.py	2009-08-24 11:29:57 UTC (rev 103137)
@@ -64,6 +64,15 @@
                           resource.request, 'doesnotexist')
         self.assertRaises(NotFound, resource.get, 'doesnotexist')
 
+    def testBrowserDefault(self):
+        path = os.path.join(test_directory, 'testfiles')
+        request = TestRequest()
+        factory = DirectoryResourceFactory(path, checker, 'testfiles')
+        resource = factory(request)
+        view, next = resource.browserDefault(request)
+        self.assertEquals(view(), '')
+        self.assertEquals(next, ())
+
     def testGetitem(self):
         path = os.path.join(test_directory, 'testfiles')
         request = TestRequest()