Properly import the 'base' module in test_base.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

1 files changed, 56 insertions, 56 deletions

diff --git a/tests/test_base.py b/tests/test_base.py
index 68451f3..01855c3 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -22,7 +22,7 @@
 
 import unittest
 
-from factory.base import BaseFactory, Factory, StubFactory, BUILD_STRATEGY, CREATE_STRATEGY, STUB_STRATEGY
+from factory import base
 from factory import declarations
 
 class TestObject(object):
@@ -52,19 +52,19 @@ class TestModel(FakeDjangoModel):
 
 class SafetyTestCase(unittest.TestCase):
     def testBaseFactory(self):
-        self.assertRaises(RuntimeError, BaseFactory)
+        self.assertRaises(RuntimeError, base.BaseFactory)
 
 
 class FactoryTestCase(unittest.TestCase):
     def testAttribute(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = 'one'
 
         test_object = TestObjectFactory.build()
         self.assertEqual(test_object.one, 'one')
 
     def testSequence(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = declarations.Sequence(lambda n: 'one' + n)
             two = declarations.Sequence(lambda n: 'two' + n)
 
@@ -77,7 +77,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object1.two, 'two1')
 
     def testSequenceCustomBegin(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             @classmethod
             def _setup_next_sequence(cls):
                 return 42
@@ -94,7 +94,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual('two43', test_object1.two)
 
     def testLazyAttribute(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = declarations.LazyAttribute(lambda a: 'abc' )
             two = declarations.LazyAttribute(lambda a: a.one + ' xyz')
 
@@ -103,13 +103,13 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object.two, 'abc xyz')
 
     def testLazyAttributeNonExistentParam(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = declarations.LazyAttribute(lambda a: a.does_not_exist )
 
         self.assertRaises(AttributeError, TestObjectFactory)
 
     def testLazyAttributeSequence(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = declarations.LazyAttributeSequence(lambda a, n: 'abc' + n)
             two = declarations.LazyAttributeSequence(lambda a, n: a.one + ' xyz' + n)
 
@@ -122,7 +122,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object1.two, 'abc1 xyz1')
 
     def testLazyAttributeDecorator(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             @declarations.lazy_attribute
             def one(a):
                 return 'one'
@@ -131,7 +131,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object.one, 'one')
 
     def testSelfAttribute(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = 'xx'
             two = declarations.SelfAttribute('one')
 
@@ -139,7 +139,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(1, test_object.two)
 
     def testSequenceDecorator(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             @declarations.sequence
             def one(n):
                 return 'one' + n
@@ -148,7 +148,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object.one, 'one0')
 
     def testLazyAttributeSequenceDecorator(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             @declarations.lazy_attribute_sequence
             def one(a, n):
                 return 'one' + n
@@ -161,7 +161,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object.two, 'one0 two0')
 
     def testBuildWithParameters(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = declarations.Sequence(lambda n: 'one' + n)
             two = declarations.Sequence(lambda n: 'two' + n)
 
@@ -175,7 +175,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(test_object1.two, 'two1')
 
     def testCreate(self):
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             one = 'one'
 
         test_model = TestModelFactory.create()
@@ -183,7 +183,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertTrue(test_model.id)
 
     def testInheritance(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = 'one'
             two = declarations.LazyAttribute(lambda a: a.one + ' two')
 
@@ -203,7 +203,7 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(None, test_object_alt.three)
 
     def testInheritanceWithInheritedClass(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = 'one'
             two = declarations.LazyAttribute(lambda a: a.one + ' two')
 
@@ -219,7 +219,7 @@ class FactoryTestCase(unittest.TestCase):
 
     def testInheritanceWithSequence(self):
         """Tests that sequence IDs are shared between parent and son."""
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = declarations.Sequence(lambda a: a)
 
         class TestSubFactory(TestObjectFactory):
@@ -233,10 +233,10 @@ class FactoryTestCase(unittest.TestCase):
         self.assertEqual(4, len(ones))
 
     def testDualInheritance(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             one = 'one'
 
-        class TestOtherFactory(Factory):
+        class TestOtherFactory(base.Factory):
             FACTORY_FOR = TestObject
             two = 'two'
             four = 'four'
@@ -254,7 +254,7 @@ class FactoryTestCase(unittest.TestCase):
         def creation_function(class_to_create, **kwargs):
             return "This doesn't even return an instance of {0}".format(class_to_create.__name__)
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             pass
 
         TestModelFactory.set_creation_function(creation_function)
@@ -264,15 +264,15 @@ class FactoryTestCase(unittest.TestCase):
 
 class FactoryDefaultStrategyTestCase(unittest.TestCase):
     def setUp(self):
-        self.default_strategy = Factory.default_strategy
+        self.default_strategy = base.Factory.default_strategy
 
     def tearDown(self):
-        Factory.default_strategy = self.default_strategy
+        base.Factory.default_strategy = self.default_strategy
 
     def testBuildStrategy(self):
-        Factory.default_strategy = BUILD_STRATEGY
+        base.Factory.default_strategy = base.BUILD_STRATEGY
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             one = 'one'
 
         test_model = TestModelFactory()
@@ -282,7 +282,7 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
     def testCreateStrategy(self):
         # Default default_strategy
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             one = 'one'
 
         test_model = TestModelFactory()
@@ -293,11 +293,11 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
         class TestModel2(FakeDjangoModel):
             pass
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             FACTORY_FOR = TestModel
             one = 3
 
-        class TestModel2Factory(Factory):
+        class TestModel2Factory(base.Factory):
             FACTORY_FOR = TestModel2
             two = declarations.SubFactory(TestModelFactory, one=1)
 
@@ -310,10 +310,10 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
         class TestModel2(FakeDjangoModel):
             pass
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             FACTORY_FOR = TestModel
 
-        class TestModel2Factory(Factory):
+        class TestModel2Factory(base.Factory):
             FACTORY_FOR = TestModel2
             two = declarations.SubFactory(TestModelFactory,
                                           one=declarations.Sequence(lambda n: 'x%sx' % n),
@@ -332,16 +332,16 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
                 for k, v in kwargs.iteritems():
                     setattr(self, k, v)
 
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             FACTORY_FOR = TestObject
 
-        class WrappingTestObjectFactory(Factory):
+        class WrappingTestObjectFactory(base.Factory):
             FACTORY_FOR = TestObject
 
             wrapped = declarations.SubFactory(TestObjectFactory)
             wrapped_bis = declarations.SubFactory(TestObjectFactory, one=1)
 
-        class OuterWrappingTestObjectFactory(Factory):
+        class OuterWrappingTestObjectFactory(base.Factory):
             FACTORY_FOR = TestObject
 
             wrap = declarations.SubFactory(WrappingTestObjectFactory, wrapped__two=2)
@@ -358,17 +358,17 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
                 for k, v in kwargs.iteritems():
                     setattr(self, k, v)
 
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             FACTORY_FOR = TestObject
             two = 'two'
 
-        class WrappingTestObjectFactory(Factory):
+        class WrappingTestObjectFactory(base.Factory):
             FACTORY_FOR = TestObject
 
             wrapped = declarations.SubFactory(TestObjectFactory)
             friend = declarations.LazyAttribute(lambda o: o.wrapped.two.four + 1)
 
-        class OuterWrappingTestObjectFactory(Factory):
+        class OuterWrappingTestObjectFactory(base.Factory):
             FACTORY_FOR = TestObject
 
             wrap = declarations.SubFactory(WrappingTestObjectFactory,
@@ -379,9 +379,9 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
         self.assertEqual(outer.wrap.friend, 5)
 
     def testStubStrategy(self):
-        Factory.default_strategy = STUB_STRATEGY
+        base.Factory.default_strategy = base.STUB_STRATEGY
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             one = 'one'
 
         test_model = TestModelFactory()
@@ -389,54 +389,54 @@ class FactoryDefaultStrategyTestCase(unittest.TestCase):
         self.assertFalse(hasattr(test_model, 'id'))  # We should have a plain old object
 
     def testUnknownStrategy(self):
-        Factory.default_strategy = 'unknown'
+        base.Factory.default_strategy = 'unknown'
 
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             one = 'one'
 
-        self.assertRaises(Factory.UnknownStrategy, TestModelFactory)
+        self.assertRaises(base.Factory.UnknownStrategy, TestModelFactory)
 
     def testStubWithNonStubStrategy(self):
-        class TestModelFactory(StubFactory):
+        class TestModelFactory(base.StubFactory):
             one = 'one'
 
-        TestModelFactory.default_strategy = CREATE_STRATEGY
+        TestModelFactory.default_strategy = base.CREATE_STRATEGY
 
-        self.assertRaises(StubFactory.UnsupportedStrategy, TestModelFactory)
+        self.assertRaises(base.StubFactory.UnsupportedStrategy, TestModelFactory)
 
-        TestModelFactory.default_strategy = BUILD_STRATEGY
-        self.assertRaises(StubFactory.UnsupportedStrategy, TestModelFactory)
+        TestModelFactory.default_strategy = base.BUILD_STRATEGY
+        self.assertRaises(base.StubFactory.UnsupportedStrategy, TestModelFactory)
 
 class FactoryCreationTestCase(unittest.TestCase):
     def testFactoryFor(self):
-        class TestFactory(Factory):
+        class TestFactory(base.Factory):
             FACTORY_FOR = TestObject
 
         self.assertTrue(isinstance(TestFactory.build(), TestObject))
 
     def testAutomaticAssociatedClassDiscovery(self):
-        class TestObjectFactory(Factory):
+        class TestObjectFactory(base.Factory):
             pass
 
         self.assertTrue(isinstance(TestObjectFactory.build(), TestObject))
 
     def testStub(self):
-        class TestFactory(StubFactory):
+        class TestFactory(base.StubFactory):
             pass
 
-        self.assertEqual(TestFactory.default_strategy, STUB_STRATEGY)
+        self.assertEqual(TestFactory.default_strategy, base.STUB_STRATEGY)
 
     def testInheritanceWithStub(self):
-        class TestObjectFactory(StubFactory):
+        class TestObjectFactory(base.StubFactory):
             pass
 
         class TestFactory(TestObjectFactory):
             pass
 
-        self.assertEqual(TestFactory.default_strategy, STUB_STRATEGY)
+        self.assertEqual(TestFactory.default_strategy, base.STUB_STRATEGY)
 
     def testCustomCreation(self):
-        class TestModelFactory(Factory):
+        class TestModelFactory(base.Factory):
             @classmethod
             def _prepare(cls, create, **kwargs):
                 kwargs['four'] = 4
@@ -456,18 +456,18 @@ class FactoryCreationTestCase(unittest.TestCase):
 
     def testNoAssociatedClassWithAutodiscovery(self):
         try:
-            class TestFactory(Factory):
+            class TestFactory(base.Factory):
                 pass
             self.fail()
-        except Factory.AssociatedClassError as e:
+        except base.Factory.AssociatedClassError as e:
             self.assertTrue('autodiscovery' in str(e))
 
     def testNoAssociatedClassWithoutAutodiscovery(self):
         try:
-            class Test(Factory):
+            class Test(base.Factory):
                 pass
             self.fail()
-        except Factory.AssociatedClassError as e:
+        except base.Factory.AssociatedClassError as e:
             self.assertTrue('autodiscovery' not in str(e))