1 files changed, 11 insertions, 16 deletions

diff --git a/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/eIDDataVerifierTest.java b/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/eIDDataVerifierTest.java
index c2784181a..54ea882de 100644
--- a/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/eIDDataVerifierTest.java
+++ b/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/eIDDataVerifierTest.java
@@ -8,13 +8,13 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opensaml.DefaultBootstrap;
 import org.opensaml.saml2.core.Assertion;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import at.gv.egovernment.moa.id.auth.modules.sl20_auth.dummydata.DummyAuthConfig;
 import at.gv.egovernment.moa.id.auth.modules.sl20_auth.dummydata.DummyOA;
 import at.gv.egovernment.moa.id.auth.modules.sl20_auth.sl20.SL20Constants;
 import at.gv.egovernment.moa.id.auth.modules.sl20_auth.sl20.verifier.QualifiedeIDVerifier;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
-import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.api.data.IIdentityLink;
 import at.gv.egovernment.moa.id.commons.api.data.IVerifiyXMLSignatureResponse;
@@ -31,10 +31,10 @@ import iaik.security.ec.provider.ECCelerate;
 import iaik.security.provider.IAIK;
 
 public abstract class eIDDataVerifierTest {
-	 
-	protected Map<String, String> eIDData = null;
 	
+	protected Map<String, String> eIDData = null;
 
+	@Autowired DummyAuthConfig authConfig;
 	
 	@BeforeClass
 	public static void moaSPSSInitialize() throws ConfigurationException, org.opensaml.xml.ConfigurationException, IOException {
@@ -94,8 +94,7 @@ public abstract class eIDDataVerifierTest {
 			throw new Exception("IDL parsing FAILED");
 		
 		IOAAuthParameters dummyOA = new DummyOA();
-		AuthConfiguration dummyAuthConfig = new DummyAuthConfig();
-		QualifiedeIDVerifier.verifyIdentityLink(idl, dummyOA , dummyAuthConfig);
+		QualifiedeIDVerifier.verifyIdentityLink(idl, dummyOA , authConfig);
 		
 	}
 	
@@ -118,11 +117,11 @@ public abstract class eIDDataVerifierTest {
 		if (MiscUtil.isEmpty(authBlockB64))
 			throw new Exception("NO AuthBlock found");
 			
-		IOAAuthParameters dummyOA = new DummyOA();
-		DummyAuthConfig dummyAuthConfig = new DummyAuthConfig();		
-		dummyAuthConfig.setRequireAuthBlockQC(false);
-		QualifiedeIDVerifier.verifyAuthBlock(authBlockB64, dummyOA , dummyAuthConfig);
-				
+		IOAAuthParameters dummyOA = new DummyOA();		
+		authConfig.setRequireAuthBlockQC(false);
+		QualifiedeIDVerifier.verifyAuthBlock(authBlockB64, dummyOA , authConfig);
+		authConfig.setRequireAuthBlockQC(true);
+		
 	}
 	
 	@Test
@@ -136,12 +135,8 @@ public abstract class eIDDataVerifierTest {
 		
 		IIdentityLink idl = new IdentityLinkAssertionParser(new ByteArrayInputStream(Base64Utils.decode(idlB64, false))).parseIdentityLink();
 		Assertion authBlock = QualifiedeIDVerifier.parseAuthBlockToSaml2Assertion(authBlockB64);
-		AssertionAttributeExtractor authBlockExtractor = new AssertionAttributeExtractor(authBlock);
-				
-		IOAAuthParameters dummyOA = new DummyOA();
-		AuthConfiguration dummyAuthConfig = new DummyAuthConfig();
-			    				
-		IVerifiyXMLSignatureResponse authBlockVerificationResult = QualifiedeIDVerifier.verifyAuthBlock(authBlockB64, dummyOA , dummyAuthConfig);
+		AssertionAttributeExtractor authBlockExtractor = new AssertionAttributeExtractor(authBlock);				
+		IVerifiyXMLSignatureResponse authBlockVerificationResult = QualifiedeIDVerifier.verifyAuthBlock(authBlockB64,  new DummyOA() , authConfig);
 		QualifiedeIDVerifier.checkConsistencyOfeIDData(getSl20ReqId(), idl, authBlockExtractor, authBlockVerificationResult);