From a7a314bed2f9659b8f9ad15d58b33e819ccbc6ed Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 29 Apr 2008 12:08:07 +0000 Subject: [project @ fpeters@0d.be-20080314231256-hjz1wljuqrcbuce3] merging benjamin branch Original author: Frederic Peters Date: 2008-03-15 00:12:56.228000+01:00 --- bindings/java/tests/BindingTests.java | 1 + bindings/java/tests/LoginTest.java | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'bindings/java/tests') diff --git a/bindings/java/tests/BindingTests.java b/bindings/java/tests/BindingTests.java index 9d2fcd99..a6b57830 100644 --- a/bindings/java/tests/BindingTests.java +++ b/bindings/java/tests/BindingTests.java @@ -45,6 +45,7 @@ public class BindingTests extends TestCase { // Create and delete nodes. LibAuthnRequest authnRequest = new LibAuthnRequest(); + assertNotNull(authnRequest); authnRequest = null; } diff --git a/bindings/java/tests/LoginTest.java b/bindings/java/tests/LoginTest.java index 293ad133..9f83f42e 100644 --- a/bindings/java/tests/LoginTest.java +++ b/bindings/java/tests/LoginTest.java @@ -41,31 +41,33 @@ import com.entrouvert.lasso.*; public class LoginTest extends TestCase { public String generateIdentityProviderDump() { + String srcdir = System.getProperty("srcdir") + "/"; Server server = new Server( - "../../tests/data/idp1-la/metadata.xml", - "../../tests/data/idp1-la/private-key-raw.pem", + srcdir + "../../tests/data/idp1-la/metadata.xml", + srcdir + "../../tests/data/idp1-la/private-key-raw.pem", null, - "../../tests/data/idp1-la/certificate.pem"); + srcdir + "../../tests/data/idp1-la/certificate.pem"); server.addProvider( LassoConstants.PROVIDER_ROLE_SP, - "../../tests/data/sp1-la/metadata.xml", - "../../tests/data/sp1-la/public-key.pem", - "../../tests/data/ca1-la/certificate.pem"); + srcdir + "../../tests/data/sp1-la/metadata.xml", + srcdir + "../../tests/data/sp1-la/public-key.pem", + srcdir + "../../tests/data/ca1-la/certificate.pem"); String serverDump = server.dump(); return serverDump; } public String generateServiceProviderDump() { + String srcdir = System.getProperty("srcdir") + "/"; Server server = new Server( - "../../tests/data/sp1-la/metadata.xml", - "../../tests/data/sp1-la/private-key-raw.pem", + srcdir + "../../tests/data/sp1-la/metadata.xml", + srcdir + "../../tests/data/sp1-la/private-key-raw.pem", null, - "../../tests/data/sp1-la/certificate.pem"); + srcdir + "../../tests/data/sp1-la/certificate.pem"); server.addProvider( LassoConstants.PROVIDER_ROLE_IDP, - "../../tests/data/idp1-la/metadata.xml", - "../../tests/data/idp1-la/public-key.pem", - "../../tests/data/ca1-la/certificate.pem"); + srcdir + "../../tests/data/idp1-la/metadata.xml", + srcdir + "../../tests/data/idp1-la/public-key.pem", + srcdir + "../../tests/data/ca1-la/certificate.pem"); String serverDump = server.dump(); return serverDump; } -- cgit