Fix FELIX-2581 White Board Pattern onActivate called before @Validate
The handler must wait until the instance is started before opening the tracker.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@996284 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/handler/whiteboard/pom.xml b/ipojo/tests/handler/whiteboard/pom.xml
index 586b64e..1c56f54 100644
--- a/ipojo/tests/handler/whiteboard/pom.xml
+++ b/ipojo/tests/handler/whiteboard/pom.xml
@@ -34,6 +34,11 @@
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.7.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -105,6 +110,16 @@
/>
<provides/>
</component>
+
+ <component classname="org.apache.felix.ipojo.test.FooWhiteBoardPattern" name="under-providers-lifecycle">
+ <wbp:wbp
+ filter="(objectclass=org.apache.felix.ipojo.test.FooService)"
+ onArrival="onArrival" onDeparture="onDeparture" onModification="onModification"
+ />
+ <provides/>
+ <callback transition="validate" method="start"/>
+ <callback transition="invalidate" method="stop"/>
+ </component>
</ipojo>
]]>
</metadata>
@@ -112,6 +127,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-junit4osgi-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <configuration>
+ <org.osgi.http.port>8083</org.osgi.http.port>
+ </configuration>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/FooWhiteBoardPattern.java b/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/FooWhiteBoardPattern.java
index 787748e..4974e45 100644
--- a/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/FooWhiteBoardPattern.java
+++ b/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/FooWhiteBoardPattern.java
@@ -8,18 +8,35 @@
import org.osgi.framework.ServiceReference;
public class FooWhiteBoardPattern implements Observable {
-
+
List list = new ArrayList();
int modifications = 0;
-
+
+ long validate_time = 0;
+ long first_arrival_time = 0;
+ long first_departure_time = 0;
+ long invalidate_time = 0;
+
public void onArrival(ServiceReference ref) {
+ if (first_arrival_time == 0) {
+ first_arrival_time = System.currentTimeMillis();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) { }
+ }
list.add(ref);
}
-
+
public void onDeparture(ServiceReference ref) {
list.remove(ref);
+ if (first_departure_time == 0) {
+ first_departure_time = System.currentTimeMillis();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) { }
+ }
}
-
+
public void onModification(ServiceReference ref) {
modifications = modifications + 1;
}
@@ -28,9 +45,30 @@
Map map = new HashMap();
map.put("list", list);
map.put("modifications", new Integer(modifications));
+ map.put("validate", new Long(validate_time));
+ map.put("invalidate", new Long(invalidate_time));
+ map.put("arrival", new Long(first_arrival_time));
+ map.put("departure", new Long(first_departure_time));
return map;
}
-
-
+
+ public void start() {
+ if (validate_time == 0) {
+ validate_time = System.currentTimeMillis();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) { }
+ }
+ }
+
+ public void stop() {
+ if (invalidate_time == 0) {
+ invalidate_time = System.currentTimeMillis();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) { }
+ }
+ }
+
}
diff --git a/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/WbpTests.java b/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/WbpTests.java
index d25c1e1..e791e40 100644
--- a/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/WbpTests.java
+++ b/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/WbpTests.java
@@ -14,183 +14,209 @@
import org.osgi.framework.ServiceReference;
public class WbpTests extends OSGiTestCase {
-
+
Factory provFactory;
- Factory factory, factory2;
+ Factory factory, factory2, factory3;
public void setUp() {
provFactory = Utils.getFactoryByName(context, "fooprovider");
factory = Utils.getFactoryByName(context, "under-providers");
factory2 = Utils.getFactoryByName(context, "under-properties");
+ factory3 = Utils.getFactoryByName(context, "under-providers-lifecycle");
}
-
+
public void tearDown() {
-
+
}
-
+
public void testServiceProviders() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
ComponentInstance ci = factory.createComponentInstance(new Properties());
-
+
ServiceReference ref = Utils.getServiceReferenceByName(context, Observable.class.getName(), ci.getInstanceName());
assertNotNull("Check Observable availability", ref);
Observable obs = (Observable) context.getService(ref);
-
+
Map map = obs.getObservations();
assertEquals("Check empty list" , ((List) map.get("list")).size(), 0);
-
+
Properties p1 = new Properties();
p1.put("foo", "foo");
ComponentInstance prov1 = provFactory.createComponentInstance(p1);
-
+
map = obs.getObservations();
assertEquals("Check list #1" , ((List) map.get("list")).size(), 1);
-
+
Properties p2 = new Properties();
p2.put("foo", "foo");
ComponentInstance prov2 = provFactory.createComponentInstance(p2);
-
+
map = obs.getObservations();
assertEquals("Check list #2" , ((List) map.get("list")).size(), 2);
-
+
prov1.stop();
-
+
map = obs.getObservations();
assertEquals("(1) Check list #1" , ((List) map.get("list")).size(), 1);
-
+
prov2.stop();
-
+
map = obs.getObservations();
assertEquals("(2) Check list #0" , ((List) map.get("list")).size(), 0);
-
+
prov2.start();
-
+
map = obs.getObservations();
assertEquals("(3) Check list #1" , ((List) map.get("list")).size(), 1);
-
+
prov1.start();
-
+
map = obs.getObservations();
assertEquals("(4) Check list #2" , ((List) map.get("list")).size(), 2);
-
+
prov1.dispose();
-
+
map = obs.getObservations();
assertEquals("(5) Check list #1" , ((List) map.get("list")).size(), 1);
-
+
prov2.dispose();
-
+
map = obs.getObservations();
assertEquals("(6) Check list #0" , ((List) map.get("list")).size(), 0);
-
+
context.ungetService(ref);
ci.dispose();
}
-
+
public void testPropertiesProviders() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
ComponentInstance ci = factory2.createComponentInstance(new Properties());
-
+
ServiceReference ref = Utils.getServiceReferenceByName(context, Observable.class.getName(), ci.getInstanceName());
assertNotNull("Check Observable availability", ref);
Observable obs = (Observable) context.getService(ref);
-
+
Map map = obs.getObservations();
assertEquals("Check empty list" , ((List) map.get("list")).size(), 0);
-
+
Properties p1 = new Properties();
p1.put("foo", "foo");
ComponentInstance prov1 = provFactory.createComponentInstance(p1);
ServiceReference ref1 = Utils.getServiceReferenceByName(context, FooService.class.getName(), prov1.getInstanceName());
FooService fs1 = (FooService) context.getService(ref1);
-
+
map = obs.getObservations();
assertEquals("Check list #1" , ((List) map.get("list")).size(), 1);
-
+
Properties p2 = new Properties();
p2.put("foo", "foo");
ComponentInstance prov2 = provFactory.createComponentInstance(p2);
ServiceReference ref2 = Utils.getServiceReferenceByName(context, FooService.class.getName(), prov2.getInstanceName());
FooService fs2 = (FooService) context.getService(ref2);
-
+
map = obs.getObservations();
assertEquals("Check list #2" , ((List) map.get("list")).size(), 2);
-
+
fs1.foo();
-
+
map = obs.getObservations();
assertEquals("(1) Check list #1" , ((List) map.get("list")).size(), 1);
-
+
fs2.foo();
-
+
map = obs.getObservations();
assertEquals("(2) Check list #0" , ((List) map.get("list")).size(), 0);
-
+
fs2.foo();
-
+
map = obs.getObservations();
assertEquals("(3) Check list #1" , ((List) map.get("list")).size(), 1);
-
+
fs1.foo();
-
+
map = obs.getObservations();
assertEquals("(4) Check list #2" , ((List) map.get("list")).size(), 2);
-
+
prov1.dispose();
-
+
map = obs.getObservations();
assertEquals("(5) Check list #1" , ((List) map.get("list")).size(), 1);
-
+
prov2.dispose();
-
+
map = obs.getObservations();
assertEquals("(6) Check list #0" , ((List) map.get("list")).size(), 0);
-
+
context.ungetService(ref1);
context.ungetService(ref2);
context.ungetService(ref);
ci.dispose();
}
-
+
public void testModifications() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
ComponentInstance ci = factory.createComponentInstance(new Properties());
-
+
ServiceReference ref = Utils.getServiceReferenceByName(context, Observable.class.getName(), ci.getInstanceName());
assertNotNull("Check Observable availability", ref);
Observable obs = (Observable) context.getService(ref);
-
+
Map map = obs.getObservations();
assertEquals("Check empty list" , ((List) map.get("list")).size(), 0);
-
+
Properties p1 = new Properties();
p1.put("foo", "foo");
ComponentInstance prov1 = provFactory.createComponentInstance(p1);
-
+
map = obs.getObservations();
assertEquals("Check list #1" , ((List) map.get("list")).size(), 1);
assertEquals("Check modification #0" , ((Integer) map.get("modifications")).intValue(), 0);
-
+
ServiceReference ref2 = Utils.getServiceReference(context, FooService.class.getName(), null);
assertNotNull("Check FooService availability", ref2);
-
+
FooService fs = (FooService) context.getService(ref2);
fs.foo();
-
+
map = obs.getObservations();
assertEquals("Check list #1" , ((List) map.get("list")).size(), 1);
assertEquals("Check modification #1 (" + map.get("modifications")+")" , ((Integer) map.get("modifications")).intValue(), 1);
-
+
fs.foo();
-
+
map = obs.getObservations();
assertEquals("Check list #1" , ((List) map.get("list")).size(), 1);
assertEquals("Check modification #2" , ((Integer) map.get("modifications")).intValue(), 2);
-
+
prov1.dispose();
map = obs.getObservations();
assertEquals("Check list #0" , ((List) map.get("list")).size(), 0);
assertEquals("Check modification #2" , ((Integer) map.get("modifications")).intValue(), 2);
-
+
context.ungetService(ref);
context.ungetService(ref2);
ci.dispose();
}
+
+ public void testLifecycleCompliance() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
+ // First expose a service.
+ Properties p1 = new Properties();
+ p1.put("foo", "foo");
+ ComponentInstance prov1 = provFactory.createComponentInstance(p1);
+
+ ComponentInstance ci = factory3.createComponentInstance(new Properties());
+
+ ServiceReference ref = Utils.getServiceReferenceByName(context, Observable.class.getName(), ci.getInstanceName());
+ assertNotNull("Check Observable availability", ref);
+ Observable obs = (Observable) context.getService(ref);
+
+ Map map = obs.getObservations();
+ // Check time
+ Long validate = (Long) map.get("validate");
+ Long arrival = (Long) map.get("arrival");
+
+ // Validate must be call before.
+ assertTrue(validate.longValue() + " <?> " + arrival.longValue(), validate.longValue() < arrival.longValue());
+
+ prov1.dispose();
+ ci.dispose();
+
+ }
}