MAINT: Refactor, move factories into tests

This commit is contained in:
Matthew Ryan Dillon 2016-08-21 16:06:38 -07:00
parent 31714215d0
commit 02a21306fe
16 changed files with 49 additions and 42 deletions

View file

@ -4,11 +4,12 @@ from factory import DjangoModelFactory, Sequence, SubFactory, LazyFunction
from factory.fuzzy import FuzzyText, FuzzyDate, FuzzyInteger
from factory.django import FileField
from .models import CollectionType, CollectionMethod, Flaw, ADFGPermit, Collection, \
DatasheetAttachment, CollectionTrap
from ..projects.factories import ProjectFactory
from ..locations.factories import StudyLocationFactory, StorageLocationFactory
from ..processing.factories import ProcessTypeFactory, ReagentFactory
from ..models import (CollectionType, CollectionMethod, Flaw, ADFGPermit,
Collection, DatasheetAttachment, CollectionTrap)
from ccdb.projects.tests.factories import ProjectFactory
from ccdb.locations.tests.factories import (StudyLocationFactory,
StorageLocationFactory)
from ccdb.processing.tests.factories import ProcessTypeFactory, ReagentFactory
class CollectionTypeFactory(DjangoModelFactory):

View file

@ -1,11 +1,11 @@
from django.test import TestCase
from django.db import IntegrityError, transaction
from ..models import CollectionType, CollectionMethod, Flaw, ADFGPermit, \
Collection, DatasheetAttachment, CollectionTrap
from ..factories import CollectionTypeFactory, CollectionMethodFactory, \
FlawFactory, ADFGPermitFactory, CollectionFactory, DatasheetAttachmentFactory, \
CollectionTrapFactory
from ..models import (CollectionType, CollectionMethod, Flaw, ADFGPermit,
Collection, DatasheetAttachment, CollectionTrap)
from .factories import (CollectionTypeFactory, CollectionMethodFactory,
FlawFactory, ADFGPermitFactory, CollectionFactory,
DatasheetAttachmentFactory, CollectionTrapFactory)
class CollectionTypeTestCase(TestCase):