Adapted tests to be compileable within MOA-ID 1.4.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@772 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 18 insertions, 6 deletions

diff --git a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
index 8bf7f32ab..9bf92e54b 100644
--- a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
+++ b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
@@ -1,6 +1,7 @@
 package test.abnahme.A;
 
 import java.util.Calendar;
+import java.util.HashMap;
 
 import org.w3c.dom.Element;
 import test.abnahme.AbnahmeTestCase;
@@ -9,6 +10,7 @@ import at.gv.egovernment.moa.id.AuthenticationException;
 import at.gv.egovernment.moa.id.BuildException;
 import at.gv.egovernment.moa.id.ParseException;
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
 import at.gv.egovernment.moa.id.auth.builder.PersonDataBuilder;
 import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
@@ -187,7 +189,9 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
       String sessionID = startAuthentication();
       System.out.println(sessionID);
       String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-      server.verifyIdentityLink(sessionID, infoboxReadResponse);
+      HashMap parameters = new HashMap(1);
+      parameters.put(MOAIDAuthConstants.PARAM_XMLRESPONSE, infoboxReadResponse);
+      server.verifyIdentityLink(sessionID, parameters);
       InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
       IdentityLink idl = irrp.parseIdentityLink();
       Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
@@ -218,7 +222,9 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
       String sessionID = startAuthentication();
       System.out.println(sessionID);
       String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-      server.verifyIdentityLink(sessionID, infoboxReadResponse);
+      HashMap parameters = new HashMap(1);
+        parameters.put(MOAIDAuthConstants.PARAM_XMLRESPONSE, infoboxReadResponse);
+        server.verifyIdentityLink(sessionID, parameters);
       server.setSecondsSessionTimeOut(-100);
       server.cleanup();
       InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
@@ -277,7 +283,9 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
       String sessionID = startAuthentication();
       System.out.println(sessionID);
       String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-      server.verifyIdentityLink(sessionID, infoboxReadResponse);
+      HashMap parameters = new HashMap(1);
+        parameters.put(MOAIDAuthConstants.PARAM_XMLRESPONSE, infoboxReadResponse);
+        server.verifyIdentityLink(sessionID, parameters);
       InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
       IdentityLink idl = irrp.parseIdentityLink();
       Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
@@ -500,7 +508,9 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
   
   private AuthenticationData initServer(String sessionID) throws Exception {
     String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-    server.verifyIdentityLink(sessionID, infoboxReadResponse);
+    HashMap parameters = new HashMap(1);
+        parameters.put(MOAIDAuthConstants.PARAM_XMLRESPONSE, infoboxReadResponse);
+        server.verifyIdentityLink(sessionID, parameters);
     InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
     IdentityLink idl = irrp.parseIdentityLink();
     Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, "TrustProfile1");
@@ -517,7 +527,9 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
   
   private AuthenticationData initServerWithoutValidateAuthBlock(String sessionID) throws Exception {
     String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-    server.verifyIdentityLink(sessionID, infoboxReadResponse);
+    HashMap parameters = new HashMap(1);
+        parameters.put(MOAIDAuthConstants.PARAM_XMLRESPONSE, infoboxReadResponse);
+        server.verifyIdentityLink(sessionID, parameters);
     InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
     IdentityLink idl = irrp.parseIdentityLink();
     Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, "TrustProfile1");
@@ -583,7 +595,7 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
         oaParam.getProvideIdentityLink() ? DOMUtils.serializeNode(identityLink.getSamlAssertion()) : "";
       String authBlock = oaParam.getProvideAuthBlock() ? session.getAuthBlock() : "";
       String samlAssertion = new AuthenticationDataAssertionBuilder().build(
-        authData, prPerson, authBlock, ilAssertion, session.getBkuURL(), "", false);
+        authData, prPerson, authBlock, ilAssertion, session.getBkuURL(), "", false, null);
       authData.setSamlAssertion(samlAssertion);
       return authData;
     }