fix merge problem in EidasResponseUtils.java

refactor broken jUnit test InitialSearchTaskFirstTest.java to new configuration-loader

2 files changed, 70 insertions, 73 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
index bb0545f7..1ca4cdb6 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
@@ -103,53 +103,58 @@ public class EidasResponseUtils {
    */
   // TODO: check possible problem with nonLatinCharacters
   public static List<String> translateStringListAttribute(AttributeDefinition<?> attributeDefinition,
-      ImmutableSet<? extends AttributeValue<?>> attributeValues) {
+      @Nullable ImmutableSet<? extends AttributeValue<?>> attributeValues) {
     final List<String> stringListAttribute = new ArrayList<>();
-
-    final AttributeValueMarshaller<?> attributeValueMarshaller = attributeDefinition
-        .getAttributeValueMarshaller();
-    for (final AttributeValue<?> attributeValue : attributeValues) {
-      String valueString = null;
-      try {
-        valueString = attributeValueMarshaller.marshal((AttributeValue) attributeValue);
-
-        log.trace("Find attr: {} with value: {} nonLatinFlag: {} needTransliteration: {}",
-            attributeDefinition.getFriendlyName(), attributeValue.toString(),
-            attributeValue.isNonLatinScriptAlternateVersion(),
-            AttributeValueTransliterator.needsTransliteration(valueString));
-
-        // if (attributeValue.isNonLatinScriptAlternateVersion()) {
-        if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
-          stringListAttribute.add(0, valueString);
-
-        } else {
-          log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
-          stringListAttribute.add(valueString);
-
+    if (attributeValues == null) {
+      log.info("Can not extract infos from 'null' attribute value");
+      
+    } else {    
+      final AttributeValueMarshaller<?> attributeValueMarshaller = 
+          attributeDefinition.getAttributeValueMarshaller();
+      for (final AttributeValue<?> attributeValue : attributeValues) {
+        String valueString = null;
+        try {
+          valueString = attributeValueMarshaller.marshal((AttributeValue) attributeValue);
+  
           log.trace("Find attr: {} with value: {} nonLatinFlag: {} needTransliteration: {}",
               attributeDefinition.getFriendlyName(), attributeValue.toString(),
               attributeValue.isNonLatinScriptAlternateVersion(),
               AttributeValueTransliterator.needsTransliteration(valueString));
-
+  
           // if (attributeValue.isNonLatinScriptAlternateVersion()) {
           if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
             stringListAttribute.add(0, valueString);
-
+  
           } else {
             log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
             stringListAttribute.add(valueString);
-
+  
+            log.trace("Find attr: {} with value: {} nonLatinFlag: {} needTransliteration: {}",
+                attributeDefinition.getFriendlyName(), attributeValue.toString(),
+                attributeValue.isNonLatinScriptAlternateVersion(),
+                AttributeValueTransliterator.needsTransliteration(valueString));
+  
+            // if (attributeValue.isNonLatinScriptAlternateVersion()) {
+            if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
+              stringListAttribute.add(0, valueString);
+  
+            } else {
+              log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
+              stringListAttribute.add(valueString);
+  
+            }
           }
+        } catch (final AttributeValueMarshallingException e) {
+          throw new IllegalStateException(e);
+  
         }
-      } catch (final AttributeValueMarshallingException e) {
-        throw new IllegalStateException(e);
-
-      }
+        
+      }  
+      log.trace("Extract values: {} for attr: {}",
+          StringUtils.join(stringListAttribute, ","), attributeDefinition.getFriendlyName());
+      
     }
-
-    log.trace("Extract values: {} for attr: {}",
-        StringUtils.join(stringListAttribute, ","), attributeDefinition.getFriendlyName());
-
+    
     return stringListAttribute;
 
   }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
index 9f58ba71..f1bc98d6 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
@@ -23,6 +23,34 @@
 
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.tasks;
 
+import static org.junit.Assert.assertThrows;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Random;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.RegisterResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.ernp.IErnpClient;
@@ -42,37 +70,12 @@ import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
 import eu.eidas.auth.commons.attribute.PersonType;
 import eu.eidas.auth.commons.protocol.impl.AuthenticationResponse;
 import lombok.val;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.xml.namespace.QName;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Random;
-
-import static org.junit.Assert.assertThrows;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("/SpringTest-context_tasks_test.xml")
+@ContextConfiguration(locations = {
+    "/SpringTest-context_tasks_test.xml",
+    "/SpringTest-context_basic_mapConfig.xml"
+})
 @DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
 public class InitialSearchTaskFirstTest {
 
@@ -96,17 +99,6 @@ public class InitialSearchTaskFirstTest {
   private final String randomBirthName = RandomStringUtils.randomAlphabetic(10);
   private final String randomDate = "2011-01-" + (10 + new Random().nextInt(18));
 
-  /**
-   * jUnit class initializer.
-   *
-   * @throws IOException In case of an error
-   */
-  @BeforeClass
-  public static void classInitializer() throws IOException {
-    final String current = new java.io.File(".").toURI().toString();
-    System.setProperty("eidas.ms.configuration", current
-        + "src/test/resources/config/junit_config_1.properties");
-  }
 
   /**
    * jUnit test set-up.