Enhance reporting

.github/workflows/build.yml

@@ -133,8 +133,8 @@ jobs:
               if: ${{ matrix.config.compiler_name  == 'clang' && matrix.config.libcxx  == true }}
               shell: bash
               run: |
-                echo "CXX_FLAGS=$(echo $CXX_FLAGS -stdlib=libc++)" >> $GITHUB_ENV
-                echo "LINK_FLAGS=$(echo $LINK_FLAGS -lc++abi)" >> $GITHUB_ENV
+                echo "CXXFLAGS=$(echo $CXXFLAGS -stdlib=libc++)" >> $GITHUB_ENV
+                echo "LDFLAGS=$(echo $LDFLAGS -lc++abi)" >> $GITHUB_ENV
 
             - name: Setup linux
               if: ${{ matrix.config.prefix  == 'Linux' }}
@@ -170,9 +170,8 @@ jobs:
                     -S . \
                     -B build \
                     -D CMAKE_VERBOSE_MAKEFILE=yes \
-                    -D CMAKE_CXX_FLAGS:STRING="${{ env.CXX_FLAGS }}" \
-                    -D CMAKE_EXE_LINKER_FLAGS:STRING="${{ env.LINK_FLAGS }}" \
                     -D MIMICPP_FORCED_CXX_STANDARD="${{ matrix.cxx_standard }}" \
+                    -D MIMICPP_ENABLE_ADAPTER_TESTS=YES \
                     ${{ env.CMAKE_CONFIG_EXTRA }}
 
             - name: Build
@@ -186,7 +185,13 @@ jobs:
               shell: bash
               env:
                 CTEST_OUTPUT_ON_FAILURE: 1
-              run: ctest --test-dir build/test -C ${{ matrix.build_mode }} -j4
+              run: ctest --test-dir build/test/unit-tests -C ${{ matrix.build_mode }} -j4
+
+            - name: Run adapter tests
+              shell: bash
+              env:
+                CTEST_OUTPUT_ON_FAILURE: 1
+              run: ctest --test-dir build/test/adapter-tests -C ${{ matrix.build_mode }} -j4
 
             - name: Run examples
               shell: bash

.github/workflows/coverage.yml

@@ -29,11 +29,12 @@ jobs:
             - name: Configure
               env:
                 LDFLAGS: "-fprofile-arcs"
+                CXXFLAGS: "-g -O0 --coverage -fno-inline -fprofile-abs-path -fkeep-inline-functions -fkeep-static-functions"
               run: |
                 cmake -S . \
                     -B build \
-                    -D CMAKE_CXX_FLAGS="-g -O0 --coverage -fno-inline -fprofile-abs-path -fkeep-inline-functions -fkeep-static-functions" \
-                    -D CMAKE_BUILD_TYPE="Debug"
+                    -D CMAKE_BUILD_TYPE="Debug" \
+                    -D MIMICPP_ENABLE_ADAPTER_TESTS=YES
 
             - name: Build
               run: |
@@ -42,7 +43,12 @@ jobs:
             - name: Run tests
               env:
                 CTEST_OUTPUT_ON_FAILURE: 1
-              run: ctest --test-dir build/test -C Debug -j4
+              run: ctest --test-dir build/test/unit-tests -C Debug -j4
+
+            - name: Run adapter tests
+              env:
+                CTEST_OUTPUT_ON_FAILURE: 1
+              run: ctest --test-dir build/test/adapter-tests -C Debug -j4
 
             - name: Run examples
               env:
@@ -53,9 +59,11 @@ jobs:
               run: |
                 # circumvnet "fatal: detected dubious ownership in repository" error
                 git config --global --add safe.directory /__w/mimicpp/mimicpp
-                gcovr --root build/test --filter "include/mimic++" --keep -j4 -v \
+                gcovr --root build/test/unit-tests --filter "include/mimic++" --keep -j4 -v \
                     --exclude-lines-by-pattern "\s*assert\(" \
+                    --exclude-lines-by-pattern "\s*unreachable\(\);" \
                     --exclude-unreachable-branches \
+                    --exclude-function-lines \
                     --exclude-noncode-lines \
                     --exclude-throw-branches \
                     --decisions \
@@ -68,7 +76,7 @@ jobs:
               uses: actions/upload-artifact@v4
               with:
                 name: gcov-files
-                path: "build/test/*.gcov"
+                path: "build/test/unit-tests/*.gcov"
 
             - name: Upload generated report artifacts
               uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -29,10 +29,14 @@ target_include_directories(
 )
 
 set(CMAKE_CXX_STANDARD 20)
+if (MIMICPP_FORCED_CXX_STANDARD)
+	set(CMAKE_CXX_STANDARD ${MIMICPP_FORCED_CXX_STANDARD})
+endif()
+
 target_compile_features(
 	mimicpp
 	INTERFACE
-	cxx_std_20
+	cxx_std_${CMAKE_CXX_STANDARD}
 )
 
 if (CMAKE_SOURCE_DIR STREQUAL mimicpp_SOURCE_DIR)
@@ -41,10 +45,6 @@ else()
 	set(IS_TOP_LEVEL_PROJECT OFF)
 endif()
 
-if (MIMICPP_FORCED_CXX_STANDARD)
-	set(CMAKE_CXX_STANDARD ${MIMICPP_FORCED_CXX_STANDARD})
-endif()
-
 OPTION(MIMICPP_BUILD_TESTS "Determines, whether the tests shall be built." ${IS_TOP_LEVEL_PROJECT})
 if (MIMICPP_BUILD_TESTS)
 	include(CTest)

Folder.DotSettings

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/CppInitialization/PreferUniformInitializationInNSDMIs/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/CppInitialization/UseUniformInitializationInMemberInitializers/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClangTidyHicppExceptionBaseclass/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersOrder/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersPlacement/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceDoStatementBraces/@EntryIndexedValue">WARNING</s:String>

cmake/SetupTestTarget.cmake

@@ -0,0 +1,24 @@
+#          Copyright Dominic (DNKpp) Koepke 2024 - 2024.
+# Distributed under the Boost Software License, Version 1.0.
+#    (See accompanying file LICENSE_1_0.txt or copy at
+#         https://www.boost.org/LICENSE_1_0.txt)
+
+
+function(setup_test_target TARGET_NAME)
+
+	if (SANITIZE_ADDRESS)
+
+		# workaround linker errors on msvc
+		# see: https://learn.microsoft.com/en-us/answers/questions/864574/enabling-address-sanitizer-results-in-error-lnk203
+		target_compile_definitions(
+			${TARGET_NAME}
+			PRIVATE
+			$<$<CXX_COMPILER_ID:MSVC>:_DISABLE_VECTOR_ANNOTATION>
+			$<$<CXX_COMPILER_ID:MSVC>:_DISABLE_STRING_ANNOTATION>
+		)
+
+	endif()
+
+	add_sanitizers(${TARGET_NAME})
+
+endfunction()

docs/Doxyfile.in

@@ -502,15 +502,15 @@ LOOKUP_CACHE_SIZE      = 0
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
 
-NUM_PROC_THREADS       = 1
+NUM_PROC_THREADS       = 0
 
 # If the TIMESTAMP tag is set different from NO then each generated page will
 # contain the date or date and time when the page was generated. Setting this to
 # NO can help when comparing the output of multiple runs.
 # Possible values are: YES, NO, DATETIME and DATE.
 # The default value is: NO.
 
-TIMESTAMP              = NO
+TIMESTAMP              = DATE
 
 #---------------------------------------------------------------------------
 # Build related configuration options

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-CPMAddPackage("gh:catchorg/Catch2@3.5.4")
+find_package(Catch2 REQUIRED)
 include("${Catch2_SOURCE_DIR}/extras/Catch.cmake")
 
 add_executable(
@@ -9,31 +9,8 @@ add_executable(
 	"SideEffects.cpp"
 )
 
-if (MSVC)
-
-	# When using github ci, exceptions seems to be disabled by default.
-	target_compile_options(
-		mimicpp-examples
-		PRIVATE
-		/EHsc
-	)
-
-endif()
-
-if (SANITIZE_ADDRESS)
-
-	# workaround linker errors on msvc
-	# see: https://learn.microsoft.com/en-us/answers/questions/864574/enabling-address-sanitizer-results-in-error-lnk203
-	target_compile_definitions(
-		mimicpp-examples
-		PRIVATE
-		$<$<CXX_COMPILER_ID:MSVC>:_DISABLE_VECTOR_ANNOTATION>
-		$<$<CXX_COMPILER_ID:MSVC>:_DISABLE_STRING_ANNOTATION>
-	)
-
-endif()
-
-add_sanitizers(mimicpp-tests)
+include(SetupTestTarget)
+setup_test_target(mimicpp-examples)
 
 target_link_libraries(
 	mimicpp-examples
@@ -42,10 +19,4 @@ target_link_libraries(
 	Catch2::Catch2WithMain
 )
 
-target_compile_features(
-	mimicpp
-	INTERFACE
-	cxx_std_${CMAKE_CXX_STANDARD}
-)
-
 catch_discover_tests(mimicpp-examples)

examples/Finalizers.cpp

@@ -5,8 +5,6 @@
 
 #include "mimic++/Mock.hpp"
 
-#include "../test/TestReporter.hpp"
-
 #include <catch2/catch_test_macros.hpp>
 
 #include <stdexcept>

examples/Requirements.cpp

@@ -5,8 +5,6 @@
 
 #include "mimic++/Mock.hpp"
 
-#include "../test/TestReporter.hpp"
-
 #include <catch2/catch_test_macros.hpp>
 
 TEST_CASE(
@@ -161,7 +159,9 @@ TEST_CASE(
 			return std::ranges::find(target, element) != std::ranges::end(target);
 		},
 		// specify a descriptive format message, which will be applied to std::format.
-		"range {} contains the element {}",
+		"contains element {}",
+		// specify the inverted message, which will also be applied to std::format, when inversion is used
+		"contains not element {}",
 		// capture additional data, which will be forwarded to both, the predicate and the description
 		std::tuple{42}
 	};

examples/Sequences.cpp

@@ -6,8 +6,6 @@
 #include "mimic++/Mock.hpp"
 #include "mimic++/Sequence.hpp"
 
-#include "../test/TestReporter.hpp"
-
 #include <catch2/catch_test_macros.hpp>
 
 TEST_CASE(

examples/SideEffects.cpp

@@ -5,8 +5,6 @@
 
 #include "mimic++/Mock.hpp"
 
-#include "../test/TestReporter.hpp"
-
 #include <catch2/catch_test_macros.hpp>
 
 TEST_CASE(