- remove @testing.resolve_artifact_names, replace with direct attribute

access to the cls/self.tables/classes registries
- express orm/_base.py ORMTest in terms of engine/_base.py TablesTest,
factor out common steps into TablesTest, remove AltEngineTest as a
separate class.   will further consolidate these base classes

1 files changed, 6 insertions, 3 deletions

diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py
index 362b54cf0..9664d0c23 100644
--- a/test/orm/test_utils.py
+++ b/test/orm/test_utils.py
@@ -189,8 +189,9 @@ class AliasedClassTest(TestBase):
 class IdentityKeyTest(_fixtures.FixtureTest):
     run_inserts = None
 
-    @testing.resolve_artifact_names
     def test_identity_key_1(self):
+        User, users = self.classes.User, self.tables.users
+
         mapper(User, users)
 
         key = util.identity_key(User, [1])
@@ -198,8 +199,9 @@ class IdentityKeyTest(_fixtures.FixtureTest):
         key = util.identity_key(User, ident=[1])
         eq_(key, (User, (1,)))
 
-    @testing.resolve_artifact_names
     def test_identity_key_2(self):
+        users, User = self.tables.users, self.classes.User
+
         mapper(User, users)
         s = create_session()
         u = User(name='u1')
@@ -208,8 +210,9 @@ class IdentityKeyTest(_fixtures.FixtureTest):
         key = util.identity_key(instance=u)
         eq_(key, (User, (u.id,)))
 
-    @testing.resolve_artifact_names
     def test_identity_key_3(self):
+        User, users = self.classes.User, self.tables.users
+
         mapper(User, users)
 
         row = {users.c.id: 1, users.c.name: "Frank"}