[Checkins] SVN: z3ext.resource/trunk/src/z3ext/resource/ more tests

[Nikolay Kim]

Log message for revision 93334:
  more tests

Changed:
  U   z3ext.resource/trunk/src/z3ext/resource/README.txt
  U   z3ext.resource/trunk/src/z3ext/resource/tests.py

-=-
Modified: z3ext.resource/trunk/src/z3ext/resource/README.txt
===================================================================
--- z3ext.resource/trunk/src/z3ext/resource/README.txt	2008-11-24 23:18:19 UTC (rev 93333)
+++ z3ext.resource/trunk/src/z3ext/resource/README.txt	2008-11-25 07:06:38 UTC (rev 93334)
@@ -101,9 +101,10 @@
   >>> dn = tempfile.mkdtemp()
   >>> os.mkdir(os.path.join(dn, 'subfolder'))
   >>> open(os.path.join(dn, 'resource1.css'), 'w').write('''\
+  ... /* zrt-cssregistry: */ 
   ... h1 {
-  ...   color: red;
-  ...   font: fontName;
+  ...   color: fontColor;
+  ...   font: fontFamily;
   ...   background: url('../img1/mybackground.gif');
   ... }''')
   >>> open(os.path.join(dn, 'resource2.js'), 'w').write('test')
@@ -132,8 +133,8 @@
   ...   <z3ext:resourcedirectory
   ...       name="myresources"
   ...       directory="%s"
-  ...	    mapping=".css:custom .js:fileresource
-  ...                resource3.css:fileresource .png:null" />
+  ...	    mapping=".css:zrt .js:fileresource
+  ...                resource3.css:cutom .png:null" />
   ... </configure>
   ... ''' %dn, context=context)
 
@@ -148,15 +149,15 @@
   >>> resource = dirresource.publishTraverse(request, 'resource1.css')
   >>> print resource.GET()
   h1 {
-      color: red;
-      font: fontName;
+      color: #11111111;
+      font: Verdana;
       background: url('../img1/mybackground.gif');
   }
 
   >>> print dirresource['resource1.css'].GET()
   h1 {
-      color: red;
-      font: fontName;
+      color: #11111111;
+      font: Verdana;
       background: url('../img1/mybackground.gif');
   }
 
@@ -179,7 +180,7 @@
 should be file resource, '.png' should be not available
 
   >>> dirresource.publishTraverse(request, 'resource1.css')
-  <z3ext.resource.tests.CustomResource object at ...>
+  <z3ext.resource.zrtresource.zrtresource.ZRTFileResource ...>
 
   >>> dirresource.publishTraverse(request, 'resource2.js')
   <z3ext.resource.fileresource.FileResource object at ...>
@@ -202,9 +203,9 @@
   ...   <z3ext:resourcedirectory
   ...       name="myresources2"
   ...       directory="%s">
-  ...     <resourceType file=".css" type="custom" />
+  ...     <resourceType file=".css" type="zrt" />
   ...     <resourceType file=".js" type="fileresource" />
-  ...     <resourceType file="resource3.css" type="fileresource" />
+  ...     <resourceType file="resource3.css" type="custom" />
   ...     <resourceType file=".png" type="null" />
   ...   </z3ext:resourcedirectory>
   ... </configure>
@@ -214,13 +215,13 @@
   ...    request, interface.Interface, name='myresources2')
 
   >>> dirresource.publishTraverse(request, 'resource1.css')
-  <z3ext.resource.tests.CustomResource object at ...>
+  <z3ext.resource.zrtresource.zrtresource.ZRTFileResource ...>
 
   >>> dirresource.publishTraverse(request, 'resource2.js')
   <z3ext.resource.fileresource.FileResource object at ...>
 
   >>> dirresource.publishTraverse(request, 'resource3.css')
-  <z3ext.resource.fileresource.FileResource object at ...>
+  <z3ext.resource.tests.CustomResource object at ...>
 
   >>> dirresource.publishTraverse(request, 'resource4.jpg')
   <z3ext.resource.fileresource.FileResource object at ...>

Modified: z3ext.resource/trunk/src/z3ext/resource/tests.py
===================================================================
--- z3ext.resource/trunk/src/z3ext/resource/tests.py	2008-11-24 23:18:19 UTC (rev 93333)
+++ z3ext.resource/trunk/src/z3ext/resource/tests.py	2008-11-25 07:06:38 UTC (rev 93334)
@@ -18,15 +18,21 @@
 __docformat__ = "reStructuredText"
 
 import doctest, unittest
-from zope import component
+from zope import component, interface
 from zope.app.testing import placelesssetup
 from zope.traversing import testing
 from zope.traversing.interfaces import ITraversable
 from zope.traversing.namespace import view
 from zope.app.publisher.browser.fileresource import FileResource
 
+from z3c.zrtresource.interfaces import IZRTCommandFactory
+
+from zrtresource import zrtresource
+
 from z3ext.resource import fileresource
 from z3ext.resource.interfaces import IResourceFactoryType
+from z3ext.cssregistry.registry import CSSRegistry
+from z3ext.cssregistry import zcml, command, property, interfaces
 
 
 class CustomResource(fileresource.FileResource):
@@ -53,11 +59,25 @@
         fileresource.filefactory, IResourceFactoryType, name='fileresource')
     component.provideUtility(
         fileresource.imagefactory, IResourceFactoryType, name='imageresource')
+    component.provideUtility(
+        zrtresource.zrtfactory, IResourceFactoryType, name='zrt')
 
     component.provideAdapter(
         fileresource.FileResourceAdapter, (FileResource,))
 
+    component.provideUtility(
+        command.cssregistry_factory, IZRTCommandFactory, 'cssregistry')
 
+    registry = CSSRegistry()
+    registry['fontColor']= property.Property('fontColor', '#11111111')
+    registry['fontFamily']= property.Property('fontFamily', 'Verdana')
+
+    component.provideAdapter(
+        zcml.Factory(registry),
+        (interfaces.ICSSRegistryLayer, interfaces.ICSSRegistryLayer,
+         interface.Interface), interfaces.ICSSRegistry, '')
+
+
 def test_suite():
     return unittest.TestSuite((
             doctest.DocFileSuite(