From 6571af05b7574f6d752890301b9743b1243a05bd Mon Sep 17 00:00:00 2001 From: kstranacher Date: Tue, 11 Oct 2011 16:02:54 +0000 Subject: MOA-ID: * Fixed Bug #557 * Update Konfiguration: Target via Konfig fix konfigurierbar * Update Doku Common: * DOMUtils: Parser disabled external entities git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1219 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../test/java/test/abnahme/A/Test100StartAuthentication.java | 12 ++++++++---- .../src/test/java/test/abnahme/AbnahmeTestCase.java | 1 + .../gv/egovernment/moa/id/auth/AuthenticationServerTest.java | 2 +- .../builder/AuthenticationBlockAssertionBuilderTest.java | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'id/server/idserverlib/src/test/java') diff --git a/id/server/idserverlib/src/test/java/test/abnahme/A/Test100StartAuthentication.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test100StartAuthentication.java index a1ba1b8fb..fcf7477c5 100644 --- a/id/server/idserverlib/src/test/java/test/abnahme/A/Test100StartAuthentication.java +++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test100StartAuthentication.java @@ -43,6 +43,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { String htmlForm = server.startAuthentication("https://localhost:8443/auth", //authURL "gb", //target + null, "http://localhost:9080/", //oaURL "file:" + findXmldata("AuthTemplate.html"), "http://localhost:3495/http-security-layer-request", @@ -62,6 +63,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { String htmlForm = server.startAuthentication("https://localhost:8443/auth", //authURL "gb", //target + null, "http://localhost:9080/", //oaURL null, "http://localhost:3495/http-security-layer-request", null, null, null); @@ -80,6 +82,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { String htmlForm = server.startAuthentication("https://localhost:8443/auth", //authURL "gb", //target + null, "http://localhost:9080/", //oaURL "file:" + findXmldata("AuthTemplate.html"), null, @@ -101,6 +104,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { server.startAuthentication(null, //authURL "gb", //target + null, "http://localhost:9080/", //oaURL null, null, null, null, null); //assertEquals("",htmlForm); @@ -121,7 +125,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { try { server.startAuthentication("http://localhost:8080/auth", //authURL - "gb", "http://localhost:9080/", //oaURL + "gb", null, "http://localhost:9080/", //oaURL null, null, null, null, null); System.err.println(this.getName() + " hat KEINE FEHLER geworfen"); fail(this.getName() + " hat KEINE FEHLER geworfen"); @@ -139,7 +143,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { try { server.startAuthentication("https://localhost:8443/auth", //authURL - "gb", "http://host_not_in_config/", //oaURL + "gb", null, "http://host_not_in_config/", //oaURL null, null, null, null, null); System.err.println(this.getName() + " hat KEINE FEHLER geworfen"); fail(this.getName() + " hat KEINE FEHLER geworfen"); @@ -158,7 +162,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { try { server.startAuthentication("https://localhost:8443/auth", //authURL - "gb", null, //oaURL + "gb", null, null, //oaURL null, null, null, null, null); System.err.println(this.getName() + " hat KEINE FEHLER geworfen"); fail(this.getName() + " hat KEINE FEHLER geworfen"); @@ -177,7 +181,7 @@ public class Test100StartAuthentication extends AbnahmeTestCase { try { try { server.startAuthentication("https://localhost:8443/auth", //authURL - null, "http://localhost:9080/", //oaURL + null, null, "http://localhost:9080/", //oaURL null, null, null, null, null); System.err.println(this.getName() + " hat KEINE FEHLER geworfen"); fail(this.getName() + " hat KEINE FEHLER geworfen"); diff --git a/id/server/idserverlib/src/test/java/test/abnahme/AbnahmeTestCase.java b/id/server/idserverlib/src/test/java/test/abnahme/AbnahmeTestCase.java index 636d301bb..69f33f82c 100644 --- a/id/server/idserverlib/src/test/java/test/abnahme/AbnahmeTestCase.java +++ b/id/server/idserverlib/src/test/java/test/abnahme/AbnahmeTestCase.java @@ -136,6 +136,7 @@ public class AbnahmeTestCase extends MOAIDTestCase { String htmlForm = AuthenticationServer.getInstance().startAuthentication( "https://localhost:8443/auth", "gb", + null, oaURL, null, null, diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java index 31c09bb01..052c1fed4 100644 --- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java +++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java @@ -54,7 +54,7 @@ public class AuthenticationServerTest extends UnitTestCase { public void doTest(String testdataDirectory, String authURL, String target, String oaURL, String bkuURL, String templateURL) throws Exception { String testdataRoot = TESTDATA_ROOT + "xmldata/" + testdataDirectory + "/"; AuthenticationServer server = AuthenticationServer.getInstance(); - String htmlForm = server.startAuthentication(authURL, target, oaURL, templateURL, bkuURL, null, null, null); + String htmlForm = server.startAuthentication(authURL, target, null, oaURL, templateURL, bkuURL, null, null, null); String sessionID = parseSessionIDFromForm(htmlForm); String infoboxReadResponse = readFile(TESTDATA_ROOT + "xmldata/testperson1/" + "InfoboxReadResponse.xml"); HashMap parameters = new HashMap(1); diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java index e79394a28..d369c39bd 100644 --- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java +++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java @@ -63,7 +63,7 @@ public class AuthenticationBlockAssertionBuilderTest extends UnitTestCase { public void testBuild() throws Exception { AuthenticationBlockAssertionBuilder builder = new AuthenticationBlockAssertionBuilder(); - String assertionBuilt = builder.buildAuthBlock(ISSUER, ISSUE_INSTANT, AUTH_URL, TARGET, "", "", OA_URL, GEB_DAT, null, null); + String assertionBuilt = builder.buildAuthBlock(ISSUER, ISSUE_INSTANT, AUTH_URL, TARGET, null, "", "", OA_URL, GEB_DAT, null, null); assertionBuilt = XML_DECL + assertionBuilt; String assertionShould = XML_DECL + ASSERTION_SHOULD; assertXmlEquals(assertionShould, assertionBuilt); -- cgit v1.2.3