Move unit tests into their own directory.

Unit tests in this case are all those not depending on data, but just testing lower-level functions of the library.
summershrimp · Feb 28, 2018 · f07ae35 · f07ae35
1 parent 6342541
commit f07ae35
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,8 +66,8 @@ if(CLANG_TIDY)
         ${CLANG_TIDY}
         -p ${CMAKE_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/test/*.cpp
-        ${CMAKE_SOURCE_DIR}/test/t/*/reader_test_cases.cpp
-        ${CMAKE_SOURCE_DIR}/test/t/*/writer_test_cases.cpp
+        ${CMAKE_SOURCE_DIR}/test/t/*/*.cpp
+        ${CMAKE_SOURCE_DIR}/test/unit/*.cpp
         ${CMAKE_SOURCE_DIR}/tools/*.cpp
     )
     add_dependencies(clang-tidy writer_tests)
@@ -94,6 +94,7 @@ if(CPPCHECK)
         ${CMAKE_SOURCE_DIR}/test/*.cpp
         ${CMAKE_SOURCE_DIR}/test/include/*.hpp
         ${CMAKE_SOURCE_DIR}/test/t/*/*.cpp
+        ${CMAKE_SOURCE_DIR}/test/unit/*.cpp
         ${CMAKE_SOURCE_DIR}/tools/*.cpp
     )
 else()

diff --git a/README.md b/README.md
@@ -80,8 +80,8 @@ Extensive tests are included. Build them using CMake:
 
 Call `ctest` to run the tests.
 
-The reader tests are always build, the writer tests are only build if the
-Google Protobuf library is found when running CMake.
+The unit and reader tests are always build, the writer tests are only build if
+the Google Protobuf library is found when running CMake.
 
 See `test/README.md` for more details about the test.
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -9,16 +9,14 @@
 include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/catch")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 
+add_subdirectory(unit)
+
 set(TEST_DIRS alignment
-              basic
               bool
               bytes
               complex
-              data_view
               double
-              endian
               enum
-              exceptions
               fixed32
               fixed64
               float
@@ -52,10 +50,8 @@ set(TEST_DIRS alignment
               tags
               uint32
               uint64
-              varint
               vector_tile
-              wrong_type_access
-              zigzag)
+              wrong_type_access)
 
 string(REGEX REPLACE "([^;]+)" "t/\\1/reader_test_cases.cpp" _test_sources "${TEST_DIRS}")
 

diff --git a/test/README.md b/test/README.md
@@ -3,8 +3,16 @@
 
 Tests are using the [Catch Unit Test Framework](https://github.com/philsquared/Catch).
 
+## Organization of the unit tests
 
-## Organization of the test cases
+Unit tests test low-level functions of the library. They are in the `unit`
+directory.
+
+
+## Organization of the reader/writer test cases
+
+The hart of the tests are the reader/writer tests checking all aspects of
+decoding and encoding protobuf files.
 
 Each test case is in its own directory under the `t` directory. Each directory
 contains (some of) the following files:

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -0,0 +1,23 @@
+#-----------------------------------------------------------------------------
+#
+#  CMake config
+#
+#  protozero unit tests
+#
+#-----------------------------------------------------------------------------
+
+set(UNIT_TESTS data_view
+               basic
+               endian
+               exceptions
+               varint
+               zigzag)
+
+string(REGEX REPLACE "([^;]+)" "test_\\1.cpp" _test_sources "${UNIT_TESTS}")
+
+add_executable(unit_tests main.cpp ${_test_sources})
+
+add_test(NAME unit_tests COMMAND unit_tests)
+
+
+#-----------------------------------------------------------------------------
diff --git a/test/unit/main.cpp b/test/unit/main.cpp
@@ -0,0 +1,4 @@
+
+#define CATCH_CONFIG_MAIN
+#include <test.hpp> // IWYU pragma: keep
+
diff --git a/test/t/basic/reader_test_cases.cpp → test/unit/test_basic.cpp b/test/t/basic/reader_test_cases.cpp → test/unit/test_basic.cpp
diff --git a/test/t/data_view/reader_test_cases.cpp → test/unit/test_data_view.cpp b/test/t/data_view/reader_test_cases.cpp → test/unit/test_data_view.cpp
diff --git a/test/t/endian/reader_test_cases.cpp → test/unit/test_endian.cpp b/test/t/endian/reader_test_cases.cpp → test/unit/test_endian.cpp
diff --git a/test/t/exceptions/reader_test_cases.cpp → test/unit/test_exceptions.cpp b/test/t/exceptions/reader_test_cases.cpp → test/unit/test_exceptions.cpp
diff --git a/test/t/varint/reader_test_cases.cpp → test/unit/test_varint.cpp b/test/t/varint/reader_test_cases.cpp → test/unit/test_varint.cpp
diff --git a/test/t/zigzag/reader_test_cases.cpp → test/unit/test_zigzag.cpp b/test/t/zigzag/reader_test_cases.cpp → test/unit/test_zigzag.cpp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		#define CATCH_CONFIG_MAIN
		#include <test.hpp> // IWYU pragma: keep