Changeset 3152 for django/branches/multi-auth/tests

Timestamp:

06/19/06 10:23:57 (2 years ago)

Author:

jkocherhans

Message:

multi-auth: Merged to [3151]

Files:

• django/branches/multi-auth/tests/modeltests/custom_pk/models.py (modified) (1 diff)
• django/branches/multi-auth/tests/modeltests/empty (copied) (copied from django/trunk/tests/modeltests/empty)
• django/branches/multi-auth/tests/modeltests/empty/__init__.py (copied) (copied from django/trunk/tests/modeltests/empty/__init__.py)
• django/branches/multi-auth/tests/modeltests/empty/models.py (copied) (copied from django/trunk/tests/modeltests/empty/models.py)
• django/branches/multi-auth/tests/modeltests/generic_relations (copied) (copied from django/trunk/tests/modeltests/generic_relations)
• django/branches/multi-auth/tests/modeltests/generic_relations/__init__.py (copied) (copied from django/trunk/tests/modeltests/generic_relations/__init__.py)
• django/branches/multi-auth/tests/modeltests/generic_relations/models.py (copied) (copied from django/trunk/tests/modeltests/generic_relations/models.py)
• django/branches/multi-auth/tests/modeltests/get_or_create (copied) (copied from django/trunk/tests/modeltests/get_or_create)
• django/branches/multi-auth/tests/modeltests/get_or_create/__init__.py (copied) (copied from django/trunk/tests/modeltests/get_or_create/__init__.py)
• django/branches/multi-auth/tests/modeltests/get_or_create/models.py (copied) (copied from django/trunk/tests/modeltests/get_or_create/models.py)
• django/branches/multi-auth/tests/modeltests/invalid_models/models.py (modified) (1 diff)
• django/branches/multi-auth/tests/modeltests/properties/models.py (modified) (2 diffs)
• django/branches/multi-auth/tests/othertests/templates.py (modified) (9 diffs)
• django/branches/multi-auth/tests/runtests.py (modified) (2 diffs)

django/branches/multi-auth/tests/modeltests/custom_pk/models.py

@@ -9 +9 @@
-
-class Employee(models.Model):
-
+
+
-    first_name = models.CharField(maxlength=20)
-    last_name = models.CharField(maxlength=20)

django/branches/multi-auth/tests/modeltests/invalid_models/models.py

@@ -75 +75 @@
-invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.
-invalid_models.fielderrors: "prepopulate": prepopulate_from should be a list or tuple.
-either a tuple or list
+iterable (e.g., a tuple or list)
-invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.
-invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.

django/branches/multi-auth/tests/modeltests/properties/models.py

@@ -13 +13 @@
-    def _get_full_name(self):
-        return "%s %s" % (self.first_name, self.last_name)
+
+    def _set_full_name(self, combined_name):
+        self.first_name, self.last_name = combined_name.split(' ', 1)
+
-    full_name = property(_get_full_name)
+
+    full_name_2 = property(_get_full_name, _set_full_name)
-
-API_TESTS = """
@@ -26 +32 @@
-    ...
-AttributeError: can't set attribute
+
+# But "full_name_2" has, and it can be used to initialise the class.
+>>> a2 = Person(full_name_2 = 'Paul McCartney')
+>>> a2.save()
+>>> a2.first_name
+'Paul'
-"""

django/branches/multi-auth/tests/othertests/templates.py

@@ -170 +170 @@
-
-    ### CYCLE TAG #############################################################
-
-
+
-    'cycle02': ('{% cycle a,b,c as abc %}{% cycle abc %}', {}, 'ab'),
-    'cycle03': ('{% cycle a,b,c as abc %}{% cycle abc %}{% cycle abc %}', {}, 'abc'),
@@ -194 +193 @@
-
-    ### FILTER TAG ############################################################
-    #'filterXX': ('', {}, ''),
-    'filter01': ('{% filter upper %}{% endfilter %}', {}, ''),
-    'filter02': ('{% filter upper %}django{% endfilter %}', {}, 'DJANGO'),
@@ -200 +198 @@
-
-    ### FIRSTOF TAG ###########################################################
-    #'firstofXX': ('', {}, ''),
-    'firstof01': ('{% firstof a b c %}', {'a':0,'b':0,'c':0}, ''),
-    'firstof02': ('{% firstof a b c %}', {'a':1,'b':0,'c':0}, '1'),
@@ -221 +218 @@
-    'if-tag03': ("{% if foo %}yes{% else %}no{% endif %}", {}, "no"),
-
+    # AND
+    'if-tag-and01': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'yes'),
+    'if-tag-and02': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'no'),
+    'if-tag-and03': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'no'),
+    'if-tag-and04': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'no'),
+    'if-tag-and05': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'foo': False}, 'no'),
+    'if-tag-and06': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'bar': False}, 'no'),
+    'if-tag-and07': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'foo': True}, 'no'),
+    'if-tag-and08': ("{% if foo and bar %}yes{% else %}no{% endif %}", {'bar': True}, 'no'),
+
+    # OR
+    'if-tag-or01': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'yes'),
+    'if-tag-or02': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'yes'),
+    'if-tag-or03': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'yes'),
+    'if-tag-or04': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'no'),
+    'if-tag-or05': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'foo': False}, 'no'),
+    'if-tag-or06': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'bar': False}, 'no'),
+    'if-tag-or07': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'foo': True}, 'yes'),
+    'if-tag-or08': ("{% if foo or bar %}yes{% else %}no{% endif %}", {'bar': True}, 'yes'),
+
+    # TODO: multiple ORs
+
+    # NOT
+    'if-tag-not01': ("{% if not foo %}no{% else %}yes{% endif %}", {'foo': True}, 'yes'),
+    'if-tag-not02': ("{% if not %}yes{% else %}no{% endif %}", {'foo': True}, 'no'),
+    'if-tag-not03': ("{% if not %}yes{% else %}no{% endif %}", {'not': True}, 'yes'),
+    'if-tag-not04': ("{% if not not %}no{% else %}yes{% endif %}", {'not': True}, 'yes'),
+    'if-tag-not05': ("{% if not not %}no{% else %}yes{% endif %}", {}, 'no'),
+
+    'if-tag-not06': ("{% if foo and not bar %}yes{% else %}no{% endif %}", {}, 'no'),
+    'if-tag-not07': ("{% if foo and not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'no'),
+    'if-tag-not08': ("{% if foo and not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'yes'),
+    'if-tag-not09': ("{% if foo and not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'no'),
+    'if-tag-not10': ("{% if foo and not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'no'),
+
+    'if-tag-not11': ("{% if not foo and bar %}yes{% else %}no{% endif %}", {}, 'no'),
+    'if-tag-not12': ("{% if not foo and bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'no'),
+    'if-tag-not13': ("{% if not foo and bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'no'),
+    'if-tag-not14': ("{% if not foo and bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'yes'),
+    'if-tag-not15': ("{% if not foo and bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'no'),
+
+    'if-tag-not16': ("{% if foo or not bar %}yes{% else %}no{% endif %}", {}, 'yes'),
+    'if-tag-not17': ("{% if foo or not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'yes'),
+    'if-tag-not18': ("{% if foo or not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'yes'),
+    'if-tag-not19': ("{% if foo or not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'no'),
+    'if-tag-not20': ("{% if foo or not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'yes'),
+
+    'if-tag-not21': ("{% if not foo or bar %}yes{% else %}no{% endif %}", {}, 'yes'),
+    'if-tag-not22': ("{% if not foo or bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'yes'),
+    'if-tag-not23': ("{% if not foo or bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'no'),
+    'if-tag-not24': ("{% if not foo or bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'yes'),
+    'if-tag-not25': ("{% if not foo or bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'yes'),
+
+    'if-tag-not26': ("{% if not foo and not bar %}yes{% else %}no{% endif %}", {}, 'yes'),
+    'if-tag-not27': ("{% if not foo and not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'no'),
+    'if-tag-not28': ("{% if not foo and not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'no'),
+    'if-tag-not29': ("{% if not foo and not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'no'),
+    'if-tag-not30': ("{% if not foo and not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'yes'),
+
+    'if-tag-not31': ("{% if not foo or not bar %}yes{% else %}no{% endif %}", {}, 'yes'),
+    'if-tag-not32': ("{% if not foo or not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': True}, 'no'),
+    'if-tag-not33': ("{% if not foo or not bar %}yes{% else %}no{% endif %}", {'foo': True, 'bar': False}, 'yes'),
+    'if-tag-not34': ("{% if not foo or not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': True}, 'yes'),
+    'if-tag-not35': ("{% if not foo or not bar %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, 'yes'),
+
+    # AND and OR raises a TemplateSyntaxError
+    'if-tag-error01': ("{% if foo or bar and baz %}yes{% else %}no{% endif %}", {'foo': False, 'bar': False}, template.TemplateSyntaxError),
+    'if-tag-error02': ("{% if foo and %}yes{% else %}no{% endif %}", {'foo': True}, template.TemplateSyntaxError),
+    'if-tag-error03': ("{% if foo or %}yes{% else %}no{% endif %}", {'foo': True}, template.TemplateSyntaxError),
+    'if-tag-error04': ("{% if not foo and %}yes{% else %}no{% endif %}", {'foo': True}, template.TemplateSyntaxError),
+    'if-tag-error05': ("{% if not foo or %}yes{% else %}no{% endif %}", {'foo': True}, template.TemplateSyntaxError),
+
-    ### IFCHANGED TAG #########################################################
-    #'ifchangedXX': ('', {}, ''),
-    'ifchanged01': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}', { 'num': (1,2,3) }, '123'),
-    'ifchanged02': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}', { 'num': (1,1,3) }, '13'),
@@ -238 +306 @@
-    'ifequal09': ('{% ifequal a "test" %}yes{% else %}no{% endifequal %}', {}, "no"),
-    'ifequal10': ('{% ifequal a b %}yes{% else %}no{% endifequal %}', {}, "yes"),
+
+    # SMART SPLITTING
+    'ifequal-split01': ('{% ifequal a "test man" %}yes{% else %}no{% endifequal %}', {}, "no"),
+    'ifequal-split02': ('{% ifequal a "test man" %}yes{% else %}no{% endifequal %}', {'a': 'foo'}, "no"),
+    'ifequal-split03': ('{% ifequal a "test man" %}yes{% else %}no{% endifequal %}', {'a': 'test man'}, "yes"),
+    'ifequal-split04': ("{% ifequal a 'test man' %}yes{% else %}no{% endifequal %}", {'a': 'test man'}, "yes"),
+    'ifequal-split05': ("{% ifequal a 'i \"love\" you' %}yes{% else %}no{% endifequal %}", {'a': ''}, "no"),
+    'ifequal-split06': ("{% ifequal a 'i \"love\" you' %}yes{% else %}no{% endifequal %}", {'a': 'i "love" you'}, "yes"),
+    'ifequal-split07': ("{% ifequal a 'i \"love\" you' %}yes{% else %}no{% endifequal %}", {'a': 'i love you'}, "no"),
+    'ifequal-split08': (r"{% ifequal a 'I\'m happy' %}yes{% else %}no{% endifequal %}", {'a': "I'm happy"}, "yes"),
+    'ifequal-split09': (r"{% ifequal a 'slash\man' %}yes{% else %}no{% endifequal %}", {'a': r"slash\man"}, "yes"),
+    'ifequal-split10': (r"{% ifequal a 'slash\man' %}yes{% else %}no{% endifequal %}", {'a': r"slashman"}, "no"),
-
-    ### IFNOTEQUAL TAG ########################################################
@@ -389 +469 @@
-
-    ### REGROUP TAG ###########################################################
-    #'regroupXX': ('', {}, ''),
-    'regroup01': ('{% regroup data by bar as grouped %}' + \
-                  '{% for group in grouped %}' + \
@@ -415 +494 @@
-
-    ### TEMPLATETAG TAG #######################################################
-    #'templatetagXX': ('', {}, ''),
-    'templatetag01': ('{% templatetag openblock %}', {}, '{%'),
-    'templatetag02': ('{% templatetag closeblock %}', {}, '%}'),
@@ -422 +500 @@
-    'templatetag05': ('{% templatetag %}', {}, template.TemplateSyntaxError),
-    'templatetag06': ('{% templatetag foo %}', {}, template.TemplateSyntaxError),
+    'templatetag07': ('{% templatetag openbrace %}', {}, '{'),
+    'templatetag08': ('{% templatetag closebrace %}', {}, '}'),
+    'templatetag09': ('{% templatetag openbrace %}{% templatetag openbrace %}', {}, '{{'),
+    'templatetag10': ('{% templatetag closebrace %}{% templatetag closebrace %}', {}, '}}'),
-
-    ### WIDTHRATIO TAG ########################################################
-    #'widthratioXX': ('', {}, ''),
-    'widthratio01': ('{% widthratio a b 0 %}', {'a':50,'b':100}, '0'),
-    'widthratio02': ('{% widthratio a b 100 %}', {'a':0,'b':0}, ''),
@@ -441 +522 @@
-    'widthratio09': ('{% widthratio a b %}', {'a':50,'b':100}, template.TemplateSyntaxError),
-    'widthratio10': ('{% widthratio a b 100.0 %}', {'a':50,'b':100}, template.TemplateSyntaxError),
-
+
-    ### NOW TAG ########################################################
-    # Simple case
-    'now01' : ('{% now "j n Y"%}', {}, str(datetime.now().day) + ' ' + str(datetime.now().month) + ' ' + str(datetime.now().year)),
-
+
-    # Check parsing of escaped and special characters
-    'now02' : ('{% now "j "n" Y"%}', {}, template.TemplateSyntaxError),

django/branches/multi-auth/tests/runtests.py

@@ -22 +22 @@
-
-ALWAYS_INSTALLED_APPS = [
-admin
+contenttypes
-    'django.contrib.auth', 
-
-
+
-    'django.contrib.flatpages',
-    'django.contrib.redirects',
-    'django.contrib.sessions',
-
+
+
-]
-
@@ -149 +149 @@
-        # Initialize the test database.
-        cursor = connection.cursor()
+        
+        # Install the core always installed apps
+        for app in ALWAYS_INSTALLED_APPS:
+            self.output(1, "Installing contrib app %s" % app)
+            mod = __import__(app + ".models", '', '', [''])
+            management.install(mod)
-
-        # Run the tests for each test model.