summaryrefslogtreecommitdiff
path: root/eaaf_modules/eaaf_module_pvp2_core
diff options
context:
space:
mode:
authorThomas <>2021-04-20 09:30:30 +0200
committerThomas <>2021-04-20 09:30:30 +0200
commit2f5425491ac88ec4b65157ac85bde58fb7dce34c (patch)
tree94d886118f8bc512ecce3f04df95350817a406e4 /eaaf_modules/eaaf_module_pvp2_core
parent3cd52ab38e4d57b6f056dbf47897d80f419522df (diff)
downloadEAAF-Components-2f5425491ac88ec4b65157ac85bde58fb7dce34c.tar.gz
EAAF-Components-2f5425491ac88ec4b65157ac85bde58fb7dce34c.tar.bz2
EAAF-Components-2f5425491ac88ec4b65157ac85bde58fb7dce34c.zip
update third-party libs and verify / fix some jUnit tests
Diffstat (limited to 'eaaf_modules/eaaf_module_pvp2_core')
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/pom.xml5
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java10
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java27
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java2
4 files changed, 19 insertions, 25 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 1ce539ee..a39d305a 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -82,11 +82,6 @@
<!-- Testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java
index f14a9093..3288df14 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java
@@ -511,7 +511,7 @@ public class PostBindingTest {
Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());
- Assert.assertEquals("ContentType", "text/html", httpResp.getContentType());
+ Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding());
final String http = httpResp.getContentAsString();
@@ -545,7 +545,7 @@ public class PostBindingTest {
Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());
- Assert.assertEquals("ContentType", "text/html", httpResp.getContentType());
+ Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding());
final String http = httpResp.getContentAsString();
@@ -581,7 +581,7 @@ public class PostBindingTest {
Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());
- Assert.assertEquals("ContentType", "text/html", httpResp.getContentType());
+ Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding());
final String http = httpResp.getContentAsString();
@@ -619,7 +619,7 @@ public class PostBindingTest {
Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());
- Assert.assertEquals("ContentType", "text/html", httpResp.getContentType());
+ Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding());
final String http = httpResp.getContentAsString();
@@ -657,7 +657,7 @@ public class PostBindingTest {
Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());
- Assert.assertEquals("ContentType", "text/html", httpResp.getContentType());
+ Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding());
final String http = httpResp.getContentAsString();
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
index f3a7e01d..5393179d 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
@@ -3,19 +3,6 @@ package at.gv.egiz.eaaf.modules.pvp2.test.binding;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
-import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
-import at.gv.egiz.eaaf.modules.pvp2.impl.binding.SoapBinding;
-import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.PvpMetadataResolverFactory;
-import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xInitializer;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
-import at.gv.egiz.eaaf.modules.pvp2.impl.validation.EaafUriCompare;
-import at.gv.egiz.eaaf.modules.pvp2.test.dummy.DummyCredentialProvider;
-
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
@@ -38,6 +25,18 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
+import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
+import at.gv.egiz.eaaf.modules.pvp2.impl.binding.SoapBinding;
+import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.PvpMetadataResolverFactory;
+import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xInitializer;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
+import at.gv.egiz.eaaf.modules.pvp2.impl.validation.EaafUriCompare;
+import at.gv.egiz.eaaf.modules.pvp2.test.dummy.DummyCredentialProvider;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.net.URIComparator;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@@ -204,7 +203,7 @@ public class SoapBindingTest {
Assert.assertEquals("http StatusCode", 200, httpResp.getStatus());
Assert.assertNotNull("PVP msg is null", httpResp.getContentLength());
- Assert.assertEquals("ContentType", "text/xml", httpResp.getContentType());
+ Assert.assertEquals("ContentType", "text/xml;charset=UTF-8", httpResp.getContentType());
Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding());
final String http = httpResp.getContentAsString();
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java
index 1cbc2f14..72d6ebb8 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java
@@ -241,7 +241,7 @@ public class MetadataResolverTest {
Assert.fail("Untrusted signature not detected");
} catch (final Pvp2MetadataException e) {
- Assert.assertEquals("Wrong errorCode", "internal.pvp.07", e.getErrorId());
+ Assert.assertEquals("Wrong errorCode", "internal.pvp.09", e.getErrorId());
}