Fixed regex bug in script for java tests coverage calculation

diff --git a/modules/java/check-tests.py b/modules/java/check-tests.py
index cdb3edf..6fdf0c7 100644 (file)
--- a/modules/java/check-tests.py
+++ b/modules/java/check-tests.py
@@ -20,7 +20,7 @@ class JavaParser:
         self.tdict = {}\r
         self.empty_stubs_cnt = 0\r
         self.r1 = re.compile("\s*public\s+(?:static\s+)?(\w+)\(([^)]*)\)") # c-tor\r
-        self.r2 = re.compile("\s*public\s+(?:static\s+)?\w+\s+(\w+)\(([^)]*)\)")\r
+        self.r2 = re.compile("\s*(?:(?:public|static|final)\s+){1,3}\S+\s+(\w+)\(([^)]*)\)")\r
         self.r3 = re.compile('\s*fail\("Not yet implemented"\);') # empty test stub\r
 \r
 \r
@@ -77,12 +77,16 @@ class JavaParser:
                 func = m1.group(1)\r
                 args_str = m1.group(2)\r
             elif m2:\r
+                if "public" not in line:\r
+                    continue\r
                 func = m2.group(1)\r
                 args_str = m2.group(2)\r
             elif m3:\r
                 self.empty_stubs_cnt += 1\r
                 continue\r
             else:\r
+                #if "public" in line:\r
+                    #print "UNRECOGNIZED: " + line\r
                 continue\r
             d = (self.mdict, self.tdict)["test" in func]\r
             func = re.sub(r"^test", "", func)\r