Commit 4fb40d2b authored by Christian Rohlfing's avatar Christian Rohlfing
Browse files

Added PDFs back to input folder and fixed tests

parent 41f0e1ab
...@@ -20,7 +20,7 @@ class MainTest(unittest.TestCase): ...@@ -20,7 +20,7 @@ class MainTest(unittest.TestCase):
import batch import batch
expected_files = ['moodle_feedbacks.zip', 'passwords.csv'] expected_files = ['moodle_feedbacks.zip', 'passwords.csv']
expected_folders = ['Nachname, Vorname_436452_assignsubmission_file_'] expected_folders = ['Four, Student_107_assignsubmission_file_']
expected_pdfs = ['123456_Nachname_w_aes.pdf'] expected_pdfs = ['123456_Nachname_w_aes.pdf']
# Prepare parameter # Prepare parameter
......
...@@ -21,7 +21,9 @@ class MainTest(unittest.TestCase): ...@@ -21,7 +21,9 @@ class MainTest(unittest.TestCase):
def test_encrypt_scans(self): def test_encrypt_scans(self):
import encrypt import encrypt
expected_files = ['123456_Nachname_aes.pdf', '456789_Lastname_aes.pdf', expected_files = ['123456_Nachname_aes.pdf',
'456789_Lastname_aes.pdf',
'567891_Student_aes.pdf',
'passwords.csv'] 'passwords.csv']
# Prepare parameter # Prepare parameter
...@@ -40,7 +42,7 @@ class MainTest(unittest.TestCase): ...@@ -40,7 +42,7 @@ class MainTest(unittest.TestCase):
def test_encrypt_supplements(self): def test_encrypt_supplements(self):
import encrypt import encrypt
expected_files = ['GDET3_20H_aes.pdf' 'GDET3_20H_loes_aes.pdf', expected_files = ['GDET3_20H_aes.pdf', 'GDET3_20H_loes_aes.pdf',
'passwords.csv'] 'passwords.csv']
# Prepare parameter # Prepare parameter
......
...@@ -2,7 +2,6 @@ import unittest ...@@ -2,7 +2,6 @@ import unittest
import time import time
import os import os
import tempfile import tempfile
import shutil
class MainTest(unittest.TestCase): class MainTest(unittest.TestCase):
...@@ -22,7 +21,9 @@ class MainTest(unittest.TestCase): ...@@ -22,7 +21,9 @@ class MainTest(unittest.TestCase):
expected_files = ['123456_Nachname_GDET3_20H.pdf', expected_files = ['123456_Nachname_GDET3_20H.pdf',
'123456_Nachname_GDET3_20H_loes.pdf', '123456_Nachname_GDET3_20H_loes.pdf',
'456789_Lastname_GDET3_20H.pdf', '456789_Lastname_GDET3_20H.pdf',
'456789_Lastname_GDET3_20H_loes.pdf'] '456789_Lastname_GDET3_20H_loes.pdf',
'567891_Student_GDET3_20H.pdf',
'567891_Student_GDET3_20H_loes.pdf']
# Prepare parameter # Prepare parameter
supp_dir = './supplements' supp_dir = './supplements'
...@@ -45,10 +46,12 @@ class MainTest(unittest.TestCase): ...@@ -45,10 +46,12 @@ class MainTest(unittest.TestCase):
def test_supplements_from_csv(self): def test_supplements_from_csv(self):
import supplements import supplements
expected_files = ['123456_Nachname_Vorname_GDET3_20H.pdf', expected_files = ['123456_F_GDET3_20H.pdf',
'123456_Nachname_Vorname_GDET3_20H_loes.pdf', '123456_F_GDET3_20H_loes.pdf',
'987654_Noch_Jemand_GDET3_20H.pdf', '123457_O_GDET3_20H.pdf',
'987654_Noch_Jemand_GDET3_20H_loes.pdf'] '123457_O_GDET3_20H_loes.pdf',
'125412_T_GDET3_20H.pdf',
'125412_T_GDET3_20H_loes.pdf']
# Prepare parameter # Prepare parameter
supp_dir = './supplements' supp_dir = './supplements'
...@@ -75,7 +78,9 @@ class MainTest(unittest.TestCase): ...@@ -75,7 +78,9 @@ class MainTest(unittest.TestCase):
expected_files = ['123456_Nachname_GDET3_20H_loes_w.pdf', expected_files = ['123456_Nachname_GDET3_20H_loes_w.pdf',
'123456_Nachname_GDET3_20H_w.pdf', '123456_Nachname_GDET3_20H_w.pdf',
'456789_Lastname_GDET3_20H_loes_w.pdf', '456789_Lastname_GDET3_20H_loes_w.pdf',
'456789_Lastname_GDET3_20H_w.pdf'] '456789_Lastname_GDET3_20H_w.pdf',
'567891_Student_GDET3_20H_loes_w.pdf',
'567891_Student_GDET3_20H_w.pdf']
# Prepare parameter # Prepare parameter
supp_dir = './supplements' supp_dir = './supplements'
......
...@@ -40,7 +40,9 @@ class MainTest(unittest.TestCase): ...@@ -40,7 +40,9 @@ class MainTest(unittest.TestCase):
def test_watermark_pdfs(self): def test_watermark_pdfs(self):
import watermark import watermark
expected_files = ['123456_Nachname_w.pdf', '456789_Lastname_w.pdf'] expected_files = ['123456_Nachname_w.pdf',
'456789_Lastname_w.pdf',
'567891_Student_w.pdf']
# Prepare parameter # Prepare parameter
in_dir = './pdfs' in_dir = './pdfs'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment