added example tests

benjaminjack · benjaminjack · commit 306a72dc7460 · 2017-06-08T10:55:36.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ docs/_build
 
 # Python
 *.egg-info
+__pycache__
 
 # VS Code
 .vscode
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,19 @@ cmake_minimum_required(VERSION 2.8.12)
 project(python_cpp_example)
 
 SET(SOURCE_DIR "python_cpp_example")
-SET(SOURCES "${SOURCE_DIR}/main.cpp")
+# Tell cmake that headers are in alse in source_dir
+include_directories(${SOURCE_DIR})
+SET(SOURCES "${SOURCE_DIR}/math.cpp")
 
+SET(TEST_DIR "tests")
+SET(TESTS ${SOURCES}
+    "${TEST_DIR}/test_main.cpp"
+    "${TEST_DIR}/test_math.cpp")
+
+# Generate a test executable
+include_directories(lib/catch/include)
+add_executable("${PROJECT_NAME}_test" ${TESTS})
+
+# Generate python module
 add_subdirectory(lib/pybind11)
 pybind11_add_module(python_cpp_example ${SOURCES} "${SOURCE_DIR}/bindings.cpp")
diff --git a/python_cpp_example/bindings.cpp b/python_cpp_example/bindings.cpp
@@ -1,5 +1,5 @@
 #include <pybind11/pybind11.h>
-#include "main.hpp"
+#include "math.hpp"
 
 namespace py = pybind11;
 
diff --git a/python_cpp_example/math.cpp b/python_cpp_example/math.cpp
@@ -1,4 +1,4 @@
-#include "main.hpp"
+#include "math.hpp"
 
 int add(int i, int j)
 {
diff --git a/python_cpp_example/math.hpp b/python_cpp_example/math.hpp
diff --git a/setup.py b/setup.py
@@ -1,12 +1,14 @@
 import os
 import re
 import sys
+import sysconfig
 import platform
 import subprocess
 
+from distutils.version import LooseVersion
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext
-from distutils.version import LooseVersion
+from setuptools.command.test import test as TestCommand
 
 
 class CMakeExtension(Extension):
@@ -55,6 +57,29 @@ def build_extension(self, ext):
             os.makedirs(self.build_temp)
         subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
         subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
+        print()
+
+class CatchTestCommand(TestCommand):
+    """
+    A custom test runner to execute both python unittest tests and C++ Catch-
+    lib tests.
+    """
+    def distutils_dir_name(self, dname):
+        """Returns the name of a distutils build directory"""
+        dir_name = "{dirname}.{platform}-{version[0]}.{version[1]}"
+        return dir_name.format(dirname=dname,
+                               platform=sysconfig.get_platform(),
+                               version=sys.version_info)
+
+    def run(self):
+        # Run python tests
+        super(CatchTestCommand, self).run()
+        print("\nPython tests complete, now running C++ tests...\n")
+        # Run catch tests
+        subprocess.call(['./python_cpp_example_test'],
+                        cwd=os.path.join('build',
+                                         self.distutils_dir_name('temp')))
+
 
 setup(
     name='python_cpp_example',
@@ -64,6 +89,6 @@ def build_extension(self, ext):
     description='A hybrid Python/C++ test project',
     long_description='',
     ext_modules=[CMakeExtension('python_cpp_example')],
-    cmdclass=dict(build_ext=CMakeBuild),
+    cmdclass=dict(build_ext=CMakeBuild, test=CatchTestCommand),
     zip_safe=False,
-)
+)
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/math_test.py b/tests/math_test.py
@@ -0,0 +1,13 @@
+# Test simulation
+import unittest
+import python_cpp_example
+
+class MainTest(unittest.TestCase):
+    def test_add(self):
+        self.assertEqual(python_cpp_example.add(1, 1), 2)
+
+    def test_subtract(self):
+        self.assertEqual(python_cpp_example.subtract(1, 1), 0)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include <catch.hpp>
diff --git a/tests/test_math.cpp b/tests/test_math.cpp
@@ -0,0 +1,8 @@
+#include <catch.hpp>
+
+#include "math.hpp"
+
+TEST_CASE("Addition and subtraction")
+{
+    REQUIRE(add(1, 1) == 2);
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "main.hpp"`
	`1`	`+#include "math.hpp"`
`2`	`2`
`3`	`3`	`int add(int i, int j)`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#define CATCH_CONFIG_MAIN`
	`2`	`+#include <catch.hpp>`