Datefunktionen und Testschleife übernommen

Author: Pitastic

reader/Comdirect.py

@@ -42,12 +42,8 @@ def from_csv(self, filepath):
                     continue
 
                 amount = float(row['Umsatz in EUR'].replace(',', '.'))
-                date_tx = datetime.datetime.strptime(
-                            date_tx, date_format
-                        ).replace(tzinfo=datetime.timezone.utc).timestamp()
-                valuta = datetime.datetime.strptime(
-                            row['Wertstellung (Valuta)'], date_format
-                        ).replace(tzinfo=datetime.timezone.utc).timestamp()
+                date_tx = self._parse_from_strftime(date_tx, date_format)
+                valuta = self._parse_from_strftime(row['Wertstellung (Valuta)'], date_format)
 
                 text_tx = row['Buchungstext']
                 match = rx.match(text_tx)

reader/Volksbank_Mittelhessen.py

@@ -83,11 +83,7 @@ def from_pdf(self, filepath):
             flavor="stream",
             table_areas=["60,629,573,51"],
             columns=["75,112,440,526"],
-            split_text=True,
-            #layout_kwargs={ # übernommen von Commerzbank, da ähnliches Layout
-            #    "char_margin": 2,
-            #    "word_margin": 0.5,
-            #},
+            split_text=True
         )
 
         # Tabellen aller Seiten zusammenfügen
@@ -133,12 +129,8 @@ def from_pdf(self, filepath):
             amount = amount[:-2].replace('.', '').replace(',', '.')
 
             line = {
-                'date_tx': datetime.datetime.strptime(
-                    f"{row[0]}{date_tx_year}", "%d.%m.%Y"
-                ).replace(tzinfo=datetime.timezone.utc).timestamp(),
-                'valuta': datetime.datetime.strptime(
-                    f"{row[1]}{date_tx_year}", "%d.%m.%Y"
-                ).replace(tzinfo=datetime.timezone.utc).timestamp(),
+                'date_tx': self._parse_from_strftime(f"{row[0]}{date_tx_year}", "%d.%m.%Y"),
+                'valuta': self._parse_from_strftime(f"{row[1]}{date_tx_year}", "%d.%m.%Y"),
                 'art': row[2],
                 'text_tx': "",
                 'amount': float(amount),

tests/test_unit_reader_Comdirect.py

@@ -27,15 +27,27 @@ def test_read_from_csv(test_app):
         check_transaktion_list(transaction_list)
 
 
-def test_read_from_pdf(test_app):
+# Look for test files and create a tuple list
+test_folder = os.path.join('/tmp', 'comdirect')
+test_files = []
+if not os.path.isdir(test_folder):
+    test_files = [()]
+else:
+    for file in os.listdir(test_folder):
+        test_files.append(
+            (os.path.join(test_folder, file))
+        )
+
+# Using every test file in its own test
+@pytest.mark.parametrize("full_path", test_files)
+def test_read_from_pdf(test_app, full_path):
     """Testet das Einlesen einer PDF Datei mit Kontoumsätzen"""
-    test_file_pdf = os.path.join('/tmp', 'comdirect.pdf')
-    if not os.path.isfile(test_file_pdf):
-        # Test file not provided (sensitive data is not part of git repo)
-        pytest.skip("Testfile /tmp/comdirect.pdf not found....skipping")
+    if not full_path:
+        # Test files not provided (sensitive data is not part of git repo)
+        pytest.skip("Testfile not provided....skipping")
 
     with test_app.app_context():
-        transaction_list = Comdirect().from_pdf(test_file_pdf)
+        transaction_list = Comdirect().from_pdf(full_path)
 
         # Check Reader Ergebnisse
         check_transaktion_list(transaction_list)

tests/test_unit_reader_Volksbank-Mittelhessen.py

@@ -27,15 +27,27 @@ def test_read_from_csv(test_app):
         check_transaktion_list(transaction_list)
 
 
-def test_read_from_pdf(test_app):
+# Look for test files and create a tuple list
+test_folder = os.path.join('/tmp', 'volksbank-mittelhessen')
+test_files = []
+if not os.path.isdir(test_folder):
+    test_files = [()]
+else:
+    for file in os.listdir(test_folder):
+        test_files.append(
+            (os.path.join(test_folder, file))
+        )
+
+# Using every test file in its own test
+@pytest.mark.parametrize("full_path", test_files)
+def test_read_from_pdf(test_app, full_path):
     """Testet das Einlesen einer PDF Datei mit Kontoumsätzen"""
-    test_file_pdf = os.path.join('/tmp', 'volksbank-mittelhessen.pdf')
-    if not os.path.isfile(test_file_pdf):
-        # Test file not provided (sensitive data is not part of git repo)
-        pytest.skip("Testfile /tmp/volksbank-mittelhessen.pdf not found....skipping")
+    if not full_path:
+        # Test files not provided (sensitive data is not part of git repo)
+        pytest.skip("Testfile not provided....skipping")
 
     with test_app.app_context():
-        transaction_list = Volksbank_Mittelhessen().from_pdf(test_file_pdf)
+        transaction_list = Volksbank_Mittelhessen().from_pdf(full_path)
 
         # Check Reader Ergebnisse
         check_transaktion_list(transaction_list)