Fix version number consistently
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@790900 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/api/pom.xml b/ipojo/tests/api/pom.xml
index ba01660..89457c1 100644
--- a/ipojo/tests/api/pom.xml
+++ b/ipojo/tests/api/pom.xml
@@ -54,29 +54,29 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<!-- For external handlermanagement -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<!--
diff --git a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java
index e2b3128..93a72a9 100644
--- a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java
+++ b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java
@@ -3,9 +3,13 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
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 static org.ops4j.pax.exam.MavenUtils.asInProject;
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.ConfigurationException;
@@ -32,34 +36,36 @@
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import static org.ops4j.pax.exam.MavenUtils.*;
@RunWith( JUnit4TestRunner.class )
public class CompositeTest {
-
+
@Inject
private BundleContext context;
-
+
private OSGiHelper osgi;
-
+
private IPOJOHelper ipojo;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
}
-
+
@After
public void stop() {
ipojo.dispose();
osgi.dispose();
}
-
+
@Configuration
- public static Option[] configure() {
+ public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.composite").version(asInProject()),
@@ -74,63 +80,63 @@
// Define the component types
PrimitiveComponentType prov = createAProvider();
PrimitiveComponentType cons = createAConsumer();
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("comp1")
.addInstance(new Instance(prov.getFactory().getName()))
.addInstance(new Instance(cons.getFactory().getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop cons
cons.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
-
+
// Restart cons
cons.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnInstantiatedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
PrimitiveComponentType prov = createAProvider();
prov.start();
PrimitiveComponentType cons = createAConsumer();
-
- ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
+
+ ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
"(component.providedServiceSpecifications=" + Foo.class.getName() +")");
assertThat(refs.length, is(not(0)));
-
+
Factory factory = (Factory) osgi.getServiceObject(refs[0]);
System.out.println(factory.getComponentDescription().getDescription());
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("comp2")
.addSubService(new InstantiatedService().setSpecification(Foo.class.getName()))
.addInstance(new Instance(cons.getFactory().getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
System.out.println(ci.getInstanceDescription().getDescription());
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
-
+
// Restart prov
prov.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnOptionalInstantiatedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
@@ -141,55 +147,55 @@
.setBundleContext(context)
.setComponentTypeName("comp3")
.addSubService(new InstantiatedService().setSpecification(Foo.class.getName()).setOptional(true));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is valid - 1", ci.getState(), is(ComponentInstance.VALID));
-
+
// Restart prov
prov.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnImportedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
PrimitiveComponentType prov = createAProvider();
prov.createInstance();
PrimitiveComponentType cons = createAConsumer();
-
- ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
+
+ ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
"(component.providedServiceSpecifications=" + Foo.class.getName() +")");
assertThat(refs.length, is(not(0)));
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("comp2")
.addSubService(new ImportedService().setSpecification(Foo.class.getName()))
.addInstance(new Instance(cons.getFactory().getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
System.out.println(ci.getInstanceDescription().getDescription());
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
-
+
// Restart prov
prov.start();
prov.createInstance();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnOptionalImportedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
@@ -200,22 +206,22 @@
.setBundleContext(context)
.setComponentTypeName("comp3")
.addSubService(new ImportedService().setSpecification(Foo.class.getName()).setOptional(true));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is valid - 1", ci.getState(), is(ComponentInstance.VALID));
-
+
// Restart prov
prov.start();
prov.createInstance();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithExportingAService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
@@ -223,25 +229,25 @@
prov.start();
PrimitiveComponentType cons = createAConsumer();
ComponentInstance c = cons.createInstance();
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("compExport")
.addSubService(new InstantiatedService().setSpecification(Foo.class.getName()))
.addService(new ExportedService().setSpecification(Foo.class.getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
assertThat("c is valid", c.getState(), is(ComponentInstance.VALID));
-
-
+
+
// Stop prov
prov.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
assertThat("c is invalid", c.getState(), is(ComponentInstance.INVALID));
-
+
// Restart prov
prov.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
@@ -249,7 +255,7 @@
}
-
+
private PrimitiveComponentType createAProvider() {
return new PrimitiveComponentType()
.setBundleContext(context)
@@ -257,7 +263,7 @@
.setPublic(true)
.addService(new Service()); // Provide the FooService
}
-
+
private PrimitiveComponentType createAConsumer() {
return new PrimitiveComponentType()
.setBundleContext(context)
diff --git a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java
index 59f4e0d..2c2038c 100644
--- a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java
+++ b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java
@@ -3,6 +3,9 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -26,29 +29,32 @@
@RunWith( JUnit4TestRunner.class )
public class ExternalHandlerTest {
-
+
@Inject
private BundleContext context;
-
+
private OSGiHelper osgi;
-
+
private IPOJOHelper ipojo;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
}
-
+
@After
public void stop() {
ipojo.dispose();
osgi.dispose();
}
-
+
@Configuration
- public static Option[] configure() {
+ public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.api").version(asInProject()),
@@ -57,7 +63,7 @@
);
return opt;
}
-
+
@Test
public void createAHost() throws Exception {
PrimitiveComponentType type = createAWhiteboardHost();
@@ -66,7 +72,7 @@
HandlerDescription hd = ci.getInstanceDescription().getHandlerDescription(Whiteboard.NAMESPACE + ":" + Whiteboard.NAME);
assertThat (hd, is (notNullValue()));
}
-
+
@Test
public void createDoubleHost() throws Exception {
PrimitiveComponentType type = createASecondWhiteboardHost();
@@ -75,7 +81,7 @@
HandlerDescription hd = ci.getInstanceDescription().getHandlerDescription(Whiteboard.NAMESPACE + ":" + Whiteboard.NAME);
assertThat (hd, is (notNullValue()));
}
-
+
private PrimitiveComponentType createAWhiteboardHost() {
return new PrimitiveComponentType()
.setBundleContext(context)
@@ -86,7 +92,7 @@
.setFilter("(foo=foo)")
);
}
-
+
private PrimitiveComponentType createASecondWhiteboardHost() {
return new PrimitiveComponentType()
.setBundleContext(context)
diff --git a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java
index b954a27..6ecfa68 100644
--- a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java
+++ b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java
@@ -4,6 +4,9 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -57,6 +60,9 @@
@Configuration
public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.api").version(asInProject())
diff --git a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java
index ecb9923..1e4e3f4 100644
--- a/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java
+++ b/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java
@@ -5,6 +5,9 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -36,29 +39,32 @@
@RunWith( JUnit4TestRunner.class )
public class SingletonComponentTest {
-
+
@Inject
private BundleContext context;
-
+
private OSGiHelper osgi;
-
+
private IPOJOHelper ipojo;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
}
-
+
@After
public void stop() {
ipojo.dispose();
osgi.dispose();
}
-
+
@Configuration
- public static Option[] configure() {
+ public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.api").version(asInProject())
@@ -81,7 +87,7 @@
assertThat(ref, is(notNullValue()));
}
-
+
@Test
public void killTheFactory() throws Exception {
assertThat( context, is( notNullValue() ) );
@@ -99,7 +105,7 @@
.getInstanceName());
assertThat(ref, is(nullValue()));
}
-
+
@Test
public void createAServiceCons() throws Exception {
assertThat( context, is( notNullValue() ) );
@@ -111,77 +117,77 @@
is(ComponentInstance.INVALID));
}
-
+
@Test
public void createBoth() throws Exception {
ComponentInstance cons = createAConsumer().create();
// cons is invalid
assertThat("cons is invalid", cons.getState(), is(ComponentInstance.INVALID));
-
+
ComponentInstance prov = createAProvider().create();
assertThat("prov is valid", prov.getState(), is(ComponentInstance.VALID));
assertThat("cons is valid", cons.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createTwoCons() throws Exception {
ComponentInstance cons1 = createAConsumer().create();
// cons is invalid
assertThat("cons is invalid", cons1.getState(), is(ComponentInstance.INVALID));
-
+
ComponentInstance prov = createAProvider().create();
assertThat("prov is valid", prov.getState(), is(ComponentInstance.VALID));
assertThat("cons is valid", cons1.getState(), is(ComponentInstance.VALID));
-
+
ComponentInstance cons2 = createAnOptionalConsumer().create();
-
+
assertThat("cons2 is valid", cons2.getState(), is(ComponentInstance.VALID));
-
+
prov.stop();
assertThat("cons is invalid", cons1.getState(), is(ComponentInstance.INVALID));
assertThat("cons2 is valid", cons2.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
@Ignore
public void setObject() throws Exception {
ComponentInstance cons = createAConsumer().setObject(new MyComponentImpl(5)).create();
// cons is invalid
assertThat("cons is invalid", cons.getState(), is(ComponentInstance.INVALID));
-
+
ComponentInstance prov = createAProvider().create();
assertThat("prov is valid", prov.getState(), is(ComponentInstance.VALID));
assertThat("cons is valid", cons.getState(), is(ComponentInstance.VALID));
-
+
}
-
+
private SingletonComponentType createAProvider() {
PrimitiveComponentType type = new SingletonComponentType()
.setBundleContext(context)
.setClassName(FooImpl.class.getName())
.addService(new Service()); // Provide the FooService
-
+
return (SingletonComponentType) type;
}
-
+
private SingletonComponentType createAConsumer() {
PrimitiveComponentType type = new SingletonComponentType()
.setBundleContext(context)
.setClassName(org.example.service.impl.MyComponentImpl.class.getName())
.addDependency(new Dependency().setField("myFoo"))
.setValidateMethod("start");
-
+
return (SingletonComponentType) type;
}
-
+
private SingletonComponentType createAnOptionalConsumer() {
PrimitiveComponentType type = new SingletonComponentType()
.setBundleContext(context)
.setClassName(org.example.service.impl.MyComponentImpl.class.getName())
.addDependency(new Dependency().setField("myFoo").setOptional(true))
.setValidateMethod("start");
-
+
return (SingletonComponentType) type;
}