More testing stuff.

Author: vinodc

app/fixtures/test_fixture.json

@@ -25,7 +25,25 @@
       "user": 2, 
       "snapshot_width": 1
     }
-  }, 
+  },
+  {
+    "pk": 2, 
+    "model": "app.posterboard", 
+    "fields": {
+      "display_position": null, 
+      "title_path": "userhomepage1", 
+      "title": "userhomepage1", 
+      "created_at": "2011-04-04 17:33:54", 
+      "updated_at": "2011-04-04 17:33:54", 
+      "private": false, 
+      "snapshot_height": 1, 
+      "display_set": null, 
+      "snapshot": "", 
+      "user": 2, 
+      "snapshot_width": 1,
+      "is_user_home_page": true
+    }
+  },
   {
     "pk": 22, 
     "model": "auth.permission", 

app/models.py

@@ -95,8 +95,12 @@ class Posterboard(CommonInfo):
                                  blank=True, null=True)
 
     def clean(self):
-        if self.title == "userhomepage":
-            self.title += " "+str(Posterboard.objects.filter(user=self.user).count()+1)
+        try:
+            if self.title == "userhomepage" and self.user is not None:
+                self.title += " "+str(Posterboard.objects.filter(user=self.user).count()+1)
+        except:
+            # Probably just form validation here.
+            pass
         self.title_path = title_to_path(self.title)
         if len(self.title_path) < 5:
             raise ValidationError('Please enter a longer posterboard title', 

app/tests.py

@@ -55,8 +55,6 @@ def setUp(self):
         self.title = 'testposterboardpost'
 
     def create_posterboard_general(self, title='', private=False, is_user_home_page=False):
-        if is_user_home_page:
-            title = "userhomepage"
         data = {
             'title': title,
             'private': private,
@@ -121,6 +119,7 @@ def test_create_delete_one_user_home_page(self):
         pb_path = container['posterboard-path']
 
         self.assertEqual(Posterboard.objects.get(pk=pb_id).is_user_home_page, True)
+        self.assertRegexpMatches(pb_path, r'^userhomepage-\d+$', 'User home page title malformed: ' + pb_path)
         self.assertEqual(self.delete_posterboard(pb_path).status_code, 200)
         self.assertEqual(len(Posterboard.objects.filter(pk=pb_id)), 0)
 
@@ -211,9 +210,13 @@ class ElementHandlerTest (TestCase):
     fixtures = ['test_fixture.json']
 
     def setUp(self):
+        settings.VIDEO_CONVERT_SYNC = True
+        
         [self.c, self.user] = login_user('test','test')
         self.pb = Posterboard.objects.filter(user__username=self.user.username)[0]
+        self.uhp = Posterboard.objects.filter(user__username=self.user.username, is_user_home_page=True)[0]
         self.pbpath = '/people/'+self.user.username+'/posterboards/'+self.pb.title_path+'/elements/'
+        self.uhppath = '/people'+self.user.username+'/posterboards/'+self.uhp.title_path+'/elements/'
 
         # Set paths to files.
         self.imagepath = os.path.join(settings.TEST_MEDIA_ROOT,'mountains.jpg')
@@ -222,13 +225,16 @@ def setUp(self):
         self.audiopath = os.path.join(settings.TEST_MEDIA_ROOT,'shimmer.wav')
 
 
-    def create_image(self):
+    def create_image(self, homepage=False):
         img = open(self.imagepath,'rb')
         data = {
             'element-type':'image',
             'image':img
         }
-        response = self.c.post(self.pbpath[:-1]+'.json',data)
+        if(homepage):
+            response = self.c.post(self.uhppath[:-1]+'.json',data)
+        else:
+            response = self.c.post(self.pbpath[:-1]+'.json',data)
         img.close()
         return response
 
@@ -250,13 +256,6 @@ def create_video_to_convert(self):
         }
         response = self.c.post(self.pbpath[:-1]+'.json',data)
         video.close()
-        # Give video time to convert
-        sleeprange = range(0,60)
-        sleeprange.reverse()
-        for i in sleeprange:
-            if i % 10 == 0:
-                print str(i) + "..."
-            time.sleep(1)
         return response
 
     def create_audio(self):
@@ -383,11 +382,14 @@ def update_state_wrapper(self, state_id, property):
             val = eval('state.'+key)
             self.assertEqual(property[key],val)
 
-    def delete_element(self, id):
+    def delete_element(self, id, homepage=False):
         data = {
             '_action':'delete'
         }
-        response = self.c.get(self.pbpath+str(id)+'/.json',data)
+        if(homepage):
+            response = self.c.get(self.uhppath+str(id)+'/.json',data)
+        else:
+            response = self.c.get(self.pbpath+str(id)+'/.json',data)
         return response
 
     def delete_state(self, response):
@@ -403,7 +405,7 @@ def test_create_delete_one_image(self):
         self.assertEqual(self.delete_element(element_id).status_code, 200)
         self.assertEqual(len(Element.objects.filter(pk=element_id)), 0)
 
-    def est_create_delete_one_video(self):
+    def test_create_delete_one_video(self):
         response = self.create_video()
         container = eval(response._container[0])
         self.assertEqual(response.status_code, 200)
@@ -412,7 +414,7 @@ def est_create_delete_one_video(self):
         self.assertEqual(self.delete_element(element_id).status_code, 200)
         self.assertEqual(len(Element.objects.filter(pk=element_id)), 0)
 
-    def est_create_delete_one_video_to_convert(self):
+    def test_create_delete_one_video_to_convert(self):
         response = self.create_video_to_convert()
         container = eval(response._container[0])
         self.assertEqual(response.status_code, 200)
@@ -421,8 +423,8 @@ def est_create_delete_one_video_to_convert(self):
         self.assertEqual(self.delete_element(element_id).status_code, 200)
         self.assertEqual(len(Element.objects.filter(pk=element_id)), 0)
 
-    def est_create_delete_one_audio(self):
-        response = self.create_video()
+    def test_create_delete_one_audio(self):
+        response = self.create_audio()
         container = eval(response._container[0])
         self.assertEqual(response.status_code, 200)
         element_id = container['element-id']
@@ -453,7 +455,7 @@ def test_update_one_image(self):
         self.assertEqual(len(Element.objects.filter(pk=element_id)), 0) 
         self.assertEqual(len(ImageState.objects.filter(pk=state_id)), 0) 
 
-    def est_update_one_video(self):
+    def test_update_one_video(self):
         response = self.create_video()
         container = eval(response._container[0])
         self.assertEqual(response.status_code, 200)
@@ -467,7 +469,7 @@ def est_update_one_video(self):
         self.assertEqual(len(Element.objects.filter(pk=element_id)), 0) 
         self.assertEqual(len(VideoState.objects.filter(pk=state_id)), 0)
 
-    def est_update_one_audio(self):
+    def test_update_one_audio(self):
         response = self.create_audio()
         container = eval(response._container[0])
         self.assertEqual(response.status_code, 200)

app/views.py

@@ -362,14 +362,16 @@ def posterboards_handler(request, blogger=None, posterboard=None,
 
     # create, make sure to check user.id as only logged in user can create new posterboard
     elif user.id and request.method == 'POST':
-        pbForm = PosterboardForm(request.POST)           
+        pbForm = PosterboardForm(request.POST)
+        if pbForm.data['title'] is None or pbForm.data['title'] == '':
+            pbForm.data['title'] = 'userhomepage'
         if pbForm.is_valid():
             # commit=False creates and returns the model object but doesn't save it.
             # Remove it if unnecessary.
             posterboard = pbForm.save(commit=False)
             try:
+                posterboard.user = user
                 posterboard.full_clean()
-                user.posterboard_set.add(posterboard)
                 posterboard.save()
             except ValidationError, e:
                 return ErrorResponse(str(e), format)
@@ -517,6 +519,10 @@ def elements_handler(request, blogger=None, posterboard=None, element=None,
             childState.save()
 
             if(element.type == "video"):
+                if settings.VIDEO_CONVERT_SYNC:
+                    from videologue.management.commands.vlprocess import process_files
+                    process_files()
+                else: 
                     os.system('python '+ settings.PROJECT_ROOT + '/manage.py vlprocess& 2>&1 1>>'+ settings.LOG_FILENAME)
 
             data['element-id'] = element.id

settings.py

@@ -62,6 +62,7 @@
 VIDEOLOGUE_ENCODE_MP4 = False
 VIDEOLOGUE_VIDEO_SIZE = '720x480'
 VIDEOLOGUE_IMAGE_SIZE = '720x480'
+VIDEO_CONVERT_SYNC = False # Don't set this to True, unless you are testing. This is handled in test.
 PHOTOLOGUE_DIR = 'videos'
 VIDEOLOGUE_DIR = 'videos' 
 CONVERSION_TIME = 55 # in seconds