Merge pull request #14 from nbehrnd/tester

extend tester's pattern to all five provided by date2name

Makefile

@@ -1,11 +1,11 @@
-# GNU Make file for the automation of pytest for appendfilename.
+# GNU Make file for the automation of pytest for appendfilename
 #
-# While the test script is written for Python 3.9.2, you might need to
-# adjust the following instruction once in case your OS includes
-# pytest for legacy Python 2 side by side to Python 3, or only hosts
-# pytest for Python 3.  The tests in script test_appendfilename.py are
-# set up to work with pytest for Python 3; dependent on your
-# installation, which may be named pytest-3, or (again) pytest.
+# While the test script is written for Python 3.9.2, it depends on
+# your installation of pytest (and in case of Linux, the authors of
+# your distribution) if pytest for Python 3 is invoked either by
+# pytest, or pytest-3.  In some distributions, pytest actually may
+# invoke pyest for legacy Python 2; the tests in test_date2name.py
+# however are incompatible to this.
 #
 # Put this file like test_appendfilename.py in the root folder of
 # appendfilename fetched from PyPi or GitHub.  Then run
@@ -17,5 +17,5 @@
 # right after the first test failing, use the -x flag to the
 # instructions on the CLI in addition to the verbosity flag to (-v).
 
-# pytest -v test_appendfilename.py # only pytest for Python 3 is present
-pytest-3 -v test_appendfilename.py   # pytest if Python 2 and Python 3 coexist
+# pytest -v test_appendfilename.py     # the pattern by pytest's manual
+pytest-3 -v test_appendfilename.py   # the alternative pattern (e.g., Debian 12)

test_appendfilename.py

@@ -4,7 +4,7 @@
 # author:  [email protected]
 # license: GPL v3, 2022.
 # date:    2022-01-05 (YYYY-MM-DD)
-# edit:    2022-01-07 (YYYY-MM-DD)
+# edit:    2022-01-09 (YYYY-MM-DD)
 #
 """Test pad for functions by appendfilename with pytest.
 
@@ -34,7 +34,9 @@
 
 @pytest.mark.default
 @pytest.mark.parametrize("arg1", ["test.txt", "2021-12-31_test.txt",
-                                  "2021-12-31T18.48.22_test.txt"])
+                                  "2021-12-31T18.48.22_test.txt",
+                                  "20211231_test.txt", "2012-12_test.txt",
+                                  "211231_test.txt"])
 @pytest.mark.parametrize("arg2", ["-t book", "-t book_shelf",
                                   "--text book", "--text book_shelf"])
 @pytest.mark.parametrize("arg3", [" ", "!", "@", "#", "$", "%", "*", "_", "+",
@@ -63,7 +65,9 @@ def test_pattern_s1(arg1, arg2, arg3):
 
 @pytest.mark.prepend
 @pytest.mark.parametrize("arg1", ["test.txt", "2021-12-31_test.txt",
-                                  "2021-12-31T18.48.22_test.txt"])
+                                  "2021-12-31T18.48.22_test.txt",
+                                  "20211231_test.txt", "2012-12_test.txt",
+                                  "211231_test.txt"])
 @pytest.mark.parametrize("arg2", ["-t book", "-t book_shelf",
                                   "--text book", "--text book_shelf"])
 @pytest.mark.parametrize("arg3", [" ", "!", "@", "#", "$", "%", "*", "_", "+",
@@ -94,7 +98,8 @@ def test_pattern_s2(arg1, arg2, arg3, arg4):
 
 @pytest.mark.smart
 @pytest.mark.parametrize("arg1", ["test.txt", "2021-12-31_test.txt",
-                                  "2021-12-31T18.48.22_test.txt"])
+                                  "2021-12-31T18.48.22_test.txt", "20211231_test.txt",
+                                  "2021-12_test.txt", "211231_test.txt"])
 @pytest.mark.parametrize("arg2", ["-t book", "-t book_shelf",
                                   "--text book", "--text book_shelf"])
 @pytest.mark.parametrize("arg3", [" " , "#", "!", "@", "#", "$", "%", "*", "_", "+",
@@ -114,33 +119,57 @@ def test_pattern_s3_02(arg1, arg2, arg3):
         newfile.write("This is a test file for test_appendfilename.")
 
     test = getoutput(f"python3 {PROGRAM} {arg1} {arg2} --separator={arg3} --smart-prepend")
-    
+
     # analysis section:
     old_filename = str(arg1)
 
-    if re.search("^\d{4}-\d{2}-\d{2}_", old_filename):
-        # if (running date2name in default mode) then .true.
-        time_stamp = old_filename[:10]
-        time_stamp_separator = old_filename[10]
-        file_extension = old_filename.split(".")[-1]
-
-        old_filename_no_timestamp = old_filename[11:]
-        stem_elements = old_filename_no_timestamp.split(".")[:-1]
-        stem = ".".join(stem_elements)
-
-        new_filename = "".join([time_stamp, arg3, text, arg3, stem, str("."), file_extension])
-        assert os.path.isfile(new_filename)
-
-        os.remove(new_filename)
-        assert os.path.isfile(new_filename) is False
-
-    elif re.search('^\d{4}-\d{2}-\d{2}T\d{2}\.\d{2}\.\d{2}_', old_filename):
-        # if (running date2name --withtime) then .true.
-        time_stamp = old_filename[:19]
-        time_stamp_separator = old_filename[19]
-        file_extension = old_filename.split(".")[-1]
+    # test pattern issued by date2name vs. other pattern
+    # default (YYYY-MM-DD)
+    # --withtime (YYYY-MM-DDTHH.MM.SS)
+    # --compact (YYYYMMDD)
+    # --month (YYYY-MM)
+    # --short (YYMMDD)
+    if (re.search("^\d{4}-[012]\d-[0-3]\d_", old_filename) or
+        re.search('^\d{4}-[012]\d-[0-3]\dT[012]\d\.[0-5]\d\.[0-5]\d_', old_filename) or
+        re.search("^\d{4}[012]\d[0-3]\d_", old_filename) or
+        re.search("^\d{4}-[012]\d_", old_filename) or
+        re.search("^\d{2}[012]\d[0-3]\d_", old_filename)):
+
+        if re.search("^\d{4}-\d{2}-\d{2}_", old_filename):
+            # if (running date2name in default mode) then .true.
+            time_stamp = old_filename[:10]
+            time_stamp_separator = old_filename[10]
+            file_extension = old_filename.split(".")[-1]
+            old_filename_no_timestamp = old_filename[11:]
+
+        elif re.search('^\d{4}-\d{2}-\d{2}T\d{2}\.\d{2}\.\d{2}_', old_filename):
+            # if (running date2name --withtime) then .true.
+            time_stamp = old_filename[:19]
+            time_stamp_separator = old_filename[19]
+            file_extension = old_filename.split(".")[-1]
+            old_filename_no_timestamp = old_filename[20:]
+
+        elif re.search("^\d{4}\d{2}\d{2}_", old_filename):
+            # if (running date2name --compact) then .true.
+            time_stamp = old_filename[:8]
+            time_stamp_separator = old_filename[8]
+            file_extension = old_filename.split(".")[-1]
+            old_filename_no_timestamp = old_filename[9:]
+
+        elif re.search("^\d{4}-\d{2}_", old_filename):
+            # if (running date2name --month) then .true.
+            time_stamp = old_filename[:7]
+            time_stamp_separator = old_filename[7]
+            file_extension = old_filename.split(".")[-1]
+            old_filename_no_timestamp = old_filename[8:]
+
+        elif re.search("^\d{4}\d{2}\d{2}_", old_filename):
+            # if (running date2name --short) then .true.
+            time_stamp = old_filename[:6]
+            time_stamp_separator = old_filename[6]
+            file_extension = old_filename.split(".")[-1]
+            old_filename_no_timestamp = old_filename[7:]
 
-        old_filename_no_timestamp = old_filename[20:]
         stem_elements = old_filename_no_timestamp.split(".")[:-1]
         stem = ".".join(stem_elements)