Fix catching the object by value.

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.16)
 set (PROJECT_NAME "TestCPP")
 set (PROJECT_GROUP_NAME "cpptesting")
 
-project (${PROJECT_NAME} VERSION 0.2.1 LANGUAGES CXX)
+project (${PROJECT_NAME} VERSION 1.0.0 LANGUAGES CXX)
 
 set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)

TestFramework.project

@@ -3,12 +3,22 @@
   <Description/>
   <Dependencies/>
   <VirtualDirectory Name="src">
-    <File Name="src/TestCPP.cpp"/>
     <File Name="src/TestCPPUtil.cpp"/>
+    <File Name="src/TestCPPAssertions.cpp"/>
+    <File Name="src/TestCPPExceptions.cpp"/>
+    <File Name="src/TestCPPTestCase.cpp"/>
+    <File Name="src/TestCPPTestSuite.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
-    <File Name="include/TestCPPUtil.h"/>
     <File Name="include/TestCPP.h"/>
+    <VirtualDirectory Name="internal">
+      <File Name="include/internal/TestCPPAssertions.h"/>
+      <File Name="include/internal/TestCPPUtil.h"/>
+      <File Name="include/internal/TestCPPTestSuite.h"/>
+      <File Name="include/internal/TestCPPTestCase.h"/>
+      <File Name="include/internal/TestCPPExceptions.h"/>
+      <File Name="include/internal/TestCPPCommon.h"/>
+    </VirtualDirectory>
   </VirtualDirectory>
   <VirtualDirectory Name="git">
     <File Name=".gitignore"/>
@@ -48,6 +58,10 @@
       <VirtualDirectory Name="TestSuite">
         <File Name="test/src/TestSuite/TestSuiteTests.cpp"/>
       </VirtualDirectory>
+      <VirtualDirectory Name="Assertions">
+        <File Name="test/src/Assertions/AssertionsTests.cpp"/>
+      </VirtualDirectory>
+      <File Name="test/src/TestCPPAssertionsMain.cpp"/>
     </VirtualDirectory>
     <VirtualDirectory Name="include">
       <VirtualDirectory Name="TestCase">
@@ -59,6 +73,10 @@
         <File Name="test/include/TestSuite/TestSuiteSuite.h"/>
         <File Name="test/include/TestSuite/TestSuiteTests.h"/>
       </VirtualDirectory>
+      <VirtualDirectory Name="Assertions">
+        <File Name="test/include/Assertions/AssertionsSuite.h"/>
+        <File Name="test/include/Assertions/AssertionsTests.h"/>
+      </VirtualDirectory>
     </VirtualDirectory>
   </VirtualDirectory>
   <VirtualDirectory Name="github">

cmake/BuildTypeHandling.cmake

@@ -80,21 +80,31 @@ endif ()
 list (
     APPEND
     GCC_CLANG_RELEASE_BUILD_OPTS
-    -O3                   # Optimize the Release build
-    -Wall                 # Enable most warnings
-    -Wextra               # Enable even more warnings
-    -Wpedantic            # Enable most of the rest of the warnings
-    -Werror               # Treat all warnings as errors
-    -Wno-unused-parameter # Unused parameters occur in the Release
-                          #  build in debugLog
+    -O3                        # Optimize the Release build
+    -Wall                      # Enable most warnings
+    -Wextra                    # Enable even more warnings
+    -Wpedantic                 # Enable most of the rest of the warnings
+    -Werror                    # Treat all warnings as errors
+    -Wno-unused-parameter      # Unused parameters occur in the Release
+                               #  build in debugLog
+    -Wno-unused-lambda-capture # Avoid MSVC error C3493 - There is
+                               #  implementation divergence here and
+                               #  since we're not using >=C++14 there
+                               #  is no workaround other than to ignore
+                               #  this warning (the MSVC issue is an
+                               #  error). A workaround for >=C++14 is to
+                               #  use an explicit capture - if ever I
+                               #  change the library to use >=C++14 I
+                               #  can remove this and use an explicit
+                               #  capture.
 )
 list (
     APPEND
     GCC_CLANG_DEBUG_BUILD_OPTS
     -g  # Enable all debugging information
     -Og # Ensure the compiler doesn't use optimizations that would harm
         #  debuggability of the resulting code
-    -Wall -Wextra -Wpedantic -Werror
+    -Wall -Wextra -Wpedantic -Werror -Wno-unused-lambda-capture
 )
 list (
     APPEND
@@ -135,6 +145,12 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
                 PUBLIC
                 ${MSVC_RELEASE_BUILD_OPTS}
             )
+
+            target_compile_options (
+                ${PROJECT_NAME}_Assertions_test
+                PUBLIC
+                ${MSVC_RELEASE_BUILD_OPTS}
+            )
         endif ()
 
     else ()
@@ -164,6 +180,12 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
                 PUBLIC
                 ${GCC_CLANG_RELEASE_BUILD_OPTS}
             )
+
+            target_compile_options (
+                ${PROJECT_NAME}_Assertions_test
+                PUBLIC
+                ${GCC_CLANG_RELEASE_BUILD_OPTS}
+            )
         endif ()
     endif ()
 
@@ -195,6 +217,11 @@ else ()
             PUBLIC
             DEBUG_LOG
         )
+        target_compile_definitions (
+            ${PROJECT_NAME}_Assertions_test
+            PUBLIC
+            DEBUG_LOG
+        )
     endif ()
 
     if (MSVC)
@@ -224,6 +251,12 @@ else ()
                 PUBLIC
                 ${MSVC_DEBUG_BUILD_OPTS}
             )
+
+            target_compile_options (
+                ${PROJECT_NAME}_Assertions_test
+                PUBLIC
+                ${MSVC_DEBUG_BUILD_OPTS}
+            )
         endif ()
 
     else ()
@@ -256,6 +289,12 @@ else ()
                 ${COVERAGE_BUILD_OPTS}
             )
 
+            target_compile_options (
+                ${PROJECT_NAME}_Assertions_test
+                PUBLIC
+                ${COVERAGE_BUILD_OPTS}
+            )
+
         else ()
             target_compile_options (
                 ${PROJECT_NAME}

cmake/Includes.cmake

@@ -32,4 +32,10 @@ if (BUILD_TESTING)
         test/include
         include
     )
+
+    target_include_directories (
+        ${PROJECT_NAME}_Assertions_test PRIVATE
+        test/include
+        include
+    )
 endif ()

cmake/Installing.cmake

@@ -1,15 +1,40 @@
+list (
+    APPEND
+    TESTCPP_PUBLIC_HEADERS
+    include/TestCPP.h
+)
+
+list (
+    APPEND
+    TESTCPP_PRIVATE_HEADERS
+    include/internal/TestCPPAssertions.h
+    include/internal/TestCPPCommon.h
+    include/internal/TestCPPExceptions.h
+    include/internal/TestCPPTestCase.h
+    include/internal/TestCPPTestSuite.h
+    include/internal/TestCPPUtil.h
+)
+
 set_target_properties (
     ${PROJECT_NAME}
     PROPERTIES
         PUBLIC_HEADER
-        include/TestCPP.h
+        "${TESTCPP_PUBLIC_HEADERS}"
+)
+set_target_properties (
+    ${PROJECT_NAME}
+    PROPERTIES
+        PRIVATE_HEADER
+        "${TESTCPP_PRIVATE_HEADERS}"
 )
 include (GNUInstallDirs)
 install (
     TARGETS ${PROJECT_NAME}
     EXPORT ${PROJECT_NAME}Targets
     PUBLIC_HEADER
       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+    PRIVATE_HEADER
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/internal
 )
 export (
     EXPORT ${PROJECT_NAME}Targets

cmake/Linking.cmake

@@ -46,6 +46,13 @@ if (BUILD_TESTING)
                 ole32
                 dbgeng
             )
+            target_link_libraries (
+                ${PROJECT_NAME}_Assertions_test
+                ${PROJECT_NAME}
+                gcov
+                ole32
+                dbgeng
+            )
 
         elseif (${TESTCPP_STACKTRACE_ENABLED})
             target_link_libraries (
@@ -60,6 +67,12 @@ if (BUILD_TESTING)
                 gcov
                 dl
             )
+            target_link_libraries (
+                ${PROJECT_NAME}_Assertions_test
+                ${PROJECT_NAME}
+                gcov
+                dl
+            )
 
         else ()
             target_link_libraries (
@@ -72,6 +85,11 @@ if (BUILD_TESTING)
                 ${PROJECT_NAME}
                 gcov
             )
+            target_link_libraries (
+                ${PROJECT_NAME}_Assertions_test
+                ${PROJECT_NAME}
+                gcov
+            )
         endif ()
 
     else ()
@@ -88,6 +106,12 @@ if (BUILD_TESTING)
                 ole32
                 dbgeng
             )
+            target_link_libraries (
+                ${PROJECT_NAME}_Assertions_test
+                ${PROJECT_NAME}
+                ole32
+                dbgeng
+            )
 
         elseif (${TESTCPP_STACKTRACE_ENABLED})
             target_link_libraries (
@@ -100,6 +124,11 @@ if (BUILD_TESTING)
                 ${PROJECT_NAME}
                 dl
             )
+            target_link_libraries (
+                ${PROJECT_NAME}_Assertions_test
+                ${PROJECT_NAME}
+                dl
+            )
 
         else ()
             target_link_libraries (
@@ -110,6 +139,10 @@ if (BUILD_TESTING)
                 ${PROJECT_NAME}_TestSuite_test
                 ${PROJECT_NAME}
             )
+            target_link_libraries (
+                ${PROJECT_NAME}_Assertions_test
+                ${PROJECT_NAME}
+            )
         endif ()
     endif ()
 endif ()

cmake/Targets.cmake

@@ -1,7 +1,10 @@
 add_library (
     ${PROJECT_NAME}
+    src/TestCPPAssertions.cpp
+    src/TestCPPExceptions.cpp
+    src/TestCPPTestCase.cpp
+    src/TestCPPTestSuite.cpp
     src/TestCPPUtil.cpp
-    src/TestCPP.cpp
 )
 add_library (
     ${PROJECT_GROUP_NAME}::${PROJECT_NAME}
@@ -30,4 +33,10 @@ if (BUILD_TESTING)
         test/src/TestSuite/TestSuiteTests.cpp
         test/src/TestCPPTestSuiteMain.cpp
     )
+
+    add_executable (
+        ${PROJECT_NAME}_Assertions_test
+        test/src/Assertions/AssertionsTests.cpp
+        test/src/TestCPPAssertionsMain.cpp
+    )
 endif ()

cmake/Testing.cmake

@@ -8,4 +8,9 @@ if (BUILD_TESTING)
         NAME ${PROJECT_NAME}TestSuiteTests
         COMMAND ${PROJECT_NAME}_TestSuite_test
     )
+
+    add_test (
+        NAME ${PROJECT_NAME}AssertionsTests
+        COMMAND ${PROJECT_NAME}_Assertions_test
+    )
 endif ()

demo/src/main.cpp

@@ -1,5 +1,4 @@
 #include "TestCPP.h"
-#include "TestCPPUtil.h"
 
 using TestCPP::TestSuite;
 using std::string;
@@ -12,7 +11,7 @@ int main(void)
 {
     try {
         TestSuite suite(
-            string("Demo Test Suite"),
+            "Demo Test Suite",
 
             make_tuple(
                 "simpleTest",

demo/src/tests.cpp

@@ -6,13 +6,16 @@ namespace TestCPP {
             void simpleTest () {
                 int lower = 5;
                 int higher = 9;
-                TestSuite::assertTrue(higher > lower, "Something is seriously wrong.");
+                Assertions::assertTrue(
+                    higher > lower,
+                    "Something is seriously wrong."
+                );
             }
 
             void otherSimpleTest () {
                 string s1 = string("A string");
                 string s2 = string("another string");
-                TestSuite::assertNotEquals(s1, s2);
+                Assertions::assertNotEquals(s1, s2);
             }
         }
     }