[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser/tests - testFileResource.py:1.2 testResources.py:1.3

Stephan Richter srichter@cbu.edu
Fri, 14 Jun 2002 12:50:50 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/App/Publisher/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv18258/lib/python/Zope/App/Publisher/Browser/tests

Modified Files:
	testFileResource.py testResources.py 
Log Message:
Finished Zope 3 Unicode support. Zope 3 should now be able to handle all 
unicode formats. Note that ebcoding and decoding unicode strings is based
on the parameters we get from the browser in HTTP_ACCEPT_CHARSET.

All "text strings" (strings that represent human language text) internally 
in Zope 3 should be unicode strings from now on! I have not checked all of 
Zope 3, so if you see a non-unicode text string somewhere, please convert
it simply by putting 'u' before the string literal.

Note that binary data, such as images are not to be encoded. 

The encoding happens on the HTTPRequest/HTTPResponse abstraction level. 
That means that currenty FTP does not profit from this new code; however
FTP is always data anyhow.


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testFileResource.py 1.1 => 1.2 ===
 
 import os
+
 from Zope.Exceptions import NotFoundError
+
+from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.ComponentArchitecture.GlobalResourceService import provideResource
+from Zope.ComponentArchitecture.GlobalAdapterService import provideAdapter
+
+from Zope.I18n.IUserPreferredCharsets import IUserPreferredCharsets
+
+from Zope.Publisher.HTTP.HTTPRequest import IHTTPRequest
+from Zope.Publisher.HTTP.HTTPCharsets import HTTPCharsets
 from Zope.Publisher.Browser.BrowserRequest import TestRequest
-import Zope.App.Publisher.Browser.tests as p        
-test_directory = os.path.split(p.__file__)[0]
+
 from Zope.App.Publisher.Browser.FileResource import FileResourceFactory
 from Zope.App.Publisher.Browser.FileResource import ImageResourceFactory
+import Zope.App.Publisher.Browser.tests as p        
+
+test_directory = os.path.split(p.__file__)[0]
+
+
+class Test(PlacelessSetup, TestCase):
 
-class Test(TestCase):
+    def setUp(self):
+        PlacelessSetup.setUp(self)
+        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)    
 
     def testNoTraversal(self):
 


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testResources.py 1.2 => 1.3 ===
 from unittest import TestCase, TestSuite, main, makeSuite
 
-from Zope.Publisher.Browser.BrowserRequest import TestRequest
 from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
 from Zope.ComponentArchitecture.GlobalResourceService import provideResource
+from Zope.ComponentArchitecture.GlobalAdapterService import provideAdapter
+
+from Zope.I18n.IUserPreferredCharsets import IUserPreferredCharsets
+
+from Zope.Publisher.HTTP.HTTPRequest import IHTTPRequest
+from Zope.Publisher.HTTP.HTTPCharsets import HTTPCharsets
+from Zope.Publisher.Browser.BrowserRequest import TestRequest
 from Zope.Publisher.Browser.IBrowserView import IBrowserView
 
 class Test(PlacelessSetup, TestCase):
+
+    def setUp(self):
+        PlacelessSetup.setUp(self)
+        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)    
+
 
     def test(self):
         from Zope.App.Publisher.Browser.Resources import Resources