summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-09-08 16:07:24 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-09-08 16:07:24 +0200
commit553d6a1b86abf4d464642fbcff70976b00094a66 (patch)
tree02f7f031c37a345bf05304eb9216ef7e93926bf1
parentbb54c6e5da78d4b1d37945779bdc7cb4bd3331c7 (diff)
downloadEAAF-Components-553d6a1b86abf4d464642fbcff70976b00094a66.tar.gz
EAAF-Components-553d6a1b86abf4d464642fbcff70976b00094a66.tar.bz2
EAAF-Components-553d6a1b86abf4d464642fbcff70976b00094a66.zip
fix some broken jUnit tests
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java2
-rw-r--r--eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java8
-rw-r--r--eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
index 81d50d76..8e827303 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
@@ -34,13 +34,13 @@ import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.Base64Utils;
import at.gv.egiz.eaaf.core.api.data.EaafConstants;
import at.gv.egiz.eaaf.core.exceptions.EaafBuilderException;
+import at.gv.egiz.eaaf.core.impl.data.Pair;
import lombok.extern.slf4j.Slf4j;
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java
index df431186..889a62ee 100644
--- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java
@@ -141,7 +141,7 @@ public class BpkBuilderTest {
BpkBuilder.generateAreaSpecificPersonIdentifier(null, EaafConstants.URN_PREFIX_CDID + "AA");
} catch (EaafBuilderException e) {
- Assert.assertEquals("Wrong errorCode", "builder.00", e.getErrorId());
+ Assert.assertEquals("Wrong errorCode", "builder.33", e.getErrorId());
}
}
@@ -151,7 +151,7 @@ public class BpkBuilderTest {
BpkBuilder.generateAreaSpecificPersonIdentifier(BASEID, null);
} catch (EaafBuilderException e) {
- Assert.assertEquals("Wrong errorCode", "builder.00", e.getErrorId());
+ Assert.assertEquals("Wrong errorCode", "builder.33", e.getErrorId());
}
}
@@ -162,7 +162,7 @@ public class BpkBuilderTest {
null, EaafConstants.URN_PREFIX_CDID + "AA");
} catch (EaafBuilderException e) {
- Assert.assertEquals("Wrong errorCode", "builder.00", e.getErrorId());
+ Assert.assertEquals("Wrong errorCode", "builder.33", e.getErrorId());
}
}
@@ -173,7 +173,7 @@ public class BpkBuilderTest {
EaafConstants.URN_PREFIX_CDID + "BB", EaafConstants.URN_PREFIX_CDID + "AA");
} catch (EaafBuilderException e) {
- Assert.assertEquals("Wrong errorCode", "builder.00", e.getErrorId());
+ Assert.assertEquals("Wrong errorCode", "builder.33", e.getErrorId());
}
}
diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
index 6a24f6b4..c0bd6f20 100644
--- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
+++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
@@ -241,7 +241,7 @@ public class EaafKeyStoreFactoryTest {
} catch (final EaafException e) {
org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class, e, "Wong ExceptionType");
- Assert.assertEquals("wrong errorCode", "internal.keystore.05", e.getErrorId());
+ Assert.assertEquals("wrong errorCode", "internal.keystore.06", e.getErrorId());
}
}