add Trusted-Certificates method to AbstractCredentialProvider

add jUnit tests for AbstractCredentialProvider
change method names in AbstractCredentialProvider

3 files changed, 25 insertions, 22 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java
index 87073e81..76dba510 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java
@@ -65,7 +65,8 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"/spring/test_eaaf_pvp.beans.xml"})
+@ContextConfiguration({"/spring/test_eaaf_pvp.beans.xml",
+    "/spring/test_eaaf_core_spring_config.beans.xml"})
 @TestPropertySource(locations = {"/config/config_1.props"})
 public class PostBindingTest {
 
@@ -246,7 +247,7 @@ public class PostBindingTest {
     final String serviceUrl = "http://testservice.org";
 
     final String b64AuthnReq = generateSaml2AuthnRequest(
-        credentialProvider.getIdpMetaDataSigningCredential());
+        credentialProvider.getMetaDataSigningCredential());
     httpReq.setMethod("POST");
     httpReq.addParameter("SAMLRequest", b64AuthnReq);
 
@@ -289,7 +290,7 @@ public class PostBindingTest {
     final String relayState = RandomStringUtils.randomAlphanumeric(10);
 
     final String b64AuthnReq = generateSaml2AuthnRequest(
-        credentialProvider.getIdpMetaDataSigningCredential());
+        credentialProvider.getMetaDataSigningCredential());
     httpReq.setMethod("POST");
     httpReq.addParameter("SAMLRequest", b64AuthnReq);
     httpReq.addParameter("RelayState", relayState);
@@ -319,7 +320,7 @@ public class PostBindingTest {
     final String serviceUrl = "http://testservice.org";
 
     final String b64AuthnReq = generateSaml2AuthnRequest(
-        credentialProvider.getIdpAssertionSigningCredential());
+        credentialProvider.getMessageSigningCredential());
     httpReq.setMethod("POST");
     httpReq.addParameter("SAMLRequest", b64AuthnReq);
 
@@ -353,7 +354,7 @@ public class PostBindingTest {
 
     final URIComparator comparator = new EaafUriCompare(serviceUrl);
 
-    final String b64AuthnReq = generateSaml2Response(credentialProvider.getIdpMetaDataSigningCredential());
+    final String b64AuthnReq = generateSaml2Response(credentialProvider.getMetaDataSigningCredential());
     httpReq.setMethod("POST");
     httpReq.addParameter("SAMLRequest", b64AuthnReq);
 
@@ -382,7 +383,7 @@ public class PostBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/AuthRequest_without_sig_1.xml"));
 
     bindingImpl.encodeRequest(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
     //validate
     Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
@@ -416,7 +417,7 @@ public class PostBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/AuthRequest_without_sig_1.xml"));
 
     bindingImpl.encodeRequest(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpAssertionSigningCredential(), pendingReq);
+        credentialProvider.getMessageSigningCredential(), pendingReq);
 
     //validate
     Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
@@ -451,7 +452,7 @@ public class PostBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/AuthRequest_without_sig_1.xml"));
 
     bindingImpl.encodeRequest(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
 
     //validate
@@ -489,7 +490,7 @@ public class PostBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/Response_without_sig_1.xml"));
 
     bindingImpl.encodeResponse(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
 
     //validate
@@ -527,7 +528,7 @@ public class PostBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/Response_without_sig_1.xml"));
 
     bindingImpl.encodeResponse(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
 
     //validate
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/RedirectBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/RedirectBindingTest.java
index 23cc98a6..f85e5c2a 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/RedirectBindingTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/RedirectBindingTest.java
@@ -58,7 +58,8 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({ "/spring/test_eaaf_pvp.beans.xml" })
+@ContextConfiguration({ "/spring/test_eaaf_pvp.beans.xml",
+    "/spring/test_eaaf_core_spring_config.beans.xml" })
 @TestPropertySource(locations = { "/config/config_1.props" })
 public class RedirectBindingTest {
 
@@ -336,7 +337,7 @@ public class RedirectBindingTest {
 
     httpReq.setMethod("GET");
     httpReq.setRequestURI("http://testservice.org");
-    httpReq.setQueryString(generateAuthnRequest(credentialProvider.getIdpMetaDataSigningCredential()));
+    httpReq.setQueryString(generateAuthnRequest(credentialProvider.getMetaDataSigningCredential()));
 
     httpReq.setParameter(HTTP_FORM_SAMLREQ, URLDecoder.decode(URISupport.getRawQueryStringParameter(
         httpReq.getQueryString(), HTTP_FORM_SAMLREQ).substring(HTTP_FORM_SAMLREQ_PARAM.length()), "UTF-8"));
@@ -406,7 +407,7 @@ public class RedirectBindingTest {
 
     httpReq.setMethod("GET");
     httpReq.setRequestURI("http://testservice.org");
-    httpReq.setQueryString(generateResponse(credentialProvider.getIdpMetaDataSigningCredential()));
+    httpReq.setQueryString(generateResponse(credentialProvider.getMetaDataSigningCredential()));
 
     httpReq.setParameter(HTTP_FORM_SAMLRESP, URLDecoder.decode(URISupport.getRawQueryStringParameter(
         httpReq.getQueryString(), HTTP_FORM_SAMLRESP).substring(HTTP_FORM_SAMLRESP_PARM.length()), "UTF-8"));
@@ -459,7 +460,7 @@ public class RedirectBindingTest {
     httpReq.setMethod("GET");
     httpReq.setRequestURI("http://testservice.org");
     httpReq.setParameter(HTTP_FORM_RELAYSTATE, relayState);
-    httpReq.setQueryString(generateResponse(credentialProvider.getIdpMetaDataSigningCredential()));
+    httpReq.setQueryString(generateResponse(credentialProvider.getMetaDataSigningCredential()));
 
     httpReq.setParameter(HTTP_FORM_SAMLRESP, URLDecoder.decode(URISupport.getRawQueryStringParameter(
         httpReq.getQueryString(), HTTP_FORM_SAMLRESP).substring(HTTP_FORM_SAMLRESP_PARM.length()), "UTF-8"));
@@ -500,7 +501,7 @@ public class RedirectBindingTest {
         RedirectBindingTest.class.getResourceAsStream("/data/AuthRequest_without_sig_1.xml"));
 
     bindingImpl.encodeRequest(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
     // validate
     Assert.assertEquals("http StatusCode", 302, httpResp.getStatus());
@@ -548,7 +549,7 @@ public class RedirectBindingTest {
         RedirectBindingTest.class.getResourceAsStream("/data/AuthRequest_without_sig_1.xml"));
 
     bindingImpl.encodeRequest(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpAssertionSigningCredential(), pendingReq);
+        credentialProvider.getMessageSigningCredential(), pendingReq);
 
     // validate
     // validate
@@ -598,7 +599,7 @@ public class RedirectBindingTest {
         RedirectBindingTest.class.getResourceAsStream("/data/AuthRequest_without_sig_1.xml"));
 
     bindingImpl.encodeRequest(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
     // validate
     Assert.assertEquals("http StatusCode", 302, httpResp.getStatus());
@@ -649,7 +650,7 @@ public class RedirectBindingTest {
         RedirectBindingTest.class.getResourceAsStream("/data/Response_without_sig_1.xml"));
 
     bindingImpl.encodeResponse(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
     // validate
     Assert.assertEquals("http StatusCode", 302, httpResp.getStatus());
@@ -700,7 +701,7 @@ public class RedirectBindingTest {
         RedirectBindingTest.class.getResourceAsStream("/data/Response_without_sig_1.xml"));
 
     bindingImpl.encodeResponse(httpReq, httpResp, authnReq, serviceUrl, relayState,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
     // validate
     Assert.assertEquals("http StatusCode", 302, httpResp.getStatus());
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
index 1125d30e..b43f6a3e 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
@@ -44,7 +44,8 @@ import net.shibboleth.utilities.java.support.xml.SerializeSupport;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"/spring/test_eaaf_pvp.beans.xml"})
+@ContextConfiguration({"/spring/test_eaaf_pvp.beans.xml",
+    "/spring/test_eaaf_core_spring_config.beans.xml"})
 @TestPropertySource(locations = {"/config/config_1.props"})
 public class SoapBindingTest {
 
@@ -162,7 +163,7 @@ public class SoapBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/AuthRequest_with_sig_1.xml"));
     payload.setIssueInstant(DateTime.now());
     final RequestAbstractType signedPayload = Saml2Utils.signSamlObject(
-        payload, credentialProvider.getIdpMetaDataSigningCredential(), true);
+        payload, credentialProvider.getMetaDataSigningCredential(), true);
 
     final Envelope enveloped = Saml2Utils.buildSoap11Envelope(signedPayload);
     final Marshaller marshaller = Constraint.isNotNull(
@@ -197,7 +198,7 @@ public class SoapBindingTest {
         PostBindingTest.class.getResourceAsStream("/data/Response_without_sig_1.xml"));
 
     bindingImpl.encodeResponse(httpReq, httpResp, response, serviceUrl, null,
-        credentialProvider.getIdpMetaDataSigningCredential(), pendingReq);
+        credentialProvider.getMetaDataSigningCredential(), pendingReq);
 
     Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
     Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());