Refactor tasks for MobilePhoneSignature login

3 files changed, 175 insertions, 217 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummyOA.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummyOA.java
index cf879562..2f7782ae 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummyOA.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummyOA.java
@@ -1,21 +1,15 @@
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
 import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.core.impl.idp.auth.builder.BpkBuilder;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
-
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
 
-public class DummyOA implements IAhSpConfiguration{
+public class DummyOA implements IAhSpConfiguration {
 
   private static final long serialVersionUID = 1L;
   private String uniqueAppId = null;
@@ -74,7 +68,7 @@ public class DummyOA implements IAhSpConfiguration{
   @Override
   public boolean isConfigurationValue(final String key) {
     if (StringUtils.isNotEmpty(getConfigurationValue(key))) {
-      return Boolean.valueOf(getConfigurationValue(key));
+      return Boolean.parseBoolean(getConfigurationValue(key));
     } else {
       return false;
     }
@@ -258,7 +252,7 @@ public class DummyOA implements IAhSpConfiguration{
 
   @Override
   public boolean isRestrictedServiceProvider() {
-    return this.restricted ;
+    return this.restricted;
   }
 
 
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateMobilePhoneSignatureRequestTaskTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateMobilePhoneSignatureRequestTaskTest.java
index 4fb05a35..8e5ecfe1 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateMobilePhoneSignatureRequestTaskTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateMobilePhoneSignatureRequestTaskTest.java
@@ -1,31 +1,5 @@
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.tasks;
 
-import static org.junit.Assert.assertThrows;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Base64;
-import java.util.Map;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.core.xml.util.XMLObjectSupport;
-import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml2.core.AuthnRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-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.connector.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthConstants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.provider.IdAustriaClientAuthMetadataProvider;
@@ -48,6 +22,34 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xIniti
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.TrustEngineFactory;
 import at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
+import org.opensaml.core.xml.util.XMLObjectSupport;
+import org.opensaml.saml.common.xml.SAMLConstants;
+import org.opensaml.saml.saml2.core.AuthnRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+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 java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Base64;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.util.Assert.isInstanceOf;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
@@ -140,13 +142,10 @@ public class GenerateMobilePhoneSignatureRequestTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("module.eidasauth.00",
-        ((EaafConfigurationException) e.getOriginalException()).getErrorId());
-    
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(EaafConfigurationException.class, e.getOriginalException());
+    assertEquals("module.eidasauth.00", ((EaafConfigurationException) e.getOriginalException()).getErrorId());
   }
 
   @Test
@@ -156,14 +155,12 @@ public class GenerateMobilePhoneSignatureRequestTaskTest {
 
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("module.eidasauth.idaustria.02",
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(EaafConfigurationException.class, e.getOriginalException());
+    assertEquals("module.eidasauth.idaustria.02",
         ((EaafConfigurationException) e.getOriginalException()).getErrorId());
-
   }
 
   @Test
@@ -175,14 +172,12 @@ public class GenerateMobilePhoneSignatureRequestTaskTest {
 
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(CredentialsNotAvailableException.class,
-        e.getOriginalException());
-    Assert.assertEquals("internal.pvp.01",
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(CredentialsNotAvailableException.class, e.getOriginalException());
+    assertEquals("internal.pvp.01",
         ((CredentialsNotAvailableException) e.getOriginalException()).getErrorId());
-
   }
 
   @Test
@@ -198,33 +193,33 @@ public class GenerateMobilePhoneSignatureRequestTaskTest {
   }
 
   private void validate() throws Exception {
-    Assert.assertEquals("HTTP Statuscode", 200, httpResp.getStatus());
-    Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
-    Assert.assertEquals("ContentEncoding", "UTF-8", httpResp.getCharacterEncoding());
+    assertEquals("HTTP Statuscode", 200, httpResp.getStatus());
+    assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
+    assertEquals("ContentEncoding", "UTF-8", httpResp.getCharacterEncoding());
 
     final String html = httpResp.getContentAsString();
-    Assert.assertNotNull("XML Metadata", html);
+    assertNotNull("XML Metadata", html);
 
     final int startIndex = html.indexOf("SAMLRequest=");
-    Assert.assertTrue("No SAMLRequest in html", startIndex >= 0);
+    assertTrue("No SAMLRequest in html", startIndex >= 0);
     final String authnXml = html.substring(startIndex + "SAMLRequest=".length());
 
     // check if relaystate was stored
     final int startIndexRelayState = html.indexOf("RelayState=");
-    Assert.assertTrue("wrong RelayState in HTML",
+    assertTrue("wrong RelayState in HTML",
         startIndexRelayState >= 0);
     final String relayState = html.substring(startIndexRelayState + "RelayState=".length(), startIndex);
     final String storedPendingReqId = transactionStorage.get(relayState, String.class);
-    Assert.assertEquals("relayStore not map to pendingRequestId",
+    assertEquals("relayStore not map to pendingRequestId",
         pendingReq.getPendingRequestId(), storedPendingReqId);
 
     final AuthnRequest authnRequest = (AuthnRequest) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(), new ByteArrayInputStream(
             Base64.getDecoder().decode(authnXml)));
 
-    Assert.assertNotNull("AuthnReq", authnRequest);
-    Assert.assertNotNull("Issuer", authnRequest.getIssuer());
-    Assert.assertEquals("EntityId",
+    assertNotNull("AuthnReq", authnRequest);
+    assertNotNull("Issuer", authnRequest.getIssuer());
+    assertEquals("EntityId",
         "https://localhost/authhandler" + IdAustriaClientAuthConstants.ENDPOINT_METADATA,
         authnRequest.getIssuer().getValue());
 
@@ -240,12 +235,11 @@ public class GenerateMobilePhoneSignatureRequestTaskTest {
         metadataFactory.createMetadataProvider(METADATA_SP_PATH, null, "jUnit SP", null));
     samlVerifyEngine.verify(msg, TrustEngineFactory.getSignatureKnownKeysTrustEngine(metadataProvider));
 
-    Assert.assertNotNull("RequestedAuthnContext", authnRequest.getRequestedAuthnContext());
-    Assert.assertNotNull("AuthnContextClassRef",
-        authnRequest.getRequestedAuthnContext().getAuthnContextClassRefs());
-    Assert.assertEquals("#AuthnContextClassRef", 1,
+    assertNotNull("RequestedAuthnContext", authnRequest.getRequestedAuthnContext());
+    assertNotNull("AuthnContextClassRef", authnRequest.getRequestedAuthnContext().getAuthnContextClassRefs());
+    assertEquals("#AuthnContextClassRef", 1,
         authnRequest.getRequestedAuthnContext().getAuthnContextClassRefs().size());
-    Assert.assertEquals("LoA", "http://eidas.europa.eu/LoA/high",
+    assertEquals("LoA", "http://eidas.europa.eu/LoA/high",
         authnRequest.getRequestedAuthnContext().getAuthnContextClassRefs().get(0).getAuthnContextClassRef());
 
   }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest.java
index fb34a2dd..42dd3ddc 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest.java
@@ -1,35 +1,5 @@
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.tasks;
 
-import static org.junit.Assert.assertThrows;
-
-import java.io.IOException;
-import java.util.Base64;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.joda.time.DateTime;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.core.xml.util.XMLObjectSupport;
-import org.opensaml.saml.saml2.core.Issuer;
-import org.opensaml.saml.saml2.core.Response;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-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.connector.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
@@ -57,6 +27,39 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xIniti
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
 import at.gv.egiz.eaaf.modules.pvp2.sp.exception.AuthnResponseValidationException;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.joda.time.DateTime;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
+import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.core.xml.io.UnmarshallingException;
+import org.opensaml.core.xml.util.XMLObjectSupport;
+import org.opensaml.saml.saml2.core.Issuer;
+import org.opensaml.saml.saml2.core.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+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.transform.TransformerException;
+import java.io.IOException;
+import java.util.Base64;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.springframework.util.Assert.isInstanceOf;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
@@ -67,9 +70,9 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
   private static final String METADATA_PATH = "classpath:/data/idp_metadata_classpath_entity.xml";
 
-  @Autowired(required = true)
+  @Autowired
   private ApplicationContext context;
-  @Autowired(required = true)
+  @Autowired
   protected MsConnectorDummyConfigMap authConfig;
   @Autowired
   private IdAustriaClientAuthMetadataProvider metadataProvider;
@@ -78,11 +81,10 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
   @Autowired
   private PvpMetadataResolverFactory metadataFactory;
 
-  final ExecutionContext executionContext = new ExecutionContextImpl();
+  private final ExecutionContext executionContext = new ExecutionContextImpl();
   private MockHttpServletRequest httpReq;
   private MockHttpServletResponse httpResp;
   private DummyPendingRequest pendingReq;
-  private DummyOA oaParam;
 
   private ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTask task;
 
@@ -115,13 +117,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     RequestContextHolder.resetRequestAttributes();
     RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 
-    authConfig.putConfigValue(IdAustriaClientAuthConstants.CONFIG_PROPS_ID_AUSTRIA_ENTITYID,
-        METADATA_PATH);
+    authConfig.putConfigValue(IdAustriaClientAuthConstants.CONFIG_PROPS_ID_AUSTRIA_ENTITYID, METADATA_PATH);
 
-    oaParam = new DummyOA();
+    DummyOA oaParam = new DummyOA();
     oaParam.setUniqueAppId("http://test.com/test");
-    oaParam.setTargetIdentifier(
-        EaafConstants.URN_PREFIX_CDID + RandomStringUtils.randomAlphabetic(2));
+    oaParam.setTargetIdentifier(EaafConstants.URN_PREFIX_CDID + RandomStringUtils.randomAlphabetic(2));
 
     pendingReq = new DummyPendingRequest();
     pendingReq.initialize(httpReq, authConfig);
@@ -129,7 +129,6 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     pendingReq.setOnlineApplicationConfiguration(oaParam);
 
     metadataProvider.fullyDestroy();
-
   }
 
   @Test
@@ -141,14 +140,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.03",
-        ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
-
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.03", ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
   }
 
   @Test
@@ -160,13 +156,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.12",
-        ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.12", ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -175,14 +169,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.12",
-        ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
-
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.12", ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
   }
 
   @Test
@@ -195,13 +186,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.12",
-        ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.12", ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -221,13 +210,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.12",
-        ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.12", ((AuthnResponseValidationException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -246,14 +233,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.11",
-        ((EaafException) e.getOriginalException()).getErrorId());
-
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.11", ((EaafException) e.getOriginalException()).getErrorId());
   }
 
   @Test
@@ -275,13 +259,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.12",
-        ((EaafException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.12", ((EaafException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -292,7 +274,7 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
     authConfig.putConfigValue(IdAustriaClientAuthConstants.CONFIG_PROPS_ID_AUSTRIA_ENTITYID,
         "http://wrong.idp/" + RandomStringUtils.randomAlphabetic(5));
-    
+
     metadataProvider.addMetadataResolverIntoChain(metadataFactory.createMetadataProvider(
         METADATA_PATH, null, "jUnit IDP", null));
 
@@ -308,13 +290,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.08",
-        ((EaafException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.08", ((EaafException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -338,13 +318,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.12",
-        ((EaafException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.12", ((EaafException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -368,13 +346,11 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     final TaskExecutionException e = assertThrows(TaskExecutionException.class,
         () -> task.execute(pendingReq, executionContext));
 
-    Assert.assertNotNull(e.getPendingRequestID());
-    Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-    Assert.assertNotNull(e.getOriginalException());
-    org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-        e.getOriginalException());
-    Assert.assertEquals("sp.pvp2.05",
-        ((EaafException) e.getOriginalException()).getErrorId());
+    assertNotNull(e.getPendingRequestID());
+    assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+    assertNotNull(e.getOriginalException());
+    isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+    assertEquals("sp.pvp2.05", ((EaafException) e.getOriginalException()).getErrorId());
 
   }
 
@@ -399,9 +375,9 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     task.execute(pendingReq, executionContext);
 
     // validate state
-    Assert.assertTrue("process not cancelled", executionContext.isProcessCancelled());
-    Assert.assertTrue("process not stopped by user", pendingReq.isAbortedByUser());
-    Assert.assertFalse("should not authenticated", pendingReq.isAuthenticated());
+    assertTrue("process not cancelled", executionContext.isProcessCancelled());
+    assertTrue("process not stopped by user", pendingReq.isAbortedByUser());
+    assertFalse("should not authenticated", pendingReq.isAuthenticated());
 
   }
 
@@ -424,17 +400,14 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
     try {
       task.execute(pendingReq, executionContext);
-      Assert.fail("Invalid response not detected");
+      fail("Invalid response not detected");
 
     } catch (final TaskExecutionException e) {
-      Assert.assertNotNull(e.getPendingRequestID());
-      Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-      Assert.assertNotNull(e.getOriginalException());
-      org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-          e.getOriginalException());
-      Assert.assertEquals("sp.pvp2.05",
-          ((EaafException) e.getOriginalException()).getErrorId());
-
+      assertNotNull(e.getPendingRequestID());
+      assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+      assertNotNull(e.getOriginalException());
+      isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+      assertEquals("sp.pvp2.05", ((EaafException) e.getOriginalException()).getErrorId());
     }
   }
 
@@ -457,16 +430,14 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
     try {
       task.execute(pendingReq, executionContext);
-      Assert.fail("Invalid response not detected");
+      fail("Invalid response not detected");
 
     } catch (final TaskExecutionException e) {
-      Assert.assertNotNull(e.getPendingRequestID());
-      Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-      Assert.assertNotNull(e.getOriginalException());
-      org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-          e.getOriginalException());
-      Assert.assertEquals("sp.pvp2.05",
-          ((EaafException) e.getOriginalException()).getErrorId());
+      assertNotNull(e.getPendingRequestID());
+      assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+      assertNotNull(e.getOriginalException());
+      isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+      assertEquals("sp.pvp2.05", ((EaafException) e.getOriginalException()).getErrorId());
 
     }
   }
@@ -501,8 +472,8 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
 
     // validate state
     final AuthProcessDataWrapper session = pendingReq.getSessionData(AuthProcessDataWrapper.class);
-    Assert.assertEquals("LoA", "http://eidas.europa.eu/LoA/low", session.getQaaLevel());
-    Assert.assertEquals("IssueInstant", "2014-03-05T06:39:51Z", session.getIssueInstantString());
+    assertEquals("LoA", "http://eidas.europa.eu/LoA/low", session.getQaaLevel());
+    assertEquals("IssueInstant", "2014-03-05T06:39:51Z", session.getIssueInstantString());
 
     //TODO:
 
@@ -536,15 +507,14 @@ public class ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTaskTest {
     // perform task
     try {
       task.execute(pendingReq, executionContext);
-      Assert.fail("Invalid response not detected");
+      fail("Invalid response not detected");
 
     } catch (final TaskExecutionException e) {
-      Assert.assertNotNull(e.getPendingRequestID());
-      Assert.assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
-      Assert.assertNotNull(e.getOriginalException());
-      org.springframework.util.Assert.isInstanceOf(AuthnResponseValidationException.class,
-          e.getOriginalException());
-      Assert.assertTrue(e.getOriginalException().getCause() instanceof InvalidUserInputException);
+      assertNotNull(e.getPendingRequestID());
+      assertEquals(pendingReq.getPendingRequestId(), e.getPendingRequestID());
+      assertNotNull(e.getOriginalException());
+      isInstanceOf(AuthnResponseValidationException.class, e.getOriginalException());
+      assertTrue(e.getOriginalException().getCause() instanceof InvalidUserInputException);
     }
 
   }