[cpp-sp] 02/02: Redo unit test solution files.

Scott Cantor cantor.2 at osu.edu
Wed Nov 6 13:40:22 UTC 2024 

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=a8c41ac314d602c0d08976a0cf2e92c5caa51d72

commit a8c41ac314d602c0d08976a0cf2e92c5caa51d72
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Nov 6 08:40:13 2024 -0500

    Redo unit test solution files.
---
 Projects/vc15/UnitTests/UnitTests.vcxproj.filters  | 74 ----------------------
 .../UnitTests.vcxproj => tests/tests.vcxproj}      | 66 ++++---------------
 Projects/vc15/tests/tests.vcxproj.filters          | 32 ++++++++++
 .../tests.vcxproj.user}                            |  0
 4 files changed, 46 insertions(+), 126 deletions(-)

diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj.filters b/Projects/vc15/UnitTests/UnitTests.vcxproj.filters
deleted file mode 100644
index 020c14ea..00000000
--- a/Projects/vc15/UnitTests/UnitTests.vcxproj.filters
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="GeneratedCode">
-      <UniqueIdentifier>{fcbe8a11-bd10-42fc-bae0-3d98a28cc043}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UnitTests">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Data">
-      <UniqueIdentifier>{c7232fb3-a33b-4038-80d4-eb48b209a285}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{cf42e119-7cf9-4ff7-a27d-a4148c214ddd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source">
-      <UniqueIdentifier>{63179b9d-7e8f-4fc1-aeed-19174ecf134b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Data\Metadata">
-      <UniqueIdentifier>{9f784e0b-e150-40c5-bc09-eb884c7b7a47}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\unittests\DynamicMetadataProviderTest.h">
-      <Filter>UnitTests</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\unittests\SPTest.h">
-      <Filter>UnitTests</Filter>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\unittests\TestApplication.cpp">
-      <Filter>Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittests\DynamicMetadataProviderTest.cpp">
-      <Filter>GeneratedCode</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittests\SPTest.cpp">
-      <Filter>GeneratedCode</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\unittests\data\templateFromRepo.xml">
-      <Filter>Data</Filter>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\fromMDQ.xml">
-      <Filter>Data</Filter>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\idp.shibboleth.net.xml">
-      <Filter>Data\Metadata</Filter>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\df5a20c921bc30c1b76c5a6cec08d074e280de8b.xml">
-      <Filter>Data\Metadata</Filter>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\chainedFromURL.xml">
-      <Filter>Data</Filter>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\localDynamic.xml">
-      <Filter>Data</Filter>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\badSigMDQ.xml">
-      <Filter>Data</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\unittests\BaseTestCase.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittests\TestApplication.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj b/Projects/vc15/tests/tests.vcxproj
similarity index 58%
rename from Projects/vc15/UnitTests/UnitTests.vcxproj
rename to Projects/vc15/tests/tests.vcxproj
index 1c9b903e..f15e4807 100644
--- a/Projects/vc15/UnitTests/UnitTests.vcxproj
+++ b/Projects/vc15/tests/tests.vcxproj
@@ -90,13 +90,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(solutionDir)\..\..\..\cpp-opensaml;$(solutionDir)\..\..\..\cpp-xmltooling;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shibsp3D.lib;log4shib2D.lib;xmltooling3D.lib;saml3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shibsp3D.lib;log4shib2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Build\VC15\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC15\$(Platform)\$(Configuration);..\..\..\..\cpp-opensaml\Build\VC15\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -105,14 +105,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(solutionDir)\..\..\..\cpp-opensaml;$(solutionDir)\..\..\..\cpp-xmltooling;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>shibsp3D.lib;log4shib2D.lib;xmltooling3D.lib;saml3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\\Build\VC15\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC15\$(Configuration);..\..\..\..\cpp-opensaml\Build\VC15\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>shibsp3D.lib;log4shib2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\\Build\VC15\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -122,15 +122,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(solutionDir)\..\..\..\cpp-opensaml;$(solutionDir)\..\..\..\cpp-xmltooling;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>shibsp3.lib;log4shib2.lib;xmltooling3.lib;saml3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\\Build\VC15\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC15\$(Configuration);..\..\..\..\cpp-opensaml\Build\VC15\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>shibsp3.lib;log4shib2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\\Build\VC15\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -140,60 +140,22 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(solutionDir)\..\..\..\cpp-opensaml;$(solutionDir)\..\..\..\cpp-xmltooling;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(solutionDir)\..\..\..\;$(solutionDir)\..\..\;$(OutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>shibsp3.lib;log4shib2.lib;xmltooling3.lib;saml3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\\Build\VC15\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC15\$(Platform)\$(Configuration);..\..\..\..\cpp-opensaml\Build\VC15\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>shibsp3.lib;log4shib2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\\Build\VC15\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\unittests\BaseTestCase.h" />
-    <ClInclude Include="..\..\..\unittests\TestApplication.h" />
-    <CustomBuild Include="..\..\..\unittests\SPTest.h">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp  "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp  "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp  "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp  "%(FullPath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\unittests\DynamicMetadataProviderTest.h">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp "%(FullPath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp "%(FullPath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp "%(FullPath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o %(RootDir)%(Directory)%(Filename).cpp "%(FullPath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\unittests\DynamicMetadataProviderTest.cpp" />
-    <ClCompile Include="..\..\..\unittests\SPTest.cpp" />
-    <ClCompile Include="..\..\..\unittests\TestApplication.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\unittests\data\badSigMDQ.xml" />
-    <Xml Include="..\..\..\unittests\data\chainedFromURL.xml">
-      <SubType>Designer</SubType>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\df5a20c921bc30c1b76c5a6cec08d074e280de8b.xml" />
-    <Xml Include="..\..\..\unittests\data\fromMDQ.xml" />
-    <Xml Include="..\..\..\unittests\data\idp.shibboleth.net.xml" />
-    <Xml Include="..\..\..\unittests\data\localDynamic.xml">
-      <SubType>Designer</SubType>
-    </Xml>
-    <Xml Include="..\..\..\unittests\data\templateFromRepo.xml" />
+    <ClCompile Include="..\..\..\tests\AgentTestSuite.cpp" />
+    <ClCompile Include="..\..\..\tests\PropertyTreeTests.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/tests/tests.vcxproj.filters b/Projects/vc15/tests/tests.vcxproj.filters
new file mode 100644
index 00000000..209839db
--- /dev/null
+++ b/Projects/vc15/tests/tests.vcxproj.filters
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="GeneratedCode">
+      <UniqueIdentifier>{fcbe8a11-bd10-42fc-bae0-3d98a28cc043}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="UnitTests">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Data">
+      <UniqueIdentifier>{c7232fb3-a33b-4038-80d4-eb48b209a285}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{cf42e119-7cf9-4ff7-a27d-a4148c214ddd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source">
+      <UniqueIdentifier>{63179b9d-7e8f-4fc1-aeed-19174ecf134b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Metadata">
+      <UniqueIdentifier>{9f784e0b-e150-40c5-bc09-eb884c7b7a47}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\AgentTestSuite.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\unittests\PropertyTreeTests.cpp">
+      <Filter>GeneratedCode</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj.user b/Projects/vc15/tests/tests.vcxproj.user
similarity index 100%
rename from Projects/vc15/UnitTests/UnitTests.vcxproj.user
rename to Projects/vc15/tests/tests.vcxproj.user

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list