fix for EvaluateCountrySelectionTaskTest and GenerateCountrySelectionFrameTaskTest

5 files changed, 16 insertions, 19 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java
index e3e482ef..c9cbdb84 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java
@@ -15,7 +15,7 @@
  * This product combines work with different licenses. See the "NOTICE" text file for details on the
  * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
  * works that you distribute must include a readable copy of the "NOTICE" text file.
-*/
+ */
 
 package at.asitplus.eidas.specific.connector.attributes;
 
@@ -28,16 +28,14 @@ import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
 import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
 import at.gv.egiz.eaaf.core.impl.idp.builder.attributes.PvpMetadata;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 
 @PvpMetadata
 public class AuthBlockAttributeBuilder implements IPvpAttributeBuilder {
 
-//  private static final String AUTHBLOCK_FRIENDLY_NAME = "AUTHBLOCK";
-//  private static final String AUTHBLOCK_NAME = "urn:oid:x.x.x.x"; //TODO set oid
-String EID_AUTHBLOCK_SIGNED_NAME = "urn:eidgvat:attributes.authblock.signed";
-String EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME = "userAuthBlock";
+  //  private static final String AUTHBLOCK_FRIENDLY_NAME = "AUTHBLOCK";
+  //  private static final String AUTHBLOCK_NAME = "urn:oid:x.x.x.x"; //TODO set oid
+  private static final String EID_AUTHBLOCK_SIGNED_NAME = "urn:eidgvat:attributes.authblock.signed";
+  private static final String EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME = "userAuthBlock";
 
   @Override
   public String getName() {
@@ -46,7 +44,7 @@ String EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME = "userAuthBlock";
 
   @Override
   public <ATT> ATT build(final ISpConfiguration oaParam, final IAuthData authData,
-      final IAttributeGenerator<ATT> g) throws AttributeBuilderException {
+                         final IAttributeGenerator<ATT> g) throws AttributeBuilderException {
 
     String authBlock = authData.getGenericData(Constants.SZR_AUTHBLOCK, String.class);
     if (authBlock != null) {
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java
index e43689a1..53f52ab3 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java
@@ -15,7 +15,7 @@
  * This product combines work with different licenses. See the "NOTICE" text file for details on the
  * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
  * works that you distribute must include a readable copy of the "NOTICE" text file.
-*/
+ */
 
 package at.asitplus.eidas.specific.connector.attributes;
 
@@ -28,8 +28,6 @@ import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
 import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
 import at.gv.egiz.eaaf.core.impl.idp.builder.attributes.PvpMetadata;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 
 import static at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions.EID_EIDBIND_FRIENDLY_NAME;
 import static at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions.EID_EIDBIND_NAME;
@@ -37,8 +35,8 @@ import static at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions.EID_
 @PvpMetadata
 public class EidasBindAttributeBuilder implements IPvpAttributeBuilder {
 
-//  private static final String EIDASBIND_FRIENDLY_NAME = "EIDASBIND";
-//  private static final String EIDASBIND_NAME = "urn:oid:x.x.x.x"; //TODO set oid
+  //  private static final String EIDASBIND_FRIENDLY_NAME = "EIDASBIND";
+  //  private static final String EIDASBIND_NAME = "urn:oid:x.x.x.x"; //TODO set oid
 
   @Override
   public String getName() {
@@ -47,7 +45,7 @@ public class EidasBindAttributeBuilder implements IPvpAttributeBuilder {
 
   @Override
   public <ATT> ATT build(final ISpConfiguration oaParam, final IAuthData authData,
-      final IAttributeGenerator<ATT> g) throws AttributeBuilderException {
+                         final IAttributeGenerator<ATT> g) throws AttributeBuilderException {
 
     String eidasBind = authData.getGenericData(Constants.EIDAS_BIND, String.class);
     if (eidasBind != null) {
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index 51b89120..42163097 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -57,7 +57,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
     AuthenticationData authData = new AuthenticationData();
 
     String eidMode = pendingReq.getServiceProviderConfiguration()
-        .getConfigurationValue(MsEidasNodeConstants.PROP_CONFIG_SP_EID_MODE, "old");
+                               .getConfigurationValue(MsEidasNodeConstants.PROP_CONFIG_SP_EID_MODE, "old");
 
     if (eidMode.equals("new")) {
 
@@ -69,7 +69,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 
         // set specific informations
         authData.setSsoSessionValidTo(new Date(new Date().getTime()
-            + MsEidasNodeConstants.DEFAULT_PVP_ASSERTION_VALIDITY * 60 * 1000));
+                                                   + MsEidasNodeConstants.DEFAULT_PVP_ASSERTION_VALIDITY * 60 * 1000));
 
       } catch (EaafBuilderException | EaafParserException | EaafConfigurationException
           | XPathException | DOMException e) {
@@ -110,7 +110,8 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 
   @Override
   protected Pair<String, String> getEncryptedBpkFromPvpAttribute(IAuthProcessDataContainer arg0,
-                                                                 AuthenticationData arg1, ISpConfiguration arg2) throws EaafBuilderException {
+                                                                 AuthenticationData arg1,
+                                                                 ISpConfiguration arg2) throws EaafBuilderException {
     return null;
 
   }
diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/EvaluateCountrySelectionTaskTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/EvaluateCountrySelectionTaskTest.java
index 44b54366..9d590055 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/EvaluateCountrySelectionTaskTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/EvaluateCountrySelectionTaskTest.java
@@ -51,7 +51,7 @@ public class EvaluateCountrySelectionTaskTest {
   @BeforeClass
   public static void classInitializer() {
     final String current = new java.io.File(".").toURI().toString();
-    System.setProperty("eidas.ms.configuration", current + "../basicConfig/default_config.properties");
+    System.setProperty("eidas.ms.configuration", current + "src/test/resources/config/junit_config_1.properties");
     
   }
   
diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java
index 61d68774..2a1d7cd4 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java
@@ -49,7 +49,7 @@ public class GenerateCountrySelectionFrameTaskTest {
   @BeforeClass
   public static void classInitializer() {
     final String current = new java.io.File(".").toURI().toString();
-    System.setProperty("eidas.ms.configuration", current + "../basicConfig/default_config.properties");
+    System.setProperty("eidas.ms.configuration", current + "src/test/resources/config/junit_config_1.properties");
     
   }