AppVoyer Script & testing cmake function name update & Work on testing helper module

wissem01chiha · wissem01chiha · commit 39e6e989c925 · 2026-06-13T14:57:13.000+01:00
diff --git a/CMake/Module.cmake b/CMake/Module.cmake
@@ -78,7 +78,6 @@ function (vcov_module_add_dependencies module)
             target_include_directories(${module} PUBLIC ${dep_includes})
         endif()
     endforeach()
-
     if(_vcov_private_deps)
         target_link_libraries(${module} PRIVATE ${_vcov_private_deps})
     endif()
@@ -88,28 +87,28 @@ function (vcov_module_add_dependencies module)
 endfunction()
 
 #[==[.rst:
-.. cmake:command:: vcov_add_test
+.. cmake:command:: vcov_module_add_test
 
   .. code-block:: cmake
 
-    vcov_add_test(<name>)
+    vcov_module_add_test(<name>)
 #]==]
-function (vcov_add_test module)
+function (vcov_module_add_test module)
     enable_testing()
     add_subdirectory(Testing)
 endfunction()
 
 #[==[.rst:
-.. cmake:command:: vcov_add_test_sources
+.. cmake:command:: vcov_module_add_test_sources
 
   .. code-block:: cmake
 
-    vcov_add_test_sources(<name>
+    vcov_module_add_test_sources(<name>
         SOURCES [<source>...] 
         DEPENDENCIES [<name>...] 
     )
 #]==]
-function (vcov_add_test_sources module)
+function (vcov_module_add_test_sources module)
     cmake_parse_arguments(PARSE_ARGV 1 _vcov "" "" "SOURCES;DEPENDENCIES")
     if(NOT _vcov_SOURCES)
         message(FATAL_ERROR "No test sources provided for module ${module}")
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
@@ -32,4 +32,4 @@ set(headers
     CommonExport.h
 )
 vcov_module_add_module(Common CLASSES ${classes} HEADERS ${headers})
-vcov_add_test(Common)
+vcov_module_add_test(Common)
diff --git a/Common/Testing/CMakeLists.txt b/Common/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-# vcov_add_test_sources(Common
+# vcov_module_add_test_sources(Common
 # 	SOURCES
 # 		stdafx.cpp
 # 		ToolTest.cpp
diff --git a/Console/CMakeLists.txt b/Console/CMakeLists.txt
@@ -22,7 +22,7 @@ vcov_module_add_dependencies(Console
         Binary
         Html
 )
-vcov_add_test(Console)
+vcov_module_add_test(Console)
 
 add_executable(vcov  main.cpp)
 target_link_libraries(vcov PRIVATE Console 
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
@@ -33,4 +33,4 @@ vcov_module_add_dependencies(Core
     DEPENDENCIES    
         Common
 )
-vcov_add_test(Core)
+vcov_module_add_test(Core)
diff --git a/Coverage/CMakeLists.txt b/Coverage/CMakeLists.txt
@@ -32,4 +32,4 @@ vcov_module_add_dependencies(Coverage
         Export
         Option
 )
-vcov_add_test(Coverage)
+vcov_module_add_test(Coverage)
diff --git a/Coverage/CoverageDataComparer.cpp b/Coverage/CoverageDataComparer.cpp
@@ -15,13 +15,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
-
 #include "CoverageDataComparer.hpp"
 #include "Plugins/Exporter/CoverageData.hpp"
 #include "Plugin/Exporter/ModuleCoverage.hpp"
 #include "Plugin/Exporter/FileCoverage.hpp"
 #include "Plugin/Exporter/LineCoverage.hpp"
-
 #include "Container.hpp"
 
 namespace TestHelper
diff --git a/Coverage/CoverageDataComparer.hpp b/Coverage/CoverageDataComparer.hpp
@@ -16,18 +16,19 @@
 
 #pragma once
 
-#include "TestHelperExport.hpp"
+#include "TestingExport.hpp"
 #include <memory>
+#include <vector>
 
 namespace Plugin
 {
 	class CoverageData;
 	class ModuleCoverage;
 }
 
-namespace TestHelper
+namespace Testing
 {
-	class TEST_HELPER_DLL CoverageDataComparer
+	class VCOV_TESTINGEXPORT_DLL CoverageDataComparer
 	{
 	public:
 		CoverageDataComparer() = default;
diff --git a/Export/CMakeLists.txt b/Export/CMakeLists.txt
@@ -19,4 +19,4 @@ set(headers
     stdafx.h
 )
 vcov_module_add_module(Export CLASSES ${classes} HEADERS ${headers})
-vcov_add_test(Export)
+vcov_module_add_test(Export)
diff --git a/Export/Testing/CMakeLists.txt b/Export/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-# vcov_add_test_sources(Export 
+# vcov_module_add_test_sources(Export 
 #     SOURCES
 #         BinaryExporterTest.cpp
 # )
diff --git a/Filter/CMakeLists.txt b/Filter/CMakeLists.txt
@@ -48,4 +48,4 @@ vcov_module_add_dependencies(Filter
         Core 
         Option
 )
-vcov_add_test(Filter)
+vcov_module_add_test(Filter)
diff --git a/Filter/Testing/CMakeLists.txt b/Filter/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-# vcov_add_test_sources(Filter 
+# vcov_module_add_test_sources(Filter 
 #     SOURCES
 #         FileFilterTest.cpp
 # )
diff --git a/Option/CMakeLists.txt b/Option/CMakeLists.txt
@@ -25,4 +25,4 @@ vcov_module_add_dependencies(Option
         Core
         Export
 )
-vcov_add_test(Option)
+vcov_module_add_test(Option)
diff --git a/Platform/CMakeLists.txt b/Platform/CMakeLists.txt
@@ -13,4 +13,4 @@ vcov_module_add_dependencies(Platform
         Common
         Core
 )
-vcov_add_test(Platform)
+vcov_module_add_test(Platform)
diff --git a/Plugin/Binary/CMakeLists.txt b/Plugin/Binary/CMakeLists.txt
@@ -26,4 +26,4 @@ target_link_libraries(Binary PUBLIC
     protobuf::libprotobuf 
     protobuf::libprotobuf-lite
 )
-vcov_add_test(Binary)
+vcov_module_add_test(Binary)
diff --git a/Plugin/Cobertura/CMakeLists.txt b/Plugin/Cobertura/CMakeLists.txt
@@ -15,4 +15,4 @@ vcov_module_add_dependencies(Cobertura
         Plugin
         Coverage
 )
-vcov_add_test(Cobertura)
+vcov_module_add_test(Cobertura)
diff --git a/Plugin/Core/CMakeLists.txt b/Plugin/Core/CMakeLists.txt
@@ -21,4 +21,4 @@ vcov_module_add_dependencies(Plugin
         Common
         Option
 )
-vcov_add_test(Plugin)
+vcov_module_add_test(Plugin)
diff --git a/Plugin/Html/CMakeLists.txt b/Plugin/Html/CMakeLists.txt
@@ -26,4 +26,4 @@ vcov_module_add_dependencies(Html
 )
 target_include_directories(Html PUBLIC ${CTemplate_INCLUDE_DIRS})
 target_link_libraries(Html PUBLIC ${CTemplate_LIBRARIES})
-vcov_add_test(Html)
+vcov_module_add_test(Html)
diff --git a/Testing/README.md b/Testing/README.md
diff --git a/Utilities/Testing/AutoClose.hpp b/Utilities/Testing/AutoClose.hpp
@@ -16,11 +16,13 @@
 
 #pragma once
 
-namespace TestHelper
+#include "TestingExport.hpp"
+
+namespace Testing
 {
 	//-------------------------------------------------------------------------
 	template <typename Value, typename CloseAction>
-	class AutoClose
+	class VCOV_TESTINGEXPORT_DLL AutoClose
 	{
 	public:
 		//---------------------------------------------------------------------
diff --git a/Utilities/Testing/Container.hpp b/Utilities/Testing/Container.hpp
@@ -16,7 +16,10 @@
 
 #pragma once
 
-namespace TestHelper
+#include "TestingExport.hpp"
+#include <functional>
+
+namespace Testing
 {
 	template<typename Container, typename CompareFct>
 	void AssertContainerEqual(
diff --git a/Utilities/Testing/Container.inl b/Utilities/Testing/Container.inl
@@ -16,7 +16,9 @@
 
 #pragma once
 
-namespace TestHelper
+#include <functional>
+
+namespace Testing
 {
 	//---------------------------------------------------------------------
 	template<typename Container, typename CompareFct>
diff --git a/Utilities/Testing/TemporaryPath.cpp b/Utilities/Testing/TemporaryPath.cpp
@@ -14,18 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "TemporaryPath.hpp"
 #include "stdafx.h"
 #include <system_error>
 #include <random>
 
-#include "TemporaryPath.hpp"
-#include "Tools/Log.hpp"
-#include "Tools.hpp"
-#include "Tools/Tool.hpp"
-
 namespace fs = std::filesystem;
 
-namespace TestHelper
+namespace Testing
 {
 	//-------------------------------------------------------------------------	
 	TemporaryPath::TemporaryPath(TemporaryPathOption temporaryPathOption)
diff --git a/Utilities/Testing/TemporaryPath.hpp b/Utilities/Testing/TemporaryPath.hpp
@@ -17,22 +17,14 @@
 #pragma once
 
 #include <filesystem>
+#include "TestingExport.hpp"
+#include "TemporaryPathOption.hpp"
 
-#include "TestHelperExport.hpp"
-
-namespace TestHelper
+namespace Testing
 {
-	enum class TemporaryPathOption
-	{
-		DoNotCreate,
-		CreateAsFile,
-		CreateAsFolder
-	};
-
-	class TEST_HELPER_DLL TemporaryPath
+	class VCOV_TESTINGEXPORT_DLL TemporaryPath
 	{
 	public:
-		 
 		explicit TemporaryPath(TemporaryPathOption = TemporaryPathOption::DoNotCreate);
 		~TemporaryPath();
 
diff --git a/Utilities/Testing/TemporaryPathOption.hpp b/Utilities/Testing/TemporaryPathOption.hpp
@@ -0,0 +1,29 @@
+// OpenCppCoverage is an open source code coverage for C++.
+// Copyright (C) 2014 OpenCppCoverage
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#include "TestingExport.hpp"
+
+namespace Testing
+{
+	enum class VCOV_TESTINGEXPORT_DLL TemporaryPathOption
+	{
+		DoNotCreate,
+		CreateAsFile,
+		CreateAsFolder
+	};
+};
diff --git a/Utilities/Testing/TestingExport.hpp b/Utilities/Testing/TestingExport.hpp
@@ -16,10 +16,12 @@
 
 #pragma once
 
-#ifdef TEST_HELPER_EXPORTS
-#define TEST_HELPER_DLL __declspec(dllexport)
+#include "VcovExport.h"
+
+#ifdef VCOV_TESTINGEXPORT
+#define VCOV_TESTINGEXPORT_DLL __declspec(dllexport)
 #else
-#define TEST_HELPER_DLL __declspec(dllimport)
+#define VCOV_TESTINGEXPORT_DLL __declspec(dllimport)
 #endif
 
 #pragma warning (disable: 4251)
diff --git a/Utilities/Testing/Tools.cpp b/Utilities/Testing/Tools.cpp
@@ -18,12 +18,9 @@
 
 #include "stdafx.h"
 #include "Tools.hpp"
-#include "Tools/Tool.hpp"
-
 #include <fstream>
 #include <filesystem>
 #include <boost/algorithm/string.hpp>
-
 #include <Poco/Process.h>
 #include <Poco/Pipe.h>
 #include <Poco/PipeStream.h>
@@ -35,7 +32,7 @@ void TestUnloadDll()
 {
 }
 
-namespace TestHelper
+namespace Testing
 {
 	//-------------------------------------------------------------------------
 	fs::path GetTestUnloadDllFilename()
diff --git a/Utilities/Testing/Tools.hpp b/Utilities/Testing/Tools.hpp
@@ -17,25 +17,26 @@
 #pragma once
 
 #include <filesystem>
-#include "TestHelperExport.hpp"
+#include "TestingExport.hpp"
+#include <functional>
 
 extern "C"
 {
-	void TEST_HELPER_DLL TestUnloadDll();
+	void VCOV_TESTINGEXPORT_DLL TestUnloadDll();
 }
 
-namespace TestHelper
+namespace Testing
 {
-	std::filesystem::path TEST_HELPER_DLL  GetTestUnloadDllFilename();
-	std::filesystem::path TEST_HELPER_DLL  GetOutputBinaryPath();
+	std::filesystem::path VCOV_TESTINGEXPORT_DLL  GetTestUnloadDllFilename();
+	std::filesystem::path VCOV_TESTINGEXPORT_DLL  GetOutputBinaryPath();
 
-	void TEST_HELPER_DLL CreateEmptyFile(const std::filesystem::path&);
+	void VCOV_TESTINGEXPORT_DLL CreateEmptyFile(const std::filesystem::path&);
 
-	std::string TEST_HELPER_DLL RunProcess(
+	std::string VCOV_TESTINGEXPORT_DLL RunProcess(
 		const std::filesystem::path& program,
 		const std::vector<std::string>& args);
 
-	std::filesystem::path TEST_HELPER_DLL GetVisualStudioPath();
+	std::filesystem::path VCOV_TESTINGEXPORT_DLL GetVisualStudioPath();
 
 	//-------------------------------------------------------------------------
 	template <typename ExceptionType, typename Fct>
diff --git a/appveyor.yml b/appveyor.yml

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ set(headers`
`32`	`32`	`CommonExport.h`
`33`	`33`	`)`
`34`	`34`	`vcov_module_add_module(Common CLASSES ${classes} HEADERS ${headers})`
`35`		`-vcov_add_test(Common)`
	`35`	`+vcov_module_add_test(Common)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# vcov_add_test_sources(Common`
	`1`	`+# vcov_module_add_test_sources(Common`
`2`	`2`	`# SOURCES`
`3`	`3`	`# stdafx.cpp`
`4`	`4`	`# ToolTest.cpp`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ vcov_module_add_dependencies(Console`
`22`	`22`	`Binary`
`23`	`23`	`Html`
`24`	`24`	`)`
`25`		`-vcov_add_test(Console)`
	`25`	`+vcov_module_add_test(Console)`
`26`	`26`
`27`	`27`	`add_executable(vcov main.cpp)`
`28`	`28`	`target_link_libraries(vcov PRIVATE Console`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,4 @@ vcov_module_add_dependencies(Core`
`33`	`33`	`DEPENDENCIES`
`34`	`34`	`Common`
`35`	`35`	`)`
`36`		`-vcov_add_test(Core)`
	`36`	`+vcov_module_add_test(Core)`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ vcov_module_add_dependencies(Coverage`
`32`	`32`	`Export`
`33`	`33`	`Option`
`34`	`34`	`)`
`35`		`-vcov_add_test(Coverage)`
	`35`	`+vcov_module_add_test(Coverage)`
Original file line number	Diff line number	Diff line change
`@@ -16,18 +16,19 @@`
`16`	`16`
`17`	`17`	`#pragma once`
`18`	`18`
`19`		`-#include "TestHelperExport.hpp"`
	`19`	`+#include "TestingExport.hpp"`
`20`	`20`	`#include <memory>`
	`21`	`+#include <vector>`
`21`	`22`
`22`	`23`	`namespace Plugin`
`23`	`24`	`{`
`24`	`25`	`class CoverageData;`
`25`	`26`	`class ModuleCoverage;`
`26`	`27`	`}`
`27`	`28`
`28`		`-namespace TestHelper`
	`29`	`+namespace Testing`
`29`	`30`	`{`
`30`		`- class TEST_HELPER_DLL CoverageDataComparer`
	`31`	`+ class VCOV_TESTINGEXPORT_DLL CoverageDataComparer`
`31`	`32`	`{`
`32`	`33`	`public:`
`33`	`34`	`CoverageDataComparer() = default;`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ set(headers`
`19`	`19`	`stdafx.h`
`20`	`20`	`)`
`21`	`21`	`vcov_module_add_module(Export CLASSES ${classes} HEADERS ${headers})`
`22`		`-vcov_add_test(Export)`
	`22`	`+vcov_module_add_test(Export)`