X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fdemo%2FStartStopDemoTest.java;h=3feba8e596a36aa58e42f8a53282956a9a5b0dc4;hb=9c82ed02a7ee7b4a757853d8160587b27e493f1a;hp=603ac265bb4f48a2ff751d2448f0626f2f069e57;hpb=16985114374e883342daaa56cdb4186fe2c82355;p=gpl%2Fargeo-slc.git diff --git a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java index 603ac265b..3feba8e59 100644 --- a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java +++ b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java @@ -3,23 +3,26 @@ package org.argeo.slc.demo; import java.util.ArrayList; import java.util.List; -import org.argeo.slc.osgi.test.AbstractOsgiRuntimeTestCase; +import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase; import org.argeo.slc.osgiboot.OsgiBoot; public class StartStopDemoTest extends AbstractOsgiRuntimeTestCase { + public void testStartStop() throws Exception { assertBundleApplicationContext("org.argeo.slc.agent"); assertStartedBundlesApplicationContext("org.argeo.slc.demo"); } protected void installBundles() throws Exception { - osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, - "target/dependency;in=*.jar")); + // osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, + // "target/dependency;in=*.jar")); osgiBoot.installUrls(osgiBoot.getLocationsUrls( OsgiBoot.DEFAULT_BASE_URL, System .getProperty("java.class.path"))); osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, "site;in=*")); + osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, + "../server/org.argeo.slc.siteserver/bundles;in=*")); } protected List getBundlesToStart() {