Changeset 2068 for branches/0.9/pylucid_project/tests/test_Design.py

Timestamp:

06/25/09 13:17:49 (9 months ago)

Author:

JensDiemer

Message:

• bugfix in pylucid_test_data.create_design()
• add colorscheme arg in Design test
• auto code cleanup

Files:

• branches/0.9/pylucid_project/tests/test_Design.py (modified) (5 diffs)

branches/0.9/pylucid_project/tests/test_Design.py

@@ -22 +22 @@
     def __init__(self, *args, **kwargs):
         super(DesignTest, self).__init__(*args, **kwargs)
-        
+
         self.test_css = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_CSS_FILEPATH)
         self.test_js = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_JS_FILEPATH)
 
-    def _assert_headfiles(self, test_css_url, test_js_url):
+    def _assert_headfiles(self, colorscheme, test_css_url, test_js_url):
         """ Test get_absolute_url() and head links in reponse content """
-        self.failUnlessEqual(self.test_css.get_absolute_url(), test_css_url)
-        self.failUnlessEqual(self.test_js.get_absolute_url(), test_js_url)
-            
+        self.failUnlessEqual(self.test_css.get_absolute_url(colorscheme), test_css_url)
+        self.failUnlessEqual(self.test_js.get_absolute_url(colorscheme), test_js_url)
+
         # Test urls in the page content
         response = self.client.get("/")
@@ -37 +37 @@
                 '1-rootpage content', # PageContent
                 '<title>1-rootpage title',
-                
+
                 # Design head file links:
                 CSS_LINK % test_css_url,
@@ -46 +46 @@
             ),
         )
-        
+
     def test_cached(self):
         """
         Test the stylesheet link, if the css file was cached into the filesystem.
-        """       
+        """
+        colorscheme = None
+
         # Create the cache file, if not exist
         for headfile in (self.test_css, self.test_js):
-            cachepath = headfile.get_cachepath()
+            cachepath = headfile.get_cachepath(colorscheme)
             if not os.path.isfile(cachepath):
-                os.makedirs(os.path.dirname(cachepath)) # Cache dir doesn't exist?
+                cachedir = os.path.dirname(cachepath)
+                if not os.path.isdir(cachedir):
+                    os.makedirs()
                 headfile.save() # The save method should create the cache file
             # Check if file exist
-            self.failUnless(os.path.isfile(cachepath), "Can't create cache file???")
+            self.failUnless(os.path.isfile(cachepath), "Cache file %r doesn't not exist?!?!" % cachepath)
 
         # Test get_absolute_url() and head links in reponse content
-        self._assert_headfiles(
+        self._assert_headfiles(colorscheme,
             "/media/PyLucid/headfile_cache/unittest/test.css",
             "/media/PyLucid/headfile_cache/unittest/test.js"
-        )            
+        )
 
 
@@ -71 +75 @@
         Test the stylesheet link, if the css file was *not* cached into the filesystem.
         """
+        colorscheme = None
+
         # remove style cache file, if exist
         for headfile in (self.test_css, self.test_js):
-            cachepath = headfile.get_cachepath()
+            cachepath = headfile.get_cachepath(colorscheme)
             if os.path.isfile(cachepath):
                 os.remove(cachepath)
@@ -79 +85 @@
 
         # Test get_absolute_url() and head links in reponse content
-        self._assert_headfiles(
+        self._assert_headfiles(colorscheme,
             "/headfile/unittest/test.css",
             "/headfile/unittest/test.js"