[shibboleth-sp2] 10/23: SSPCPP-756 Bring unit tests up to date

[Ferenc Wágner]

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

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit 394dea8085540cb32ae2efe2072fca7505177b42
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Tue Nov 28 17:31:35 2017 +0000

    SSPCPP-756 Bring unit tests up to date
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-756
    
    Supress tests which will not work until LocalDynamic test is in place.
    Add a prototype .vscproj.user file to help setting up debug
    Also add a keeper file for the Dynamic Metadata Provider cache
---
 Projects/vc15/UnitTests/UnitTests.vcxproj.user     | 27 ++++++++++++++++++++++
 unittests/DynamicMetadataProviderTest.h            | 16 ++++++-------
 unittests/SPTest.h                                 |  1 +
 unittests/TestApplication.cpp                      |  1 +
 unittests/config/var/cache/shibboleth/.gitignore   |  2 ++
 unittests/config/var/cache/shibboleth/foo/.gitkeep |  1 +
 unittests/data/fromMDQ.xml                         |  3 +--
 7 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj.user b/Projects/vc15/UnitTests/UnitTests.vcxproj.user
new file mode 100644
index 0000000..a5d7b64
--- /dev/null
+++ b/Projects/vc15/UnitTests/UnitTests.vcxproj.user
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerEnvironment>PATH=$(shibRunPath);%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerEnvironment>PATH=$(shibRunPath);%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerEnvironment>PATH=$(shibRunPath);%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerEnvironment>PATH=$(shibRunPath);%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/unittests/DynamicMetadataProviderTest.h b/unittests/DynamicMetadataProviderTest.h
index 6482149..651d461 100644
--- a/unittests/DynamicMetadataProviderTest.h
+++ b/unittests/DynamicMetadataProviderTest.h
@@ -69,7 +69,6 @@ private:
 
     void performTest(string fileName, bool artifactOnly, const string type =  DYNAMIC_METADATA_PROVIDER)
     {
-#if 0
         const string config(data_path + fileName);
         ifstream in(config.c_str());
         const XMLToolingConfig& xcf = XMLToolingConfig::getConfig();
@@ -95,7 +94,6 @@ private:
             TS_TRACE(ex.what());
             throw;
         }
-#endif
     }
 
 public:
@@ -111,23 +109,23 @@ public:
 
     void testTemplateFromFile()
     {
-        performTest("templateFromFile.xml", false); // Currently fails
+//        performTest("templateFromFile.xml", false); // Currently fails
     }
 
     void testTemplateFromFileArtifactOnly()
     {
         // The template *IGNORES* the input and joint points at /idp.shibboleth.net.xml 
-        performTest("templateFromFile.xml", true);  // Currently fails
+       // performTest("templateFromFile.xml", true);  // Currently fails
     }
 
     void testRegexFromFile()
     {
-        performTest("regexFromFile.xml", false);  // Currently fails
+        //performTest("regexFromFile.xml", false);  // Currently fails
     }
 
     void testRegexFromFileArtifactOnly()
     {
-        performTest("regexFromFile.xml", true);
+       // performTest("regexFromFile.xml", true);
     }
 
     void testChainedFromRepo()
@@ -142,12 +140,12 @@ public:
 
     void testTestFromStaticFile()
     {
-        performTest("staticFromFile.xml", false, XML_METADATA_PROVIDER);
+       // performTest("staticFromFile.xml", false, XML_METADATA_PROVIDER);
     }
 
     void testTestFromStaticFileArtefactOnly()
     {
-        performTest("staticFromFile.xml", true, XML_METADATA_PROVIDER);
+        //performTest("staticFromFile.xml", true, XML_METADATA_PROVIDER);
     }
 
 
@@ -191,7 +189,7 @@ public:
 
     void testMDQArtifactOnly ()
     {
-        mdqTest(true);
+        //mdqTest(true);
     }
 
 };
diff --git a/unittests/SPTest.h b/unittests/SPTest.h
index 9cc67cf..785f060 100644
--- a/unittests/SPTest.h
+++ b/unittests/SPTest.h
@@ -1,3 +1,4 @@
+#include <Windows.h>
 #include <fstream>
 #include "BaseTestCase.h"
 #include <shibsp/SPConfig.h>
diff --git a/unittests/TestApplication.cpp b/unittests/TestApplication.cpp
index f9fd1f5..137664d 100644
--- a/unittests/TestApplication.cpp
+++ b/unittests/TestApplication.cpp
@@ -1,4 +1,5 @@
 
+#include <Windows.h>
 #include <xmltooling\unicode.h>
 
 #include <shibsp/Application.h>
diff --git a/unittests/config/var/cache/shibboleth/.gitignore b/unittests/config/var/cache/shibboleth/.gitignore
new file mode 100644
index 0000000..cefd6bb
--- /dev/null
+++ b/unittests/config/var/cache/shibboleth/.gitignore
@@ -0,0 +1,2 @@
+foo/.gitkeep
+foo/*.xml
diff --git a/unittests/config/var/cache/shibboleth/foo/.gitkeep b/unittests/config/var/cache/shibboleth/foo/.gitkeep
new file mode 100644
index 0000000..564d4dd
--- /dev/null
+++ b/unittests/config/var/cache/shibboleth/foo/.gitkeep
@@ -0,0 +1 @@
+foo 
diff --git a/unittests/data/fromMDQ.xml b/unittests/data/fromMDQ.xml
index 9bbdc3e..46dc6e7 100644
--- a/unittests/data/fromMDQ.xml
+++ b/unittests/data/fromMDQ.xml
@@ -1,4 +1,3 @@
-<MetadataProvider type="Dynamic" ignoreTransport="true"  cacheDirectory="foo" backgroundInitialize="true">
-<Subst>http://mdq-beta.incommon.org/global/entities/$entityID</Subst>
+<MetadataProvider type="MDQ" ignoreTransport="true"  cacheDirectory="foo" backgroundInitialize="true" baseUrl="http://mdq-beta.incommon.org/global/">
     <MetadataFilter type="Signature" certificate="icpem.pem"/>
 </MetadataProvider>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git