Merge pull request #110 from paulocheque/bugfix-datafixture

[bugfix] Fixture factory to interpret the name of the native fixtures

django_dynamic_fixture/ddf.py

@@ -251,9 +251,10 @@ def __init__(self, data_fixture, fill_nullable_fields=True, ignore_fields=[], nu
         :model_path: internal variable used to control the cycles of dependencies.
         """
         from django_dynamic_fixture.global_settings import DDF_IGNORE_FIELDS
-
+        from django_dynamic_fixture.fixture_algorithms import FixtureFactory
         # custom config of fixtures
-        self.data_fixture = data_fixture
+        self.data_fixture = FixtureFactory.get(data_fixture)
+
         self.fill_nullable_fields = fill_nullable_fields
         self.ignore_fields = ignore_fields
         # extend ignore_fields with globally declared ignore_fields

django_dynamic_fixture/fixture_algorithms/__init__.py

@@ -1 +1,14 @@
+from django_dynamic_fixture.fixture_algorithms.sequential_fixture import SequentialDataFixture, StaticSequentialDataFixture
+from django_dynamic_fixture.fixture_algorithms.random_fixture import RandomDataFixture
 
+
+class FixtureFactory:
+    @staticmethod
+    def get(data_fixture):
+        if data_fixture == 'static_sequential':
+            return SequentialDataFixture()
+        elif data_fixture == 'sequential':
+            return SequentialDataFixture()
+        elif data_fixture == 'random':
+            return RandomDataFixture()
+        return data_fixture

django_dynamic_fixture/tests/test_wrappers.py

@@ -230,3 +230,31 @@ def test_compatibility_for_teach(self):
         teach('django_dynamic_fixture.ModelWithDefaultValues', integer_with_default=5)
         instance = G('django_dynamic_fixture.ModelWithDefaultValues')
         assert instance.integer_with_default == 5
+
+
+class OverrideDataFixture(TestCase):
+    def test_random(self):
+        instance = N('django_dynamic_fixture.ModelWithNumbers', data_fixture='random')
+        assert instance is not None
+        instance = G('django_dynamic_fixture.ModelWithNumbers', data_fixture='random')
+        assert instance is not None
+
+    def test_sequential(self):
+        instance = N('django_dynamic_fixture.ModelWithNumbers', data_fixture='sequential')
+        assert instance is not None
+        instance = G('django_dynamic_fixture.ModelWithNumbers', data_fixture='sequential')
+        assert instance is not None
+
+    def test_static_sequential(self):
+        instance = N('django_dynamic_fixture.ModelWithNumbers', data_fixture='static_sequential')
+        assert instance is not None
+        instance = G('django_dynamic_fixture.ModelWithNumbers', data_fixture='static_sequential')
+        assert instance is not None
+
+    def test_custom_one(self):
+        from django_dynamic_fixture.fixture_algorithms.sequential_fixture import SequentialDataFixture
+        instance = N('django_dynamic_fixture.ModelWithNumbers', data_fixture=SequentialDataFixture())
+        assert instance is not None
+        instance = G('django_dynamic_fixture.ModelWithNumbers', data_fixture=SequentialDataFixture())
+        assert instance is not None
+