add Trusted-Certificates method to AbstractCredentialProvider

add jUnit tests for AbstractCredentialProvider
change method names in AbstractCredentialProvider

1 files changed, 10 insertions, 9 deletions

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());