Changeset 2024

Timestamp:

06/10/09 14:59:39 (9 months ago)

Author:

JensDiemer

Message:

* Add "Design" test: Check the created stylesheet links in the html header
* changes the verbose level for some info print statements

Location:

branches/0.9/pylucid_project/tests

Files:

• test_Design.py (added)
• test_tools/pylucid_test_data.py (modified) (16 diffs)
• __init__.py (modified) (1 diff)

branches/0.9/pylucid_project/tests/test_tools/pylucid_test_data.py

@@ -48 +48 @@
             id=self.index, defaults={"name": site_name, "domain": domain}
         )
-        if self.verbosity:
+        if self.verbosity>=2:
             if created:
                 print("sites entry '%s' created." % site)
@@ -87 +87 @@
             code=lang_code, defaults={"description": description}
         )
-        if self.verbosity:
+        if self.verbosity>=2:
             if created:
                 print("Language '%s' created." % lang_code)
@@ -152 +152 @@
     },
 }
+TEST_CSS_FILEPATH1 = "unittest/test1.css"
+TEST_CSS_FILEPATH2 = "unittest/test2.css"
+
 TEST_HEADFILES = {
-    "unittest/test.css": {
-        "description": "CSS file for unittests.",
-        "content": ".test { color:red; } /* "+SITEINFO_TAG+" */",
+    TEST_CSS_FILEPATH1: {
+        "description": "CSS file 1 for unittests.",
+        "content": ".test1 { color:red; } /* "+SITEINFO_TAG+" */",
+    },
+    TEST_CSS_FILEPATH2: {
+        "description": "CSS file 2 for unittests.",
+        "content": ".test2 { color:red; } /* "+SITEINFO_TAG+" */",
     }
 }
@@ -161 +168 @@
     "unittest_design": {
         "template_name": "site_template/normal.html",
-        "headfiles": ("unittest/test.css",),
+        "headfiles": (TEST_CSS_FILEPATH1,TEST_CSS_FILEPATH2),
     },
 }
@@ -209 +216 @@
         user.is_superuser = is_superuser
         user.save()
-        if verbosity:
+        if verbosity>=2:
             print "Test user %r created." % user
         
@@ -226 +233 @@
             template.content = template.content.replace(SITEINFO_TAG, site.name)
             template.save()
-            if verbosity:
+            if verbosity>=2:
                 print("template '%s' created" % template_name)
-        elif verbosity:
+        elif verbosity>=2:
                 print("template '%s' exist" % template_name)
                 
-        if verbosity:
+        if verbosity>=2:
             print("add template on site: %s" % site.name)
         template.sites.add(site)
@@ -249 +256 @@
         headfile.save(request)
         headfile.site.add(site)
-        if verbosity:
+        if verbosity>=2:
             print("EditableStaticFile '%s' created on site: %s" % (filepath, site.name))
         
@@ -267 +274 @@
             design.save(request)
             design.site.add(site)
-            if verbosity:
+            if verbosity>=2:
                 print("design '%s' created." % design_name)
             # Add headfiles
@@ -273 +280 @@
                 headfile = headfile_map[filename+site.name]
                 design.headfiles.add(headfile)
-                if verbosity:
+                if verbosity>=2:
                     print("Add headfile '%s'." % headfile)
             design.save(request)
-        elif verbosity:
+        elif verbosity>=2:
                 print("Design '%s' exist." % design_name)
         
@@ -295 +302 @@
     for page_data in pages:
         slug = page_data["slug"]
-        print slug
         
         #____________________________________________________
@@ -311 +317 @@
         )
         url = tree_entry.get_absolute_url()
-        if verbosity:
+        if verbosity>=2:
             if created:
                 #tree_entry.save(request)
@@ -328 +334 @@
                 defaults = default_dict
             )
-            if verbosity:
+            if verbosity>=2:
                 if created:
                     #pagemeta_entry.save(request)
@@ -342 +348 @@
                     defaults = {"pagemeta": pagemeta_entry, "app_label": page_data["plugin"]},
                 )
-                if verbosity:
+                if verbosity>=2:
                     if created:
                         print("PluginPage '%s' created." % pluginpage)
@@ -361 +367 @@
                 content_entry.content = content_entry.content.replace(SITEINFO_TAG, site.name)
                 content_entry.save(request)
-                if verbosity:
+                if verbosity>=2:
                     if created:
                         print("PageContent '%s' created." % content_entry)
@@ -368 +374 @@
         
         if "sub-pages" in page_data:
-            print "--- create sub pages ---"
+            if verbosity>=2:
+                print "--- create sub pages ---"
             create_pages(verbosity, request, design_map, site,
                 pages=page_data["sub-pages"], parent=tree_entry
             )
-            print "---"
+            if verbosity>=2:
+                print "---"
 
 
@@ -386 +394 @@
     create_pages(verbosity, request, design_map, site, pages=TEST_PAGES)
     
+    
+def get_fake_request(usertype):
+    """ Create a fake HttpRequest instance. Needed in some UpdateInfoBaseModel save() methods """
+    request = HttpRequest()
+    request.user = get_user(usertype=usertype)
+    return request
 
 
 def create_pylucid_test_data(site=None, verbosity=True):
     """ create complete test data for "running" PyLucid """
-    if verbosity:
+    if verbosity>=2:
         print "\nCreate complete test data for 'running' PyLucid"
         
     create_testusers(verbosity)
     
-    request = HttpRequest()
-    request.user = get_user(usertype="superuser")
+    request = get_fake_request(usertype="superuser")
     
     for site in TestSites(verbosity):

branches/0.9/pylucid_project/tests/__init__.py

@@ -3 +3 @@
 # IMPORTANT: We must import all test files here, for test_runner.get_all_tests():
 from test_admin_site import *
+from test_Design import *
 from test_PageContent import *
 from test_PluginAPI import *