From a1773f4a71601295f0c6f9fbcff476a73dcc0623 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 16 Nov 2011 23:03:40 -0300
Subject: separated cache tests into new file and disabled misc tests, whose
 purpose is unclear

---
 askbot/tests/__init__.py     |  3 ++-
 askbot/tests/cache_tests.py  | 43 +++++++++++++++++++++++++++++++++++++++++++
 askbot/tests/db_api_tests.py | 32 --------------------------------
 askbot/views/users.py        |  5 ++++-
 4 files changed, 49 insertions(+), 34 deletions(-)
 create mode 100644 askbot/tests/cache_tests.py

diff --git a/askbot/tests/__init__.py b/askbot/tests/__init__.py
index a9fa761b..ca74d696 100644
--- a/askbot/tests/__init__.py
+++ b/askbot/tests/__init__.py
@@ -1,3 +1,4 @@
+from askbot.tests.cache_tests import *
 from askbot.tests.email_alert_tests import *
 from askbot.tests.on_screen_notification_tests import *
 from askbot.tests.page_load_tests import *
@@ -11,5 +12,5 @@ from askbot.tests.form_tests import *
 from askbot.tests.follow_tests import *
 from askbot.tests.templatefilter_tests import *
 from askbot.tests.markup_test import *
-from askbot.tests.misc_tests import *
+#from askbot.tests.misc_tests import *
 from askbot.tests.post_model_tests import *
diff --git a/askbot/tests/cache_tests.py b/askbot/tests/cache_tests.py
new file mode 100644
index 00000000..5eda8c74
--- /dev/null
+++ b/askbot/tests/cache_tests.py
@@ -0,0 +1,43 @@
+from django.db import connection
+from django.core.urlresolvers import reverse
+from django.conf import settings
+from askbot.tests.utils import AskbotTestCase
+
+class CacheTests(AskbotTestCase):
+    def setUp(self):
+        self.create_user()
+        self.create_user('other_user')
+        self.question = self.post_question()
+        self.post_answer(question = self.question)
+        settings.DEBUG = True  # because it's forsed to False
+
+    def visit_question(self):
+        self.client.get(self.question.get_absolute_url(), follow=True)
+        
+    def test_anonymous_question_cache(self):
+
+        self.visit_question()
+        counter = len(connection.queries)
+        print 'we have %d queries' % counter
+        self.visit_question()
+
+        #second hit to the same question should give fewer queries
+        self.assertTrue(counter > len(connection.queries))
+        settings.DEBUG = False
+
+    def test_authentificated_no_question_cache(self):
+        url = reverse('question', kwargs={'id': self.question.id})
+
+        password = '123'
+        self.other_user.set_password(password)
+        self.client.login(username=self.other_user.username, password=password)
+
+        self.visit_question()
+        counter = len(connection.queries)
+        self.visit_question()
+
+        #expect the same number of queries both times
+        self.assertEqual(counter, len(connection.queries))
+        settings.DEBUG = False
+
+
diff --git a/askbot/tests/db_api_tests.py b/askbot/tests/db_api_tests.py
index e1268d9f..b54bb2e9 100644
--- a/askbot/tests/db_api_tests.py
+++ b/askbot/tests/db_api_tests.py
@@ -5,7 +5,6 @@ e.g. ``some_user.do_something(...)``
 """
 from django.core import exceptions
 from django.core.urlresolvers import reverse
-from django.db import connection
 from django.test.client import Client
 from django.conf import settings
 from askbot.tests.utils import AskbotTestCase
@@ -43,37 +42,6 @@ class DBApiTests(AskbotTestCase):
         self.assertTrue(post.deleted_by == None)
         self.assertTrue(post.deleted_at == None)
 
-    def test_anonymous_question_cache(self):
-        question = self.post_question()
-        settings.DEBUG = True  # because it's forsed to False
-        url = reverse('question', kwargs={'id': question.id})
-
-        client = Client()
-        client.get(url, follow=True)
-        counter = len(connection.queries)
-        client.get(url, follow=True)
-
-        self.assertTrue(counter > len(connection.queries))
-        self.assertEqual(3, len(connection.queries))  # session-related only
-        settings.DEBUG = False
-
-    def test_authentificated_no_question_cache(self):
-        question = self.post_question()
-        settings.DEBUG = True  # because it's forsed to False
-        url = reverse('question', kwargs={'id': question.id})
-
-        password = '123'
-        client = Client()
-        self.other_user.set_password(password)
-        client.login(username=self.other_user.username, password=password)
-
-        client.get(url, follow=True)
-        counter = len(connection.queries)
-        client.get(url, follow=True)
-
-        self.assertEqual(counter, len(connection.queries))
-        settings.DEBUG = False
-
     def test_flag_question(self):
         self.user.set_status('m')
         self.user.flag_post(self.question)
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 09acad07..130f79a4 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -668,7 +668,10 @@ def user_recent(request, user, context):
             'activity_type'
             )
     for award in awards:
-        related_object_type = get_related_object_type_name(content_type_id=award['content_type_id'], object_id=award['object_id'])
+        related_object_type = get_related_object_type_name(
+            content_type_id=award['content_type_id'],
+            object_id=award['object_id']
+        )
         activities.append(
             AwardEvent(
                 award['awarded_at'],
-- 
cgit v1.2.3-1-g7c22