From: Mathieu Baudier Date: Thu, 4 Jun 2009 16:20:45 +0000 (+0000) Subject: Specific MANIFESTs for test jars. X-Git-Tag: argeo-slc-2.1.7~1862 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=16985114374e883342daaa56cdb4186fe2c82355;p=gpl%2Fargeo-slc.git Specific MANIFESTs for test jars. Integration tests for demo. git-svn-id: https://svn.argeo.org/slc/trunk@2464 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/demo/.classpath b/demo/.classpath index d0bec0f76..624a6cfe1 100644 --- a/demo/.classpath +++ b/demo/.classpath @@ -1,5 +1,6 @@ + diff --git a/demo/pom.xml b/demo/pom.xml index 4a02458c2..e1d8544ab 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -30,6 +30,42 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + pre-integration-test + + copy-dependencies + + + compile + jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + surefire-it + integration-test + + test + + + false + + + + @@ -49,6 +85,20 @@ ${project.version} pom + + + + org.argeo.slc.runtime + org.argeo.slc.support.equinox + ${project.version} + tests + test + + + org.argeo.slc.runtime + org.argeo.slc.osgiboot + ${project.version} + diff --git a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java new file mode 100644 index 000000000..603ac265b --- /dev/null +++ b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java @@ -0,0 +1,33 @@ +package org.argeo.slc.demo; + +import java.util.ArrayList; +import java.util.List; + +import org.argeo.slc.osgi.test.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.getLocationsUrls( + OsgiBoot.DEFAULT_BASE_URL, System + .getProperty("java.class.path"))); + osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, + "site;in=*")); + } + + protected List getBundlesToStart() { + List bundlesToStart = new ArrayList(); + bundlesToStart.add("org.springframework.osgi.extender"); + bundlesToStart.add("org.argeo.slc.agent"); + bundlesToStart.add("org.argeo.slc.demo.basic"); + return bundlesToStart; + } + +} diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml index 6bb276209..5c664c7ae 100644 --- a/runtime/org.argeo.slc.support.equinox/pom.xml +++ b/runtime/org.argeo.slc.support.equinox/pom.xml @@ -21,6 +21,11 @@ test-jar + + + target/test-classes/META-INF/MANIFEST.MF + + diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml index 40dc4a0ea..d65ef683a 100644 --- a/runtime/org.argeo.slc.support.simple/pom.xml +++ b/runtime/org.argeo.slc.support.simple/pom.xml @@ -32,6 +32,11 @@ test-jar + + + target/test-classes/META-INF/MANIFEST.MF + +