Merge branch 'encukou-markdown-identifiers'

[zzz-pokedex.git] / pokedex / tests / test_schema.py

diff --git a/pokedex/tests/test_schema.py b/pokedex/tests/test_schema.py
index 83f9de7..eb536ec 100644 (file)
--- a/pokedex/tests/test_schema.py
+++ b/pokedex/tests/test_schema.py
@@ -80,9 +80,12 @@ def test_i18n_table_creation():
     foo = Foo()
     sess.add(foo)
 
-    # Commit so the above get primary keys filled in
+    # Commit so the above get primary keys filled in, then give the
+    # session the language id
     sess.commit()
-    sess.default_language = lang_en.id
+    # Note that this won't apply to sessions created in other threads, but that
+    # ought not be a problem!
+    sess.default_language_id = lang_en.id
 
     # Give our foo some names, as directly as possible
     foo_text = FooText()
@@ -171,18 +174,21 @@ def test_texts():
             good_formats = 'identifier latex'.split()
             assert_text = '%s is not language-specific'
         columns = sorted(cls.__table__.c, key=lambda c: c.name)
+        text_columns = []
         for column in columns:
             format = column.info.get('format', None)
             if format is not None:
                 if format not in good_formats:
                     raise AssertionError(assert_text % column)
                 is_markdown = isinstance(column.type, markdown.MarkdownColumn)
-                if is_markdown != (format == 'markdown'):
+                if is_markdown and (format != 'markdown'):
+                    # Note: regular string with markdown syntax is allowed
                     raise AssertionError('%s: markdown format/column type mismatch' % column)
                 if (format != 'identifier') and (column.name == 'identifier'):
                     raise AssertionError('%s: identifier column name/type mismatch' % column)
                 if column.info.get('official', None) and format not in 'gametext plaintext':
                     raise AssertionError('%s: official text with bad format' % column)
+                text_columns.append(column)
             else:
                 if isinstance(column.type, (markdown.MarkdownColumn, tables.Unicode)):
                     raise AssertionError('%s: text column without format' % column)
@@ -190,14 +196,15 @@ def test_texts():
                 raise AssertionError('%s: non-plaintext name' % column)
             # No mention of English in the description
             assert 'English' not in column.info['description'], column
+        # If there's more than one text column in a translation table,
+        # they have to be nullable, to support missing translations
+        if hasattr(cls, 'local_language') and len(text_columns) > 1:
+            for column in text_columns:
+                assert column.nullable
 
 def test_identifiers_with_names():
-    """Test that named tables have identifiers, and non-named tables don't
-
-    ...have either names or identifiers.
+    """Test that named tables have identifiers
     """
     for table in sorted(tables.mapped_classes, key=lambda t: t.__name__):
         if hasattr(table, 'name'):
             assert hasattr(table, 'identifier'), table
-        else:
-            assert not hasattr(table, 'identifier'), table