Add a couple more tests to check for uppercase variable names and alter regex to improve reporting of varriable name causing error.

Author: r-sharp

script_umdp3_checker/tests/test_fortran_checks.py

@@ -180,7 +180,17 @@ def test_write_using_default_format(lines, expected_result):
         1,
         "Uppercase variable name with leading whitespace",
     ),
-]
+    (
+        ["REAL :: var1", "REAL :: VAR2", "REAL :: Var3"],
+        1,
+        "Mixed case variable names",
+    ),
+    (
+        ["REAL :: var1, DAVE_2, HiPPo", "REAL :: var2", "REAL :: var3"],
+        1,
+        "2nd variable all uppercase",
+    ),
+ ]
 
 
 @pytest.mark.parametrize(

script_umdp3_checker/umdp3_checker_rules.py

@@ -338,7 +338,7 @@ def lowercase_variable_names(self, lines: List[str]) -> TestResult:
                     "",
                     clean_line,
                 )
-                if match := re.search(r"([A-Z]{2,})", clean_line):
+                if match := re.search(r"([A-Z]{2,}\w*)", clean_line):
                     self.add_extra_error(f"UPPERCASE variable name : {match[1]}")
                     failures += 1
                     error_log = self.add_error_log(