You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/08/25 10:45:51 UTC
svn commit: r988894 - in /felix/trunk/configadmin: pom.xml
src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
Author: fmeschbe
Date: Wed Aug 25 08:45:50 2010
New Revision: 988894
URL: http://svn.apache.org/viewvc?rev=988894&view=rev
Log:
FELIX-2554 simplify integration test setup by adding a build profile "ide" generating a version of the bundle easily accessible with PAX Exam both from within Maven build and from within IDEs
Modified:
felix/trunk/configadmin/pom.xml
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
Modified: felix/trunk/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=988894&r1=988893&r2=988894&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Wed Aug 25 08:45:50 2010
@@ -35,6 +35,42 @@
Implementation of the OSGi Configuration Admin Service Specification 1.2
</description>
+ <!--
+ A Note on Testing
+ =================
+
+ This project contains two kinds of tests: regular unit tests running
+ in the test phase and integration tests based on PAX Exam running
+ in the integration-test phase.
+
+ Basically the complete project is build using Java 1.3 source and target
+ compatibility (as inherited from the parent pom). The exception are the
+ unit tests in the "integration" packages. These have to be compiled with
+ Java 5 source and target compatibility because the employ annotations
+ and generics.
+
+ For running the integration tests from the console using Maven nothing
+ special has to be done as the tests run automatically. To run the tests
+ in your IDE, the project has to be built to the "package" phase with
+ the profile "ide" enabled:
+
+ $ mvn -Pide clean package
+
+ This creates the scr.jar file in the target folder, which is used by
+ the integration tests when run from the IDE. Alternatively the
+ "project.bundle.file" system property may be set to the bundle JAR
+ in the IDE launcher.
+ -->
+ <properties>
+ <bundle.build.name>
+ ${basedir}/target
+ </bundle.build.name>
+ <bundle.file.name>
+ ${bundle.build.name}/${project.build.finalName}.jar
+ </bundle.file.name>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -148,38 +184,6 @@
</configuration>
</plugin>
- <!-- Provide bundle for integration tests -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>configadmin-file-create</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/configadmin.jar" />
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>configadmin-file-remove</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete file="${project.build.directory}/configadmin.jar" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!--
Exclude Integration tests in (default) unit tests and
conversely enable integration tests for integration testing
@@ -195,6 +199,12 @@
<goal>test</goal>
</goals>
<configuration>
+ <systemProperties>
+ <property>
+ <name>project.bundle.file</name>
+ <value>${bundle.file.name}</value>
+ </property>
+ </systemProperties>
<excludes>
<exclude>**/cm/*</exclude>
<exclude>**/cm/file/*</exclude>
@@ -215,6 +225,38 @@
</plugins>
</build>
+ <profiles>
+ <!--
+ copy the package such that IDEs may easily use it without
+ setting the system property
+ -->
+ <profile>
+ <id>ide</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>cm-file-create</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/configadmin.jar" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<!-- repositories for Pax Exam and BND tool -->
<repositories>
<repository>
Modified: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java?rev=988894&r1=988893&r2=988894&view=diff
==============================================================================
--- felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java (original)
+++ felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java Wed Aug 25 08:45:50 2010
@@ -19,6 +19,9 @@
package org.apache.felix.cm.integration;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.provision;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -39,6 +42,8 @@ import org.junit.Before;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -72,6 +77,20 @@ public abstract class ConfigurationTestB
*/
public static final boolean REDISPATCH_CONFIGURATION_ON_SET_BUNDLE_LOCATION = false;
+ // the name of the system property providing the bundle file to be installed and tested
+ protected static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file";
+
+ // the default bundle jar file name
+ protected static final String BUNDLE_JAR_DEFAULT = "target/configadmin.jar";
+
+ // the JVM option to set to enable remote debugging
+ protected static final String DEBUG_VM_OPTION = "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=30303";
+
+ // the actual JVM option set, extensions may implement a static
+ // initializer overwriting this value to have the configuration()
+ // method include it when starting the OSGi framework JVM
+ protected static String paxRunnerVmOption = null;
+
@Inject
protected BundleContext bundleContext;
@@ -92,14 +111,22 @@ public abstract class ConfigurationTestB
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration()
{
- return CoreOptions.options(
- CoreOptions.provision(
- CoreOptions.bundle( new File("target/configadmin.jar").toURI().toString() ),
- CoreOptions.mavenBundle( "org.ops4j.pax.swissbox", "pax-swissbox-tinybundles", "1.0.0" )
- )
-// , PaxRunnerOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=30303" )
- // , PaxRunnerOptions.logProfile()
+ final String bundleFileName = System.getProperty( BUNDLE_JAR_SYS_PROP, BUNDLE_JAR_DEFAULT );
+ final File bundleFile = new File( bundleFileName );
+ if ( !bundleFile.canRead() )
+ {
+ throw new IllegalArgumentException( "Cannot read from bundle file " + bundleFileName + " specified in the "
+ + BUNDLE_JAR_SYS_PROP + " system property" );
+ }
+
+ final Option[] base = options(
+ provision(
+ CoreOptions.bundle( bundleFile.toURI().toString() ),
+ mavenBundle( "org.ops4j.pax.swissbox", "pax-swissbox-tinybundles", "1.0.0" )
+ )
);
+ final Option vmOption = ( paxRunnerVmOption != null ) ? PaxRunnerOptions.vmOption( paxRunnerVmOption ) : null;
+ return OptionUtils.combine( base, vmOption );
}