Only transform functions with test_ at start to test cases

lukasmartinelli · Jan 27, 2015 · c210224 · c210224
1 parent 72ad628
commit c210224
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/py14/transpiler.py b/py14/transpiler.py
@@ -29,7 +29,7 @@ def transpile(source, headers=False, testing=False):
         buf += transpiler.usings
 
     if testing or headers:
-        buf.append('') #Force empty line
+        buf.append('')  # Force empty line
 
     cpp = transpiler.visit(tree)
     return "\n".join(buf) + cpp
@@ -83,7 +83,9 @@ def visit_FunctionDef(self, node):
         body = "\n".join([self.visit(n) for n in node.body])
         self._function_stack.pop()
 
-        if self.use_catch_test_cases and is_void_function(node):
+        if (self.use_catch_test_cases and
+            is_void_function(node) and
+            node.name.startswith("test")):
             return generate_catch_test_case(node, body)
         elif is_void_function(node) or is_recursive(node):
             return generate_template_fun(node, body)

diff --git a/transpile_regtests.py b/transpile_regtests.py
@@ -32,7 +32,7 @@ def transpile_tests(tests_dir):
         main.write("#define CATCH_CONFIG_MAIN\n")
         main.write('#include "catch.hpp"\n')
         for hpp_file in hpp_files:
-            main.write('#include "{0}"'.format(hpp_file))
+            main.write('#include "{0}"\n'.format(hpp_file))
 
 
 if __name__ == "__main__":