diff options
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 38 | 
1 files changed, 4 insertions, 34 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 953e91b61..63b46c40c 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -27,47 +27,16 @@ from django.contrib.contenttypes.models import ContentType  from django.core.cache import cache  from django.core.exceptions import ValidationError  from django.core.files.base import File as DjangoFile -from django.core.files.uploadedfile import SimpleUploadedFile  from django.core.management import call_command  from django.core.urlresolvers import reverse -from django.db import connection, transaction  from django.template.defaultfilters import slugify  from django.test import TestCase as BaseTestCase  from django.test.client import Client  from django.test.runner import DiscoverRunner  from ishtar_common import models -from ishtar_common import forms_common  from ishtar_common.utils import post_save_point -from archaeological_context_records.models import CRBulkView -from archaeological_finds.models import BFBulkView, FBulkView, FirstBaseFindView - -""" -from django.conf import settings -import tempfile, datetime -from zipfile import ZipFile, ZIP_DEFLATED - -from oook_replace.oook_replace import oook_replace - -class OOOGenerationTest(TestCase): -    def testGeneration(self): -        context = {'test_var':u"Testé", 'test_var2':u"", -                   "test_date":datetime.date(2015, 1, 1)} -        tmp = tempfile.TemporaryFile() -        oook_replace("../ishtar_common/tests/test-file.odt", tmp, context) -        inzip = ZipFile(tmp, 'r', ZIP_DEFLATED) -        value = inzip.read('content.xml') -        self.assertTrue(u"Testé" in value or "Testé" in value) -        self.assertTrue("testé 2" not in value and "testé 2" not in value) -        self.assertTrue("2015" in value) -        lg, ct = settings.LANGUAGE_CODE.split('-') -        if lg == 'fr': -            self.assertTrue('janvier' in value) -        if lg == 'en': -            self.assertTrue('january' in value) -""" -  def create_superuser():      username = 'username4277' @@ -237,8 +206,8 @@ class WizardTest(object):                  next_form_is_checked = len(self.steps) > idx + 1 and \                      self.steps[idx + 1][0] not in ignored                  try: -                    response = self.client.post(url, data, -                                                follow=not next_form_is_checked) +                    response = self.client.post( +                        url, data, follow=not next_form_is_checked)                  except ValidationError as e:                      # on ManagementForm data is missing or has been tampered                      # error verify the wizard_name or step name @@ -710,7 +679,8 @@ class ShortMenuTest(TestCase):      def test_treatment_file(self):          c = Client()          c.login(username=self.username, password=self.password) -        from archaeological_finds.models import TreatmentFile, TreatmentFileType +        from archaeological_finds.models import TreatmentFile, \ +            TreatmentFileType          tf = TreatmentFile.objects.create(              type=TreatmentFileType.objects.create(),              year=2050  | 
