Added PDFs back to input folder and fixed tests

tests/test_batch.py

@@ -20,7 +20,7 @@ class MainTest(unittest.TestCase):
         import batch
 
         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']
 
         # Prepare parameter

tests/test_encrypt.py

@@ -21,7 +21,9 @@ class MainTest(unittest.TestCase):
     def test_encrypt_scans(self):
         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']
 
         # Prepare parameter
@@ -40,7 +42,7 @@ class MainTest(unittest.TestCase):
     def test_encrypt_supplements(self):
         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']
 
         # Prepare parameter

tests/test_supplements.py

@@ -2,7 +2,6 @@ import unittest
 import time
 import os
 import tempfile
-import shutil
 
 
 class MainTest(unittest.TestCase):
@@ -22,7 +21,9 @@ class MainTest(unittest.TestCase):
         expected_files = ['123456_Nachname_GDET3_20H.pdf',
                           '123456_Nachname_GDET3_20H_loes.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
         supp_dir = './supplements'
@@ -45,10 +46,12 @@ class MainTest(unittest.TestCase):
     def test_supplements_from_csv(self):
         import supplements
 
-        expected_files = ['123456_Nachname_Vorname_GDET3_20H.pdf',
-                          '123456_Nachname_Vorname_GDET3_20H_loes.pdf',
-                          '987654_Noch_Jemand_GDET3_20H.pdf',
-                          '987654_Noch_Jemand_GDET3_20H_loes.pdf']
+        expected_files = ['123456_F_GDET3_20H.pdf',
+                          '123456_F_GDET3_20H_loes.pdf',
+                          '123457_O_GDET3_20H.pdf',
+                          '123457_O_GDET3_20H_loes.pdf',
+                          '125412_T_GDET3_20H.pdf',
+                          '125412_T_GDET3_20H_loes.pdf']
 
         # Prepare parameter
         supp_dir = './supplements'
@@ -75,7 +78,9 @@ class MainTest(unittest.TestCase):
         expected_files = ['123456_Nachname_GDET3_20H_loes_w.pdf',
                           '123456_Nachname_GDET3_20H_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
         supp_dir = './supplements'

tests/test_watermark.py

@@ -40,7 +40,9 @@ class MainTest(unittest.TestCase):
     def test_watermark_pdfs(self):
         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
         in_dir = './pdfs'