From 4026f215962fa35d50e385dec45e8a765ff35911 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 3 Jun 2009 11:27:06 +0000 Subject: [PATCH] Start implementing OSGi integration tests git-svn-id: https://svn.argeo.org/slc/trunk@2450 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../argeo/slc/osgi/test/AbstractOsgiRuntimeTest.java | 11 ++++++++++- .../test/java/org/argeo/slc/osgi/test/HelloTest.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTest.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTest.java index 5dc773aee..fe007997d 100644 --- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTest.java +++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTest.java @@ -1,5 +1,7 @@ package org.argeo.slc.osgi.test; +import java.util.Properties; + import junit.framework.TestCase; import org.apache.commons.logging.Log; @@ -19,7 +21,14 @@ public abstract class AbstractOsgiRuntimeTest extends TestCase { protected OsgiPlatform osgiPlatform = null; protected OsgiPlatform createOsgiPlatform() { - return new EquinoxPlatform(); + return new EquinoxPlatform() { + + public Properties getConfigurationProperties() { + Properties props = super.getConfigurationProperties(); + props.setProperty("osgi.configuration.area", "target/slc/conf"); + return props; + } + }; } protected void postStart() throws Exception { diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java index 668cc1d6c..c534ebe41 100644 --- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java +++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java @@ -4,7 +4,7 @@ import org.argeo.slc.osgiboot.OsgiBoot; public class HelloTest extends AbstractOsgiRuntimeTest { public void testHello() throws Exception { - Thread.sleep(5000); + Thread.sleep(2000); } protected void postStart() throws Exception { -- 2.39.2