diff options
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 94 | 
1 files changed, 47 insertions, 47 deletions
| diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 649e645b3..085671be3 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -175,53 +175,6 @@ class FindTest(FindInit, TestCase):                  base_find.label)) -class PackagingTest(FindInit, TestCase): -    fixtures = [settings.ROOT_PATH + -                '../fixtures/initial_data.json', -                settings.ROOT_PATH + -                '../ishtar_common/fixtures/initial_data.json', -                settings.ROOT_PATH + -                '../archaeological_files/fixtures/initial_data.json', -                settings.ROOT_PATH + -                '../archaeological_operations/fixtures/initial_data-fr.json', -                settings.ROOT_PATH + -                '../archaeological_finds/fixtures/initial_data-fr.json', -                ] -    model = models.Find - -    def setUp(self): -        self.create_finds({"label": u"Find 1"}, force=True) -        self.create_finds({"label": u"Find 2"}, force=True) -        self.basket = models.FindBasket.objects.create( -            label="My basket", user=IshtarUser.objects.get( -                pk=self.get_default_user().pk)) -        self.other_basket = models.FindBasket.objects.create( -            label="My other basket", user=IshtarUser.objects.get( -                pk=self.get_default_user().pk)) -        for find in self.finds: -            self.basket.items.add(find) -            self.other_basket.items.add(find) - -    def testPackaging(self): -        treatment_type = models.TreatmentType.objects.get(txt_idx='packaging') -        treatment = models.Treatment() -        items_nb = models.Find.objects.count() -        treatment.save(user=self.get_default_user(), items=self.basket) -        self.assertEqual(items_nb + self.basket.items.count(), -                         models.Find.objects.count(), -                         msg="Packaging doesn't generate enough new finds") -        treatment.treatment_types.add(treatment_type) -        # new version of the find is in the basket -        for item in self.basket.items.all(): -            self.assertNotIn( -                item, self.finds, -                msg="Original basket have not been upgraded after packaging") -        for item in self.other_basket.items.all(): -            self.assertNotIn( -                item, self.finds, -                msg="Other basket have not been upgraded after packaging") - -  class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):      fixtures = [settings.ROOT_PATH +                  '../fixtures/initial_data.json', @@ -282,3 +235,50 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):          self.assertEqual(models.Treatment.objects.count(),                           self.treatment_number + 1)          pass + + +class ZPackagingTest(FindInit, TestCase): +    fixtures = [settings.ROOT_PATH + +                '../fixtures/initial_data.json', +                settings.ROOT_PATH + +                '../ishtar_common/fixtures/initial_data.json', +                settings.ROOT_PATH + +                '../archaeological_files/fixtures/initial_data.json', +                settings.ROOT_PATH + +                '../archaeological_operations/fixtures/initial_data-fr.json', +                settings.ROOT_PATH + +                '../archaeological_finds/fixtures/initial_data-fr.json', +                ] +    model = models.Find + +    def setUp(self): +        self.create_finds({"label": u"Find 1"}, force=True) +        self.create_finds({"label": u"Find 2"}, force=True) +        self.basket = models.FindBasket.objects.create( +            label="My basket", user=IshtarUser.objects.get( +                pk=self.get_default_user().pk)) +        self.other_basket = models.FindBasket.objects.create( +            label="My other basket", user=IshtarUser.objects.get( +                pk=self.get_default_user().pk)) +        for find in self.finds: +            self.basket.items.add(find) +            self.other_basket.items.add(find) + +    def testPackaging(self): +        treatment_type = models.TreatmentType.objects.get(txt_idx='packaging') +        treatment = models.Treatment() +        items_nb = models.Find.objects.count() +        treatment.save(user=self.get_default_user(), items=self.basket) +        self.assertEqual(items_nb + self.basket.items.count(), +                         models.Find.objects.count(), +                         msg="Packaging doesn't generate enough new finds") +        treatment.treatment_types.add(treatment_type) +        # new version of the find is in the basket +        for item in self.basket.items.all(): +            self.assertNotIn( +                item, self.finds, +                msg="Original basket have not been upgraded after packaging") +        for item in self.other_basket.items.all(): +            self.assertNotIn( +                item, self.finds, +                msg="Other basket have not been upgraded after packaging") | 
