Check test cases as well as scenarios

Author: thk123

scripts/cpplint.py

@@ -253,7 +253,7 @@
     'runtime/string',
     'runtime/threadsafe_fn',
     'runtime/vlog',
-    'runtime/catch_scenario',
+    'runtime/catch_test_tags',
     'whitespace/blank_line',
     'whitespace/braces',
     'whitespace/comma',
@@ -6150,24 +6150,23 @@ def AssembleString(clean_lines, start_lineno, start_linepos, end_lineno, end_lin
     full_string += clean_lines.elided[end_lineno][:end_linepos]
     return full_string
 
-def CheckScenarioHasTags(filename, clean_lines, linenum, error):
+def CheckCatchTestHasTags(filename, clean_lines, linenum, error):
     line = clean_lines.elided[linenum]
-    scenario = Match(r'^SCENARIO\(', line)
-    if not scenario: return
+    test = Match(r'^(SCENARIO|TEST_CASE)\(', line)
+    if not test: return
 
     closing_line, closing_linenum, closing_pos = CloseExpression(clean_lines, linenum, line.find('('))
 
     if closing_pos == -1:
         error(filename, linenum,
-            'runtime/catch_scenario', 4, "Can't find closing bracket for scenario")
+            'runtime/catch_test_tags', 4, "Can't find closing bracket for catch test")
 
     full_string = AssembleString(
         clean_lines, linenum, line.find('(') + 1, closing_linenum, closing_pos - 1)
 
     if(full_string.find(',') == -1):
         error(filename, linenum,
-            'runtime/catch_scenario', 4, "Can't find `,\' seperating scenario name and the tags: " + str(clean_lines.lines[linenum]))
-
+            'runtime/catch_test_tags', 4, "Can't find `,\' seperating test name and the tags: " + str(clean_lines.lines[linenum]))
 
 def CheckRedundantVirtual(filename, clean_lines, linenum, error):
   """Check if line contains a redundant "virtual" function-specifier.
@@ -6362,7 +6361,7 @@ def ProcessLine(filename, file_extension, clean_lines, line,
   CheckInvalidIncrement(filename, clean_lines, line, error)
   CheckMakePairUsesDeduction(filename, clean_lines, line, error)
   CheckRedundantVirtual(filename, clean_lines, line, error)
-  CheckScenarioHasTags(filename, clean_lines, line, error)
+  CheckCatchTestHasTags(filename, clean_lines, line, error)
   CheckNamespaceOrUsing(filename, clean_lines, line, error)
   CheckForEndl(filename, clean_lines, line, error)
   for check_fn in extra_check_functions: