gis: Merged revisions 7545-7546,7548-7561,7563-7565,7567-7569 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7573 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 113 insertions, 2 deletions

diff --git a/tests/regressiontests/one_to_one_regress/models.py b/tests/regressiontests/one_to_one_regress/models.py
index c5ffd3fb3c..c68fdfc780 100644
--- a/tests/regressiontests/one_to_one_regress/models.py
+++ b/tests/regressiontests/one_to_one_regress/models.py
@@ -15,6 +15,13 @@ class Restaurant(models.Model):
     def __unicode__(self):
         return u"%s the restaurant" % self.place.name
 
+class Bar(models.Model):
+    place = models.OneToOneField(Place)
+    serves_cocktails = models.BooleanField()
+
+    def __unicode__(self):
+        return u"%s the bar" % self.place.name
+
 class Favorites(models.Model):
     name = models.CharField(max_length = 50)
     restaurants = models.ManyToManyField(Restaurant)
@@ -34,4 +41,13 @@ __test__ = {'API_TESTS':"""
 >>> f.restaurants = [r]
 >>> f.restaurants.all()
 [<Restaurant: Demon Dogs the restaurant>]
+
+# Regression test for #7173: Check that the name of the cache for the 
+# reverse object is correct.
+>>> b = Bar(place=p1, serves_cocktails=False)
+>>> b.save()
+>>> p1.restaurant
+<Restaurant: Demon Dogs the restaurant>
+>>> p1.bar
+<Bar: Demon Dogs the bar>
 """}
diff --git a/tests/regressiontests/templates/loaders.py b/tests/regressiontests/templates/loaders.py
new file mode 100644
index 0000000000..82e3c622d1
--- /dev/null
+++ b/tests/regressiontests/templates/loaders.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+"""
+Test cases for the template loaders
+"""
+
+from django.conf import settings
+
+if __name__ == '__main__':
+    settings.configure()
+
+import unittest
+import sys
+import pkg_resources
+import imp
+import StringIO
+
+from django.template import TemplateDoesNotExist
+from django.template.loaders.eggs import load_template_source as lts_egg
+
+#Mock classes and objects for pkg_resources functions
+class MockProvider(pkg_resources.NullProvider):
+    def __init__(self, module):
+        pkg_resources.NullProvider.__init__(self, module)
+        self.module = module
+
+    def _has(self, path):
+        return path in self.module._resources
+
+    def _isdir(self,path):
+        return False
+
+    def get_resource_stream(self, manager, resource_name):
+        return self.module._resources[resource_name]
+
+    def _get(self, path):
+        return self.module._resources[path].read()
+
+class MockLoader(object): pass
+
+def create_egg(name, resources):
+    """
+    Creates a mock egg with a list of resources
+    
+    name: The name of the module
+    resources: A dictionary of resources. Keys are the names and values the the data. 
+    """
+    egg = imp.new_module(name)
+    egg.__loader__ = MockLoader()
+    egg._resources = resources
+    sys.modules[name] = egg
+
+
+class EggLoader(unittest.TestCase):
+    def setUp(self):
+        pkg_resources._provider_factories[MockLoader] = MockProvider
+        
+        self.empty_egg = create_egg("egg_empty", {})
+        self.egg_1 = create_egg("egg_1", {
+            'templates/y.html' : StringIO.StringIO("y"),
+            'templates/x.txt' : StringIO.StringIO("x"),
+        })
+        self._old_installed_apps = settings.INSTALLED_APPS
+        settings.INSTALLED_APPS = []
+        
+    def tearDown(self):
+        settings.INSTALLED_APPS = self._old_installed_apps
+
+    def test_empty(self):
+        "Loading any template on an empty egg should fail"
+        settings.INSTALLED_APPS = ['egg_empty']
+        self.assertRaises(TemplateDoesNotExist, lts_egg, "not-existing.html")
+
+    def test_non_existing(self):
+        "Template loading fails if the template is not in the egg"
+        settings.INSTALLED_APPS = ['egg_1']
+        self.assertRaises(TemplateDoesNotExist, lts_egg, "not-existing.html")
+    
+    def test_existing(self):
+        "A template can be loaded from an egg"
+        settings.INSTALLED_APPS = ['egg_1']
+        contents, template_name = lts_egg("y.html")
+        self.assertEqual(contents, "y")
+        self.assertEqual(template_name, "egg:egg_1:templates/y.html")
+    
+    def test_not_installed(self):
+        "Loading an existent template from an egg not included in INSTALLED_APPS should fail"
+        settings.INSTALLED_APPS = []
+        self.assertRaises(TemplateDoesNotExist, lts_egg, "y.html")
+
+    
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index aef6f504b1..4effea55de 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -19,12 +19,15 @@ from django.utils.tzinfo import LocalTimezone
 
 from unicode import unicode_tests
 from context import context_tests
+
+from loaders import *
+
 import filters
 
 # Some other tests we would like to run
 __test__ = {
-        'unicode': unicode_tests,
-        'context': context_tests,
+    'unicode': unicode_tests,
+    'context': context_tests
 }
 
 #################################