[shibboleth-sp2] 80/82: SPCPP-756 Use a chain to make a static repo look like an MDQ

[Etienne Dysli Metref]

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

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

commit 54c5d4008b37c16a08fce0987130a4e7ce2ed306
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Mon Oct 23 10:48:09 2017 +0100

    SPCPP-756 Use a chain to make a static repo look like an MDQ
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-756
    
    This is all playing right now and these tests may well go away when I
    have my mind around this.
---
 Projects/vc15/UnitTests/UnitTests.vcxproj         |  3 +++
 Projects/vc15/UnitTests/UnitTests.vcxproj.filters |  3 +++
 unittests/DynamicMetadataProviderTest.h           | 10 +++++++++-
 unittests/data/chainedFromURL.xml                 | 10 ++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj b/Projects/vc15/UnitTests/UnitTests.vcxproj
index 9158b44..bb28c0b 100644
--- a/Projects/vc15/UnitTests/UnitTests.vcxproj
+++ b/Projects/vc15/UnitTests/UnitTests.vcxproj
@@ -178,6 +178,9 @@
     <ClCompile Include="..\..\..\unittests\TestApplication.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <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" />
diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj.filters b/Projects/vc15/UnitTests/UnitTests.vcxproj.filters
index d8c09ee..809ef9b 100644
--- a/Projects/vc15/UnitTests/UnitTests.vcxproj.filters
+++ b/Projects/vc15/UnitTests/UnitTests.vcxproj.filters
@@ -62,6 +62,9 @@
     <Xml Include="..\..\..\unittests\data\df5a20c921bc30c1b76c5a6cec08d074e280de8b.xml">
       <Filter>Data\Metadata</Filter>
     </Xml>
+    <Xml Include="..\..\..\unittests\data\chainedFromURL.xml">
+      <Filter>Data</Filter>
+    </Xml>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\unittests\BaseTestCase.h">
diff --git a/unittests/DynamicMetadataProviderTest.h b/unittests/DynamicMetadataProviderTest.h
index 42bba8c..9a642da 100644
--- a/unittests/DynamicMetadataProviderTest.h
+++ b/unittests/DynamicMetadataProviderTest.h
@@ -120,7 +120,6 @@ public:
         performTest("templateFromFile.xml", true);
     }
 
-
     void testRegexFromFile()
     {
         performTest("regexFromFile.xml", false);
@@ -131,6 +130,15 @@ public:
         performTest("regexFromFile.xml", true);
     }
 
+    void testChainedFromRepo()
+    {
+        performTest("chainedFromURL.xml", false, CHAINING_METADATA_PROVIDER);
+    }
+
+    void testChainedFromRepoArtifactOnly()
+    {
+        performTest("chainedFromURL.xml", true, CHAINING_METADATA_PROVIDER);
+    }
 
     void testTestFromStaticFile()
     {
diff --git a/unittests/data/chainedFromURL.xml b/unittests/data/chainedFromURL.xml
new file mode 100644
index 0000000..41c4adc
--- /dev/null
+++ b/unittests/data/chainedFromURL.xml
@@ -0,0 +1,10 @@
+<MetadataProvider type="Chaining">
+    <MetadataProvider type="Dynamic" ignoreTransport="true" >
+        <Subst hashed="SHA1">http://git.shibboleth.net/view/?p=cpp-sp.git&a=blob_plain&f=unittests/data/$entityID.xml&hb=master</Subst>
+    </MetadataProvider>
+
+    <MetadataProvider type="Dynamic" ignoreTransport="true" >
+        <Regex match="^\{sha1\}(.*)$">http://git.shibboleth.net/view/?p=cpp-sp.git&a=blob_plain&f=unittests/data/$1.xml&hb=master</Regex>
+    </MetadataProvider>
+</MetadataProvider>
+

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