From 2b2cd80a18f5e6bce5bd679b13e2190269aa8583 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 11 Jul 2014 01:35:00 -0400 Subject: [PATCH] Fix and improve the existing tests --- mayan/apps/documents/tests.py | 38 +++++++++++++++++------------------ mayan/apps/folders/tests.py | 7 ++++--- mayan/apps/ocr/tests.py | 7 ++++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/mayan/apps/documents/tests.py b/mayan/apps/documents/tests.py index eea52f3106..58d8dd73b2 100644 --- a/mayan/apps/documents/tests.py +++ b/mayan/apps/documents/tests.py @@ -15,6 +15,8 @@ from .models import Document, DocumentType TEST_ADMIN_PASSWORD = 'test_admin_password' TEST_ADMIN_USERNAME = 'test_admin' TEST_ADMIN_EMAIL = 'admin@admin.com' +TEST_DOCUMENT_PATH = os.path.join(settings.BASE_DIR, 'contrib', 'sample_documents', 'mayan_11_1.pdf') +TEST_SIGNED_DOCUMENT_PATH = os.path.join(settings.BASE_DIR, 'contrib', 'sample_documents', 'mayan_11_1.pdf.gpg') class DocumentTestCase(unittest.TestCase): @@ -27,11 +29,9 @@ class DocumentTestCase(unittest.TestCase): description='description', ) self.document.save() - # return File(file(self.filepath, 'rb'), name=self.filename) - file_object = open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'mayan_11_1.pdf')) - new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf')) - file_object.close() + with open(TEST_DOCUMENT_PATH) as file_object: + new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf')) def test_document_creation(self): self.failUnlessEqual(self.document_type.name, 'test doc type') @@ -48,16 +48,15 @@ class DocumentTestCase(unittest.TestCase): self.failUnlessEqual(self.document.latest_version.get_formated_version(), '1.0') # self.failUnlessEqual(self.document.has_detached_signature(), False) - file_object = open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'mayan_11_1.pdf.gpg')) - new_version_data = { - 'comment': 'test comment 1', - 'version_update': VERSION_UPDATE_MAJOR, - 'release_level': RELEASE_LEVEL_FINAL, - 'serial': 0, - } + with open(TEST_SIGNED_DOCUMENT_PATH) as file_object: + new_version_data = { + 'comment': 'test comment 1', + 'version_update': VERSION_UPDATE_MAJOR, + 'release_level': RELEASE_LEVEL_FINAL, + 'serial': 0, + } - new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf.gpg'), **new_version_data) - file_object.close() + new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf.gpg'), **new_version_data) self.failUnlessEqual(self.document.latest_version.get_formated_version(), '2.0') @@ -67,9 +66,8 @@ class DocumentTestCase(unittest.TestCase): 'release_level': RELEASE_LEVEL_FINAL, 'serial': 0, } - file_object = open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'mayan_11_1.pdf')) - new_version = self.document.new_version(file=File(file_object), **new_version_data) - file_object.close() + with open(TEST_DOCUMENT_PATH) as file_object: + new_version = self.document.new_version(file=File(file_object), **new_version_data) self.failUnlessEqual(self.document.latest_version.get_formated_version(), '3.0') @@ -90,9 +88,9 @@ class DocumentSearchTestCase(unittest.TestCase): ) self.document.save() - file_object = open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'mayan_11_1.pdf')) - new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf')) - file_object.close() + with open(TEST_DOCUMENT_PATH) as file_object: + new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf')) + # Text extraction on the first page only parse_document_page(self.document.latest_version.pages.all()[0]) @@ -160,7 +158,7 @@ class DocumentUploadFunctionalTestCase(unittest.TestCase): self.assertEqual(WebForm.objects.count(), 1) # Upload the test document - with open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'mayan_11_1.pdf')) as file_descriptor: + with open(TEST_DOCUMENT_PATH) as file_descriptor: response = self.client.post(reverse('upload_interactive'), {'file': file_descriptor}) self.assertEqual(Document.objects.count(), 1) diff --git a/mayan/apps/folders/tests.py b/mayan/apps/folders/tests.py index 29a6bf136b..853b871ab7 100644 --- a/mayan/apps/folders/tests.py +++ b/mayan/apps/folders/tests.py @@ -11,6 +11,8 @@ from documents.models import Document, DocumentType from .models import Folder +TEST_DOCUMENT_PATH = os.path.join(settings.BASE_DIR, 'contrib', 'sample_documents', 'mayan_11_1.pdf') + class FolderTestCase(unittest.TestCase): def setUp(self): @@ -23,9 +25,8 @@ class FolderTestCase(unittest.TestCase): ) self.document.save() - file_object = open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'mayan_11_1.pdf')) - new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf')) - file_object.close() + with open(TEST_DOCUMENT_PATH) as file_object: + self.document.new_version(file=File(file_object, name='mayan_11_1.pdf')) def test_creation_of_folder(self): user = User.objects.all()[0] diff --git a/mayan/apps/ocr/tests.py b/mayan/apps/ocr/tests.py index 94a0a20e05..5db2166e10 100644 --- a/mayan/apps/ocr/tests.py +++ b/mayan/apps/ocr/tests.py @@ -11,6 +11,8 @@ from documents.models import Document, DocumentType from .api import do_document_ocr from .models import DocumentQueue +TEST_DOCUMENT_PATH = os.path.join(settings.BASE_DIR, 'contrib', 'sample_documents', 'title_page.png') + class DocumentSearchTestCase(unittest.TestCase): def setUp(self): @@ -27,9 +29,8 @@ class DocumentSearchTestCase(unittest.TestCase): ) self.document.save() - file_object = open(os.path.join(settings.SITE_ROOT, 'contrib', 'sample_documents', 'title_page.png')) - new_version = self.document.new_version(file=File(file_object, name='title_page.png')) - file_object.close() + with open(TEST_DOCUMENT_PATH) as file_object: + self.document.new_version(file=File(file_object, name='title_page.png')) self.failUnlessEqual(self.default_queue.queuedocument_set.count(), 1)