Code style improvement. Test code consolidation. PEP8 cleanups.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-10-06 02:13:36 -04:00
parent 025fafabf4
commit a99b044555
50 changed files with 656 additions and 682 deletions

View File

@@ -25,7 +25,7 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
self.login_user()
def test_document_version_signature_detail_link_no_permission(self):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
@@ -41,7 +41,7 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
self.assertEqual(resolved_link, None)
def test_document_version_signature_detail_link_with_permission(self):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
@@ -68,12 +68,12 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
)
def test_document_version_signature_delete_link_no_permission(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -90,12 +90,12 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
self.assertEqual(resolved_link, None)
def test_document_version_signature_delete_link_with_permission(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)

View File

@@ -35,7 +35,7 @@ class DocumentSignaturesTestCase(BaseTestCase):
super(DocumentSignaturesTestCase, self).tearDown()
def test_embedded_signature_no_key(self):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
signed_document = self.document_type.new_document(
file_object=file_object
)
@@ -51,7 +51,7 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.signature_id, None)
def test_embedded_signature_post_key_verify(self):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
signed_document = self.document_type.new_document(
file_object=file_object
)
@@ -66,7 +66,7 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.key_id, TEST_KEY_ID)
self.assertEqual(signature.signature_id, None)
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
signature = EmbeddedSignature.objects.first()
@@ -74,10 +74,10 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.signature_id, TEST_SIGNATURE_ID)
def test_embedded_signature_post_no_key_verify(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
key = Key.objects.create(key_data=file_object.read())
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
signed_document = self.document_type.new_document(
file_object=file_object
)
@@ -99,10 +99,10 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.signature_id, None)
def test_embedded_signature_with_key(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
key = Key.objects.create(key_data=file_object.read())
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
self.signed_document = self.document_type.new_document(
file_object=file_object
)
@@ -120,12 +120,12 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.signature_id, TEST_SIGNATURE_ID)
def test_detached_signature_no_key(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -140,15 +140,15 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.public_key_fingerprint, None)
def test_detached_signature_with_key(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
key = Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -163,12 +163,12 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.public_key_fingerprint, key.fingerprint)
def test_detached_signature_post_key_verify(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -182,7 +182,7 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.key_id, TEST_KEY_ID)
self.assertEqual(signature.public_key_fingerprint, None)
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
key = Key.objects.create(key_data=file_object.read())
signature = DetachedSignature.objects.first()
@@ -190,15 +190,15 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.public_key_fingerprint, key.fingerprint)
def test_detached_signature_post_no_key_verify(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
key = Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -219,7 +219,7 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(signature.public_key_fingerprint, None)
def test_document_no_signature(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
@@ -227,12 +227,12 @@ class DocumentSignaturesTestCase(BaseTestCase):
self.assertEqual(EmbeddedSignature.objects.count(), 0)
def test_new_signed_version(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
signed_version = document.new_version(
file_object=file_object, comment='test comment 1'
)
@@ -268,13 +268,13 @@ class EmbeddedSignaturesTestCase(BaseTestCase):
TEST_SIGNED_DOCUMENT_COUNT = 2
for count in range(TEST_UNSIGNED_DOCUMENT_COUNT):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
for count in range(TEST_SIGNED_DOCUMENT_COUNT):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
@@ -296,13 +296,13 @@ class EmbeddedSignaturesTestCase(BaseTestCase):
TEST_SIGNED_DOCUMENT_COUNT = 2
for count in range(TEST_UNSIGNED_DOCUMENT_COUNT):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
for count in range(TEST_SIGNED_DOCUMENT_COUNT):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
@@ -324,7 +324,7 @@ class EmbeddedSignaturesTestCase(BaseTestCase):
def test_signing(self):
key = Key.objects.create(key_data=TEST_KEY_DATA)
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)

View File

@@ -30,16 +30,22 @@ TEST_SIGNED_DOCUMENT_COUNT = 2
class SignaturesViewTestCase(GenericDocumentViewTestCase):
def _request_document_version_signature_list_view(self, document):
return self.get(
viewname='signatures:document_version_signature_list',
args=(document.latest_version.pk,)
)
def test_signature_list_view_no_permission(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -47,23 +53,21 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
self.login_user()
response = self.get(
'signatures:document_version_signature_list',
args=(document.latest_version.pk,)
response = self._request_document_version_signature_list_view(
document=document
)
self.assertEqual(response.status_code, 403)
def test_signature_list_view_with_access(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -76,24 +80,28 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
permission=permission_document_version_signature_view
)
response = self.get(
'signatures:document_version_signature_list',
args=(document.latest_version.pk,)
response = self._request_document_version_signature_list_view(
document=document
)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['object_list'].count(), 1)
def _request_document_version_signature_details_view(self, signature):
return self.get(
viewname='signatures:document_version_signature_details',
args=(signature.pk,)
)
def test_signature_detail_view_no_permission(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
signature = DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -101,23 +109,21 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
self.login_user()
response = self.get(
'signatures:document_version_signature_details',
args=(signature.pk,)
response = self._request_document_version_signature_details_view(
signature=signature
)
self.assertEqual(response.status_code, 403)
def test_signature_detail_view_with_access(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
signature = DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -130,33 +136,37 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
permission=permission_document_version_signature_view
)
response = self.get(
'signatures:document_version_signature_details',
args=(signature.pk,)
response = self._request_document_version_signature_details_view(
signature=signature
)
self.assertContains(
response=response, text=signature.signature_id, status_code=200
)
self.assertContains(response, signature.signature_id, status_code=200)
def _request_document_version_signature_upload_view(self, document_version):
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
return self.post(
viewname='signatures:document_version_signature_upload',
args=(document_version.pk,),
data={'signature_file': file_object}
)
def test_signature_upload_view_no_permission(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
self.login_user()
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
response = self.post(
'signatures:document_version_signature_upload',
args=(document.latest_version.pk,),
data={'signature_file': file_object}
)
response = self._request_document_version_signature_upload_view(
document_version=document.latest_version
)
self.assertEqual(response.status_code, 403)
self.assertEqual(DetachedSignature.objects.count(), 0)
def test_signature_upload_view_with_access(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
@@ -168,23 +178,25 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
permission=permission_document_version_signature_upload
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
response = self.post(
'signatures:document_version_signature_upload',
args=(document.latest_version.pk,),
data={'signature_file': file_object}
)
response = self._request_document_version_signature_upload_view(
document_version=document.latest_version
)
self.assertEqual(response.status_code, 302)
self.assertEqual(DetachedSignature.objects.count(), 1)
def _request_document_version_signature_download_view(self, signature):
return self.get(
viewname='signatures:document_version_signature_download',
args=(signature.pk,),
)
def test_signature_download_view_no_permission(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
signature = DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -192,20 +204,18 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
self.login_user()
response = self.get(
'signatures:document_version_signature_download',
args=(signature.pk,),
response = self._request_document_version_signature_download_view(
signature=signature
)
self.assertEqual(response.status_code, 403)
def test_signature_download_view_with_access(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
signature = DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -220,9 +230,8 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
self.expected_content_type = 'application/octet-stream; charset=utf-8'
response = self.get(
'signatures:document_version_signature_download',
args=(signature.pk,),
response = self._request_document_version_signature_download_view(
signature=signature
)
with signature.signature_file as file_object:
@@ -230,16 +239,22 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
self, response=response, content=file_object.read(),
)
def _request_document_version_signature_delete_view(self, signature):
return self.post(
viewname='signatures:document_version_signature_delete',
args=(signature.pk,)
)
def test_signature_delete_view_no_permission(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
signature = DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -252,24 +267,22 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
permission=permission_document_version_signature_view
)
response = self.post(
'signatures:document_version_signature_delete',
args=(signature.pk,)
response = self._request_document_version_signature_delete_view(
signature=signature
)
self.assertEqual(response.status_code, 403)
self.assertEqual(DetachedSignature.objects.count(), 1)
def test_signature_delete_view_with_access(self):
with open(TEST_KEY_FILE, 'rb') as file_object:
with open(TEST_KEY_FILE, mode='rb') as file_object:
Key.objects.create(key_data=file_object.read())
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
document = self.document_type.new_document(
file_object=file_object
)
with open(TEST_SIGNATURE_FILE_PATH, 'rb') as file_object:
with open(TEST_SIGNATURE_FILE_PATH, mode='rb') as file_object:
signature = DetachedSignature.objects.create(
document_version=document.latest_version,
signature_file=File(file_object)
@@ -286,14 +299,17 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
permission=permission_document_version_signature_view
)
response = self.post(
'signatures:document_version_signature_delete',
args=(signature.pk,), follow=True
response = self._request_document_version_signature_delete_view(
signature=signature
)
self.assertContains(response, 'deleted', status_code=200)
self.assertEqual(response.status_code, 302)
self.assertEqual(DetachedSignature.objects.count(), 0)
def _request_all_document_version_signature_verify_view(self):
return self.post(
viewname='signatures:all_document_version_signature_verify'
)
def test_missing_signature_verify_view_no_permission(self):
# Silence converter logging
logging.getLogger('converter.backends').setLevel(logging.CRITICAL)
@@ -304,13 +320,13 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
old_hooks = DocumentVersion._post_save_hooks
DocumentVersion._post_save_hooks = {}
for count in range(TEST_UNSIGNED_DOCUMENT_COUNT):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
for count in range(TEST_SIGNED_DOCUMENT_COUNT):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
@@ -324,10 +340,7 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
self.login_user()
response = self.post(
'signatures:all_document_version_signature_verify', follow=True
)
response = self._request_all_document_version_signature_verify_view()
self.assertEqual(response.status_code, 403)
self.assertEqual(
@@ -345,13 +358,13 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
old_hooks = DocumentVersion._post_save_hooks
DocumentVersion._post_save_hooks = {}
for count in range(TEST_UNSIGNED_DOCUMENT_COUNT):
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
for count in range(TEST_SIGNED_DOCUMENT_COUNT):
with open(TEST_SIGNED_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SIGNED_DOCUMENT_PATH, mode='rb') as file_object:
self.document_type.new_document(
file_object=file_object
)
@@ -369,11 +382,8 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase):
permission=permission_document_version_signature_verify
)
response = self.post(
'signatures:all_document_version_signature_verify', follow=True
)
self.assertContains(response, 'queued', status_code=200)
response = self._request_all_document_version_signature_verify_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(
EmbeddedSignature.objects.unsigned_document_versions().count(),