From fb75b05d1b2488346464fc8539056cf57f5cc63e Mon Sep 17 00:00:00 2001 From: DonRenando Date: Tue, 28 Mar 2017 18:04:57 +0200 Subject: [PATCH] TG-62 upload file (template) => test --- backend/app/tools/LibPdf.py | 4 ++-- .../tools/{ => libPdf}/PyPDF2/__init__.py | 0 .../tests/tools/{ => libPdf}/PyPDF2/page1.pdf | Bin .../tests/tools/{ => libPdf}/PyPDF2/page2.pdf | Bin .../{ => libPdf}/PyPDF2/testFusionFichiers.py | 4 +--- .../tests/tools/libPdf/UploadPDF/page1.pdf | Bin 0 -> 6582 bytes .../tools/libPdf/UploadPDF/testUploadPdf.py | 20 ++++++++++++++++++ .../tools/{pdfjinja => libPdf}/__init__.py | 0 .../tests/tools/libPdf/pdfjinja/__init__.py | 0 .../tools/{ => libPdf}/pdfjinja/sample.pdf | Bin .../{ => libPdf}/pdfjinja/sample_backup.pdf | Bin .../pdfjinja/testInsertTemplate.py | 3 +-- 12 files changed, 24 insertions(+), 7 deletions(-) rename backend/tests/tools/{ => libPdf}/PyPDF2/__init__.py (100%) rename backend/tests/tools/{ => libPdf}/PyPDF2/page1.pdf (100%) rename backend/tests/tools/{ => libPdf}/PyPDF2/page2.pdf (100%) rename backend/tests/tools/{ => libPdf}/PyPDF2/testFusionFichiers.py (99%) create mode 100644 backend/tests/tools/libPdf/UploadPDF/page1.pdf create mode 100644 backend/tests/tools/libPdf/UploadPDF/testUploadPdf.py rename backend/tests/tools/{pdfjinja => libPdf}/__init__.py (100%) create mode 100644 backend/tests/tools/libPdf/pdfjinja/__init__.py rename backend/tests/tools/{ => libPdf}/pdfjinja/sample.pdf (100%) rename backend/tests/tools/{ => libPdf}/pdfjinja/sample_backup.pdf (100%) rename backend/tests/tools/{ => libPdf}/pdfjinja/testInsertTemplate.py (99%) diff --git a/backend/app/tools/LibPdf.py b/backend/app/tools/LibPdf.py index 03b9a10..da93aa5 100644 --- a/backend/app/tools/LibPdf.py +++ b/backend/app/tools/LibPdf.py @@ -53,14 +53,14 @@ def allowed_file(filename): filename.rsplit('.', 1)[1].lower() in allowed_extensions -def upload_file(file, upload_folder): +def upload_file(file_to_upload, upload_folder): """ rep de l'etu avec id :param file: :param upload_folder: :return: """ - file.save(secure_filename(os.path.join(upload_folder, file.filename))) + file_to_upload.save(os.path.join(upload_folder, secure_filename(file_to_upload.filename))) diff --git a/backend/tests/tools/PyPDF2/__init__.py b/backend/tests/tools/libPdf/PyPDF2/__init__.py similarity index 100% rename from backend/tests/tools/PyPDF2/__init__.py rename to backend/tests/tools/libPdf/PyPDF2/__init__.py diff --git a/backend/tests/tools/PyPDF2/page1.pdf b/backend/tests/tools/libPdf/PyPDF2/page1.pdf similarity index 100% rename from backend/tests/tools/PyPDF2/page1.pdf rename to backend/tests/tools/libPdf/PyPDF2/page1.pdf diff --git a/backend/tests/tools/PyPDF2/page2.pdf b/backend/tests/tools/libPdf/PyPDF2/page2.pdf similarity index 100% rename from backend/tests/tools/PyPDF2/page2.pdf rename to backend/tests/tools/libPdf/PyPDF2/page2.pdf diff --git a/backend/tests/tools/PyPDF2/testFusionFichiers.py b/backend/tests/tools/libPdf/PyPDF2/testFusionFichiers.py similarity index 99% rename from backend/tests/tools/PyPDF2/testFusionFichiers.py rename to backend/tests/tools/libPdf/PyPDF2/testFusionFichiers.py index 0fb6737..02cccaf 100644 --- a/backend/tests/tools/PyPDF2/testFusionFichiers.py +++ b/backend/tests/tools/libPdf/PyPDF2/testFusionFichiers.py @@ -1,9 +1,7 @@ import os import unittest - -from pathlib import Path - from builtins import print +from pathlib import Path from app.tools.FusionPdf import fusion_fichiers, get_pdf_from_directory diff --git a/backend/tests/tools/libPdf/UploadPDF/page1.pdf b/backend/tests/tools/libPdf/UploadPDF/page1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..6b4e9cc3eb9dd72f4f1e6ba9154932ee9c0868fa GIT binary patch literal 6582 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 literal 0 HcmV?d00001 diff --git a/backend/tests/tools/libPdf/UploadPDF/testUploadPdf.py b/backend/tests/tools/libPdf/UploadPDF/testUploadPdf.py new file mode 100644 index 0000000..45e1940 --- /dev/null +++ b/backend/tests/tools/libPdf/UploadPDF/testUploadPdf.py @@ -0,0 +1,20 @@ +import os +import unittest + +from werkzeug.datastructures import FileStorage + +from app.tools.LibPdf import upload_file + + +class TestFusionTestCase(unittest.TestCase): + def setUp(self): + self.datadir = os.path.join(os.path.dirname(__file__)) + + def test_fusion(self): + with open("page1.pdf", 'rb') as fp: + file = FileStorage(fp) + upload_file(file, "upload") + + # self.assertTrue(Path(self.datadir + "/testFusion.pdf").is_file(), "Pdf fusionne inexistant") + # self.assertTrue(len(get_pdf_from_directory(self.datadir)) > 0, "pdf non trouve") + # os.remove(self.datadir + "/testFusion.pdf") diff --git a/backend/tests/tools/pdfjinja/__init__.py b/backend/tests/tools/libPdf/__init__.py similarity index 100% rename from backend/tests/tools/pdfjinja/__init__.py rename to backend/tests/tools/libPdf/__init__.py diff --git a/backend/tests/tools/libPdf/pdfjinja/__init__.py b/backend/tests/tools/libPdf/pdfjinja/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/tests/tools/pdfjinja/sample.pdf b/backend/tests/tools/libPdf/pdfjinja/sample.pdf similarity index 100% rename from backend/tests/tools/pdfjinja/sample.pdf rename to backend/tests/tools/libPdf/pdfjinja/sample.pdf diff --git a/backend/tests/tools/pdfjinja/sample_backup.pdf b/backend/tests/tools/libPdf/pdfjinja/sample_backup.pdf similarity index 100% rename from backend/tests/tools/pdfjinja/sample_backup.pdf rename to backend/tests/tools/libPdf/pdfjinja/sample_backup.pdf diff --git a/backend/tests/tools/pdfjinja/testInsertTemplate.py b/backend/tests/tools/libPdf/pdfjinja/testInsertTemplate.py similarity index 99% rename from backend/tests/tools/pdfjinja/testInsertTemplate.py rename to backend/tests/tools/libPdf/pdfjinja/testInsertTemplate.py index 68911c2..9cf6078 100644 --- a/backend/tests/tools/pdfjinja/testInsertTemplate.py +++ b/backend/tests/tools/libPdf/pdfjinja/testInsertTemplate.py @@ -3,9 +3,8 @@ import unittest from io import BytesIO from pathlib import Path -from pdfjinja import PdfJinja - from app.tools.InsertTemplate import remplir_template +from pdfjinja import PdfJinja class InsertTemplateTestCase(unittest.TestCase):