diff options
Diffstat (limited to 'eaaf_core/src/test/java')
3 files changed, 11 insertions, 11 deletions
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java index 19054634..3a64b23e 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java @@ -1,6 +1,7 @@ package at.gv.egiz.eaaf.core.impl.idp.auth; import java.io.ByteArrayInputStream; +import java.util.Base64; import java.util.HashMap; import java.util.Map; @@ -10,7 +11,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.data.EaafConstants; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -174,7 +174,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -201,7 +201,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -227,7 +227,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -253,7 +253,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -283,7 +283,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java index 16c2079a..072db94b 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.PublicKey; import java.security.interfaces.RSAPublicKey; +import java.util.Base64; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Assert; @@ -12,7 +13,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.exceptions.EaafParserException; import at.gv.egiz.eaaf.core.impl.idp.auth.data.IdentityLink; @@ -32,8 +32,8 @@ public class IdentityLinkTest { @Before public void testInit() throws EaafParserException, UnsupportedEncodingException { idl = (IdentityLink) new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(AuthenticationDataBuilderTest.DUMMY_IDL_2.getBytes( - "UTF-8")))).parseIdentityLink(); + new ByteArrayInputStream(Base64.getDecoder().decode( + AuthenticationDataBuilderTest.DUMMY_IDL_2.getBytes("UTF-8")))).parseIdentityLink(); } diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java index 7092031f..609cf314 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java @@ -1,12 +1,12 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.attributes; import java.io.ByteArrayInputStream; +import java.util.Base64; import java.util.HashMap; import java.util.Map; import org.junit.BeforeClass; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -149,7 +149,7 @@ public abstract class AbstractAttributeBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))).parseIdentityLink()); + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))).parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); } |