From: Petr Viktorin Date: Tue, 29 Mar 2011 17:44:43 +0000 (+0300) Subject: Update test_schema to the new API. Add some missing column metadata. X-Git-Tag: veekun-promotions/2011041101~17^2~8 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/e61d2b2c191e590a4d60c529eca0b717be9b1a33 Update test_schema to the new API. Add some missing column metadata. --- diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py index 8e067c6..4adb68d 100644 --- a/pokedex/db/multilang.py +++ b/pokedex/db/multilang.py @@ -77,9 +77,11 @@ def create_translation_table(_table_name, foreign_class, relation_name, # Create the table object table = Table(_table_name, foreign_class.__table__.metadata, Column(foreign_key_name, Integer, ForeignKey(foreign_class.id), - primary_key=True, nullable=False), + primary_key=True, nullable=False, + info=dict(description="ID of the %s these texts relate to" % foreign_class.__singlename__)), Column('local_language_id', Integer, ForeignKey(language_class.id), - primary_key=True, nullable=False), + primary_key=True, nullable=False, + info=dict(description="Language these texts are in")), ) Translations.__table__ = table diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 24413fb..2278cb0 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -879,7 +879,7 @@ class MoveMetaCategory(TableBase): create_translation_table('move_meta_category_prose', MoveMetaCategory, 'prose', relation_lazy='joined', description = Column(Unicode(64), nullable=False, - info=dict(description="A description of the category")), + info=dict(description="A description of the category", format="plaintext", official=False)), ) class MoveMetaStatChange(TableBase): diff --git a/pokedex/tests/test_schema.py b/pokedex/tests/test_schema.py index 88ee1e5..2cba7e0 100644 --- a/pokedex/tests/test_schema.py +++ b/pokedex/tests/test_schema.py @@ -23,7 +23,7 @@ def test_variable_names(): classname = table.__name__ if classname and varname[0].isupper(): assert varname == classname, '%s refers to %s' % (varname, classname) - for table in tables.table_classes: + for table in tables.mapped_classes: assert getattr(tables, table.__name__) is table def test_i18n_table_creation(): @@ -46,8 +46,9 @@ def test_i18n_table_creation(): __tablename__ = 'foos' __singlename__ = 'foo' id = Column(Integer, primary_key=True, nullable=False) + translation_classes = [] - FooText = create_translation_table('foo_text', Foo, + FooText = create_translation_table('foo_text', Foo, 'texts', language_class=Language, name = Column(String(100)), ) @@ -79,14 +80,14 @@ def test_i18n_table_creation(): # Give our foo some names, as directly as possible foo_text = FooText() - foo_text.object_id = foo.id - foo_text.language_id = lang_en.id + foo_text.foreign_id = foo.id + foo_text.local_language_id = lang_en.id foo_text.name = 'english' sess.add(foo_text) foo_text = FooText() - foo_text.object_id = foo.id - foo_text.language_id = lang_jp.id + foo_text.foo_id = foo.id + foo_text.local_language_id = lang_jp.id foo_text.name = 'nihongo' sess.add(foo_text) @@ -116,7 +117,7 @@ def test_i18n_table_creation(): # THIS SHOULD WORK SOMEDAY # .options(joinedload(Foo.name)) \ foo = sess.query(Foo) \ - .options(joinedload(Foo.foo_text_local)) \ + .options(joinedload(Foo.texts_local)) \ .one() assert foo.name == 'english' @@ -127,7 +128,7 @@ def test_i18n_table_creation(): # THIS SHOULD ALSO WORK SOMEDAY # .options(joinedload(Foo.name_map)) \ foo = sess.query(Foo) \ - .options(joinedload(Foo.foo_text)) \ + .options(joinedload(Foo.texts)) \ .one() assert foo.name_map[lang_en] == 'english' @@ -152,15 +153,19 @@ def test_texts(): Mostly protects against copy/paste oversights and rebase hiccups. If there's a reason to relax the tests, do it """ - for table in sorted(tables.table_classes, key=lambda t: t.__name__): - if issubclass(table, tables.LanguageSpecific): + classes = [] + for cls in tables.mapped_classes: + classes.append(cls) + classes += cls.translation_classes + for cls in classes: + if hasattr(cls, 'local_language') or hasattr(cls, 'language'): good_formats = 'markdown plaintext gametext'.split() assert_text = '%s is language-specific' else: good_formats = 'identifier latex'.split() assert_text = '%s is not language-specific' - mapper = class_mapper(table) - for column in sorted(mapper.c, key=lambda c: c.name): + columns = sorted(cls.__table__.c, key=lambda c: c.name) + for column in columns: format = column.info.get('format', None) if format is not None: if format not in good_formats: @@ -185,11 +190,8 @@ def test_identifiers_with_names(): ...have either names or identifiers. """ - for table in sorted(tables.table_classes, key=lambda t: t.__name__): - if issubclass(table, tables.Named): - assert issubclass(table, tables.OfficiallyNamed) or issubclass(table, tables.UnofficiallyNamed), table + 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 - if not issubclass(table, tables.LanguageSpecific): - assert not hasattr(table, 'name'), table