Changeset 2040 for branches/0.9/pylucid_project/tests/test_tools/pylucid_test_data.py

Timestamp:

06/17/09 14:56:26 (14 months ago)

Author:

JensDiemer

Message:

use django_tools.middlewares.ThreadLocal? in other parts (muchly in UpdateInfoBaseModel?), too. Make some thing very easy. So we must not put the request object in every "save", "get_or_create" call. And we have mutch less problems in unittests.

Files:

• branches/0.9/pylucid_project/tests/test_tools/pylucid_test_data.py (modified) (20 diffs)

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

@@ -7 +7 @@
     os.environ['DJANGO_SETTINGS_MODULE'] = "pylucid_project.settings"
 
-from django.http import HttpRequest
+#from django.http import HttpRequest
 from django.contrib.auth.models import User#, AnonymousUser
 from django.contrib.sites.models import Site#
@@ -15 +15 @@
 
 from pylucid.models import PageTree, PageMeta, PageContent, PluginPage, Design, \
-                                            EditableHtmlHeadFile, Language
+                                            EditableHtmlHeadFile, Language, UserProfile
 
 SITEINFO_TAG = "***unittest siteinfo tag***"
@@ -200 +200 @@
 def create_testusers(verbosity):
     """
-    Create all available testusers.
+    Create all available testusers and UserProfiles
     """
     def create_user(verbosity, username, password, email, is_staff, is_superuser):
@@ -218 +218 @@
         if verbosity>=2:
             print "Test user %r created." % user
+        return user
         
     for usertype, userdata in TEST_USERS.iteritems():
-        create_user(verbosity, **userdata)
+        user = create_user(verbosity, **userdata)
 
 
@@ -246 +247 @@
 
 
-def create_headfiles(verbosity, headfile_dict, site, request):
+def create_headfiles(verbosity, headfile_dict, site):
     headfile_map = {}
     for filepath, data in headfile_dict.iteritems():
@@ -254 +255 @@
             content = data["content"],
         )
-        headfile.save(request)
+        headfile.save()
         headfile.site.add(site)
         if verbosity>=2:
@@ -263 +264 @@
 
 
-def create_design(verbosity, design_dict, request, site, template_map, headfile_map):   
+def create_design(verbosity, design_dict, site, template_map, headfile_map):   
     design_map = {}
     for design_name, data in design_dict.iteritems():
         template_name = data["template_name"]
         assert template_name in template_map
-        design, created = Design.objects.get_or_create(request,
+        design, created = Design.objects.get_or_create(
             name = design_name, defaults = {"template": template_name,}
         )
         if created:
-            design.save(request)
+            design.save()
             design.site.add(site)
             if verbosity>=2:
@@ -282 +283 @@
                 if verbosity>=2:
                     print("Add headfile '%s'." % headfile)
-            design.save(request)
+            design.save()
         elif verbosity>=2:
                 print("Design '%s' exist." % design_name)
@@ -298 +299 @@
 
 
-def create_pages(verbosity, request, design_map, site, pages, parent=None):
+def create_pages(verbosity, design_map, site, pages, parent=None):
     design = design_map["unittest_design"]
     for page_data in pages:
@@ -309 +310 @@
             page_type = PageTree.PAGE_TYPE
         
-        tree_entry, created = PageTree.objects.get_or_create(request,
+        tree_entry, created = PageTree.objects.get_or_create(
             site=site, slug=slug, parent=parent,
             defaults={
@@ -319 +320 @@
         if verbosity>=2:
             if created:
-                #tree_entry.save(request)
+                #tree_entry.save()
                 print("PageTree '%s' created." % url)
             else:
@@ -330 +331 @@
                 keys = ("title", "description", "keywords")
             )
-            pagemeta_entry, created = PageMeta.objects.get_or_create(request,
+            pagemeta_entry, created = PageMeta.objects.get_or_create(
                 page = tree_entry, lang = language,
                 defaults = default_dict
@@ -336 +337 @@
             if verbosity>=2:
                 if created:
-                    #pagemeta_entry.save(request)
+                    #pagemeta_entry.save()
                     print("PageMeta '%s' - '%s' created." % (language, tree_entry.slug))
                 else:
@@ -343 +344 @@
             if tree_entry.type == PageTree.PLUGIN_TYPE:
                 # It's a plugin page
-                pluginpage, created = PluginPage.objects.get_or_create(request,
+                pluginpage, created = PluginPage.objects.get_or_create(
                     page = tree_entry,
                     lang = language,
@@ -359 +360 @@
                 )
                 default_dict["markup"] = PageContent.MARKUP_CREOLE
-                content_entry, created = PageContent.objects.get_or_create(request,
+                content_entry, created = PageContent.objects.get_or_create(
                     page = tree_entry,
                     lang = language,
@@ -366 +367 @@
                 )
                 content_entry.content = content_entry.content.replace(SITEINFO_TAG, site.name)
-                content_entry.save(request)
+                content_entry.save()
                 if verbosity>=2:
                     if created:
@@ -376 +377 @@
             if verbosity>=2:
                 print "--- create sub pages ---"
-            create_pages(verbosity, request, design_map, site,
+            create_pages(verbosity, design_map, site,
                 pages=page_data["sub-pages"], parent=tree_entry
             )
@@ -386 +387 @@
 
 
-def create_test_data(request, site, verbosity):
+def create_test_data(site, verbosity):
     template_map = create_templates(verbosity, TEST_TEMPLATES, site)
-    headfile_map = create_headfiles(verbosity, TEST_HEADFILES, site, request)
-    design_map = create_design(verbosity, TEST_DESIGNS, request, site, template_map, headfile_map)
+    headfile_map = create_headfiles(verbosity, TEST_HEADFILES, site)
+    design_map = create_design(verbosity, TEST_DESIGNS, site, template_map, headfile_map)
     
     # Create PageTree, PageMeta and PageContent in every test language
-    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
+    create_pages(verbosity, 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
 
 
@@ -406 +407 @@
     if verbosity>=2:
         print "\nCreate complete test data for 'running' PyLucid"
-        
+              
     create_testusers(verbosity)
     
-    request = get_fake_request(usertype="superuser")
+#    request = get_fake_request(usertype="superuser")
     
     for site in TestSites(verbosity):
@@ -416 +417 @@
             print("create test data for site: %r" % site)
             
-        create_test_data(request, site, verbosity)
+        create_test_data(site, verbosity)
 
     if verbosity: