Replace tests fails checks to assertions.

This commit is contained in:
Roberto Rosario
2015-07-12 02:59:45 -04:00
parent c2a0990e57
commit e05f6b5830
10 changed files with 82 additions and 73 deletions

View File

@@ -24,8 +24,8 @@ class DjangoGPGTestCase(TestCase):
def test_main(self):
# No private or public keys in the keyring
self.failUnlessEqual(Key.get_all(self.gpg, secret=True), [])
self.failUnlessEqual(Key.get_all(self.gpg), [])
self.assertEqual(Key.get_all(self.gpg, secret=True), [])
self.assertEqual(Key.get_all(self.gpg), [])
# Test querying the keyservers
self.assertTrue(TEST_KEY_ID in [key_stub.key_id for key_stub in self.gpg.query(TEST_UIDS)])

View File

@@ -27,52 +27,52 @@ class IndexTestCase(TestCase):
# Create empty index
index = Index.objects.create(label='test')
self.failUnlessEqual(list(Index.objects.all()), [index])
self.assertQuerysetEqual(Index.objects.all(), [repr(index)])
# Add our document type to the new index
index.document_types.add(self.document_type)
self.failUnlessEqual(list(index.document_types.all()), [self.document_type])
self.assertQuerysetEqual(index.document_types.all(), [repr(self.document_type)])
# Create simple index template
root = index.template_root
index.node_templates.create(parent=root, expression='document.metadata_value_of.test', link_documents=True)
self.failUnlessEqual(list(IndexTemplateNode.objects.values_list('expression', flat=True)), ['', 'document.metadata_value_of.test'])
self.assertEqual(list(IndexTemplateNode.objects.values_list('expression', flat=True)), ['', 'document.metadata_value_of.test'])
# Add document metadata value to trigger index node instance creation
self.document.metadata.create(metadata_type=metadata_type, value='0001')
self.failUnlessEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0001'])
self.assertEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0001'])
# Check that document is in instance node
instance_node = IndexInstanceNode.objects.get(value='0001')
self.failUnlessEqual(list(instance_node.documents.all()), [self.document])
self.assertQuerysetEqual(instance_node.documents.all(), [repr(self.document)])
# Change document metadata value to trigger index node instance update
document_metadata = self.document.metadata.get(metadata_type=metadata_type)
document_metadata.value = '0002'
document_metadata.save()
self.failUnlessEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0002'])
self.assertEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0002'])
# Check that document is in new instance node
instance_node = IndexInstanceNode.objects.get(value='0002')
self.failUnlessEqual(list(instance_node.documents.all()), [self.document])
self.assertQuerysetEqual(instance_node.documents.all(), [repr(self.document)])
# Check node instance is destoyed when no metadata is available
self.document.metadata.get(metadata_type=metadata_type).delete()
self.failUnlessEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), [''])
self.assertEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), [''])
# Add document metadata value again to trigger index node instance creation
self.document.metadata.create(metadata_type=metadata_type, value='0003')
self.failUnlessEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0003'])
self.assertEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0003'])
# Check node instance is destroyed when no documents are contained
self.document.delete()
# Document is in trash, index structure should remain unchanged
self.failUnlessEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0003'])
self.assertEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), ['', '0003'])
# Document deleted from, index structure should update
self.document.delete()
self.failUnlessEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), [''])
self.assertEqual(list(IndexInstanceNode.objects.values_list('value', flat=True)), [''])
def test_rebuild_all_indexes(self):
# Add metadata type and connect to document type
@@ -84,23 +84,23 @@ class IndexTestCase(TestCase):
# Create empty index
index = Index.objects.create(label='test')
self.failUnlessEqual(list(Index.objects.all()), [index])
self.assertEqual(list(Index.objects.all()), [index])
# Add our document type to the new index
index.document_types.add(self.document_type)
self.failUnlessEqual(list(index.document_types.all()), [self.document_type])
self.assertQuerysetEqual(index.document_types.all(), [repr(self.document_type)])
# Create simple index template
root = index.template_root
index.node_templates.create(parent=root, expression='document.metadata_value_of.test', link_documents=True)
self.failUnlessEqual(list(IndexTemplateNode.objects.values_list('expression', flat=True)), ['', 'document.metadata_value_of.test'])
self.assertEqual(list(IndexTemplateNode.objects.values_list('expression', flat=True)), ['', 'document.metadata_value_of.test'])
# There should be no index instances
self.failUnlessEqual(list(IndexInstanceNode.objects.all()), [])
self.assertEqual(list(IndexInstanceNode.objects.all()), [])
# Rebuild all indexes
IndexInstanceNode.objects.rebuild_all_indexes()
# Check that document is in instance node
instance_node = IndexInstanceNode.objects.get(value='0001')
self.failUnlessEqual(list(instance_node.documents.all()), [self.document])
self.assertQuerysetEqual(instance_node.documents.all(), [repr(self.document)])

View File

@@ -33,27 +33,27 @@ class DocumentTestCase(TestCase):
gpg.import_key(file_object.read())
def test_document_no_signature(self):
self.failUnlessEqual(DocumentVersionSignature.objects.has_detached_signature(self.document.latest_version), False)
self.assertEqual(DocumentVersionSignature.objects.has_detached_signature(self.document.latest_version), False)
def test_new_document_version_signed(self):
with open(TEST_SIGNED_DOCUMENT_PATH) as file_object:
self.document.new_version(file_object=File(file_object), comment='test comment 1')
self.failUnlessEqual(DocumentVersionSignature.objects.has_detached_signature(self.document.latest_version), False)
self.failUnlessEqual(DocumentVersionSignature.objects.verify_signature(self.document.latest_version).status, SIGNATURE_STATE_VALID)
self.assertEqual(DocumentVersionSignature.objects.has_detached_signature(self.document.latest_version), False)
self.assertEqual(DocumentVersionSignature.objects.verify_signature(self.document.latest_version).status, SIGNATURE_STATE_VALID)
def test_detached_signatures(self):
with open(TEST_DOCUMENT_PATH) as file_object:
self.document.new_version(file_object=File(file_object), comment='test comment 2')
# GPGVerificationError
self.failUnlessEqual(DocumentVersionSignature.objects.verify_signature(self.document.latest_version), None)
self.assertEqual(DocumentVersionSignature.objects.verify_signature(self.document.latest_version), None)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
DocumentVersionSignature.objects.add_detached_signature(self.document.latest_version, File(file_object))
self.failUnlessEqual(DocumentVersionSignature.objects.has_detached_signature(self.document.latest_version), True)
self.failUnlessEqual(DocumentVersionSignature.objects.verify_signature(self.document.latest_version).status, SIGNATURE_STATE_VALID)
self.assertEqual(DocumentVersionSignature.objects.has_detached_signature(self.document.latest_version), True)
self.assertEqual(DocumentVersionSignature.objects.verify_signature(self.document.latest_version).status, SIGNATURE_STATE_VALID)
def tearDown(self):
self.document.delete()

View File

@@ -76,14 +76,14 @@ class DocumentAPICreateDocumentTestCase(TestCase):
# Make sure the document uploaded correctly
document = Document.objects.first()
self.failUnlessEqual(document.exists(), True)
self.failUnlessEqual(document.size, 272213)
self.assertEqual(document.exists(), True)
self.assertEqual(document.size, 272213)
self.failUnlessEqual(document.file_mimetype, 'application/pdf')
self.failUnlessEqual(document.file_mime_encoding, 'binary')
self.failUnlessEqual(document.label, TEST_SMALL_DOCUMENT_FILENAME)
self.failUnlessEqual(document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
self.failUnlessEqual(document.page_count, 47)
self.assertEqual(document.file_mimetype, 'application/pdf')
self.assertEqual(document.file_mime_encoding, 'binary')
self.assertEqual(document.label, TEST_SMALL_DOCUMENT_FILENAME)
self.assertEqual(document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
self.assertEqual(document.page_count, 47)
# Make sure we can edit the document via the API
document_url = reverse('document-detail', args=[Document.objects.first().pk])

View File

@@ -38,16 +38,16 @@ class DocumentTestCase(TestCase):
self.document_type.delete()
def test_document_creation(self):
self.failUnlessEqual(self.document_type.label, TEST_DOCUMENT_TYPE)
self.assertEqual(self.document_type.label, TEST_DOCUMENT_TYPE)
self.failUnlessEqual(self.document.exists(), True)
self.failUnlessEqual(self.document.size, 272213)
self.assertEqual(self.document.exists(), True)
self.assertEqual(self.document.size, 272213)
self.failUnlessEqual(self.document.file_mimetype, 'application/pdf')
self.failUnlessEqual(self.document.file_mime_encoding, 'binary')
self.failUnlessEqual(self.document.label, 'mayan_11_1.pdf')
self.failUnlessEqual(self.document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
self.failUnlessEqual(self.document.page_count, 47)
self.assertEqual(self.document.file_mimetype, 'application/pdf')
self.assertEqual(self.document.file_mime_encoding, 'binary')
self.assertEqual(self.document.label, 'mayan_11_1.pdf')
self.assertEqual(self.document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
self.assertEqual(self.document.page_count, 47)
def test_version_creation(self):
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
@@ -56,7 +56,7 @@ class DocumentTestCase(TestCase):
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
self.document.new_version(file_object=File(file_object), comment='test comment 1')
self.failUnlessEqual(self.document.versions.count(), 3)
self.assertEqual(self.document.versions.count(), 3)
def test_restoring_documents(self):
self.assertEqual(Document.objects.count(), 1)

View File

@@ -40,6 +40,7 @@ class DocumentsViewsFunctionalTestCase(TestCase):
def tearDown(self):
self.document.delete()
self.document_type.delete()
self.admin_user.delete()
def test_restoring_documents(self):
self.assertEqual(Document.objects.count(), 1)

View File

@@ -1,11 +1,13 @@
from __future__ import unicode_literals
from django.conf import settings
from django.contrib.auth.models import User
from django.core.files.base import File
from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test.client import Client
from django.test.utils import override_settings
from pagination.templatetags import pagination_tags
from documents.models import DocumentType
from documents.search import document_search
@@ -32,7 +34,7 @@ class Issue46TestCase(TestCase):
self.document_type = DocumentType.objects.create(label=TEST_DOCUMENT_TYPE)
# Upload 50 instances of the same test document
# Upload many instances of the same test document
for i in range(self.document_count):
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
self.document_type.new_document(
@@ -40,12 +42,18 @@ class Issue46TestCase(TestCase):
label='test document',
)
@override_settings(PAGINATION_DEFAULT_PAGINATION=2)
def tearDown(self):
DocumentType.objects.all().delete()
self.admin_user.delete()
def test_advanced_search_past_first_page(self):
# Make sure all documents are returned by the search
model_list, result_set, elapsed_time = document_search.search({'label': 'test document'}, user=self.admin_user)
self.assertEqual(len(result_set), self.document_count)
with self.settings(PAGINATION_DEFAULT_PAGINATION=2):
reload(pagination_tags)
# Funcitonal test for the first page of advanced results
response = self.client.get(reverse('search:results'), {'label': 'test'})
self.assertContains(response, 'Total (1 - 2 out of 4) (Page 1 of 2)', status_code=200)

View File

@@ -49,13 +49,13 @@ class UploadDocumentTestCase(TestCase):
document = Document.objects.first()
self.failUnlessEqual(document.exists(), True)
self.failUnlessEqual(document.size, 17436)
self.assertEqual(document.exists(), True)
self.assertEqual(document.size, 17436)
self.failUnlessEqual(document.file_mimetype, 'image/png')
self.failUnlessEqual(document.file_mime_encoding, 'binary')
self.failUnlessEqual(document.label, TEST_NON_ASCII_DOCUMENT_FILENAME)
self.failUnlessEqual(document.page_count, 1)
self.assertEqual(document.file_mimetype, 'image/png')
self.assertEqual(document.file_mime_encoding, 'binary')
self.assertEqual(document.label, TEST_NON_ASCII_DOCUMENT_FILENAME)
self.assertEqual(document.page_count, 1)
# Test Non-ASCII named documents inside Non-ASCII named compressed file
@@ -66,12 +66,12 @@ class UploadDocumentTestCase(TestCase):
self.assertEqual(Document.objects.count(), 2)
self.failUnlessEqual(document.exists(), True)
self.failUnlessEqual(document.size, 17436)
self.assertEqual(document.exists(), True)
self.assertEqual(document.size, 17436)
self.failUnlessEqual(document.file_mimetype, 'image/png')
self.failUnlessEqual(document.file_mime_encoding, 'binary')
self.failUnlessEqual(document.label, TEST_NON_ASCII_DOCUMENT_FILENAME)
self.failUnlessEqual(document.page_count, 1)
self.assertEqual(document.file_mimetype, 'image/png')
self.assertEqual(document.file_mime_encoding, 'binary')
self.assertEqual(document.label, TEST_NON_ASCII_DOCUMENT_FILENAME)
self.assertEqual(document.page_count, 1)
shutil.rmtree(temporary_directory)

View File

@@ -46,14 +46,14 @@ class UploadDocumentTestCase(TestCase):
self.assertEqual(Document.objects.count(), 1)
self.document = Document.objects.all().first()
self.failUnlessEqual(self.document.exists(), True)
self.failUnlessEqual(self.document.size, 272213)
self.assertEqual(self.document.exists(), True)
self.assertEqual(self.document.size, 272213)
self.failUnlessEqual(self.document.file_mimetype, 'application/pdf')
self.failUnlessEqual(self.document.file_mime_encoding, 'binary')
self.failUnlessEqual(self.document.label, 'mayan_11_1.pdf')
self.failUnlessEqual(self.document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
self.failUnlessEqual(self.document.page_count, 47)
self.assertEqual(self.document.file_mimetype, 'application/pdf')
self.assertEqual(self.document.file_mime_encoding, 'binary')
self.assertEqual(self.document.label, 'mayan_11_1.pdf')
self.assertEqual(self.document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
self.assertEqual(self.document.page_count, 47)
def test_issue_25(self):
# Login the admin user
@@ -73,15 +73,15 @@ class UploadDocumentTestCase(TestCase):
document = Document.objects.first()
# Test for issue 25 during creation
# ** description fields was removed from upload from **
self.failUnlessEqual(document.description, '')
self.assertEqual(document.description, '')
# Reset description
document.description = TEST_DOCUMENT_DESCRIPTION
document.save()
self.failUnlessEqual(document.description, TEST_DOCUMENT_DESCRIPTION)
self.assertEqual(document.description, TEST_DOCUMENT_DESCRIPTION)
# Test for issue 25 during editing
self.client.post(reverse('documents:document_edit', args=[document.pk]), {'description': TEST_DOCUMENT_DESCRIPTION, 'language': document.language, 'label': document.label})
# Fetch document again and test description
document = Document.objects.first()
self.failUnlessEqual(document.description, TEST_DOCUMENT_DESCRIPTION)
self.assertEqual(document.description, TEST_DOCUMENT_DESCRIPTION)

View File

@@ -32,8 +32,8 @@ class TagTestCase(TestCase):
def runTest(self):
tag = Tag(label='test', color=COLOR_RED)
tag.save()
self.failUnlessEqual(tag.label, 'test')
self.failUnlessEqual(tag.get_color_code(), 'red')
self.assertEqual(tag.label, 'test')
self.assertEqual(tag.get_color_code(), 'red')
def test_addition_and_deletion_of_documents(self):
tag = Tag(label='test', color=COLOR_RED)