Start implementing OSGi integration tests

git-svn-id: https://svn.argeo.org/slc/trunk@2450 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 5dc773aee18cd78b75da47ba1bbb2449e07e462c..fe007997d9d07efffd560e7d1f5f8f4dc1156306 100644 (file)
--- 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 668cc1d6c95bc890e2d753ec83fc30855c7e45c6..c534ebe41d0549a97d0fdd4ef7333ed443142db9 100644 (file)
--- 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 {