You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2013/12/10 17:54:11 UTC
svn commit: r1549890 -
/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4350Test.java
Author: gnodet
Date: Tue Dec 10 16:54:10 2013
New Revision: 1549890
URL: http://svn.apache.org/r1549890
Log:
FELIX-4350: additional failing use cases
Modified:
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4350Test.java
Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4350Test.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4350Test.java?rev=1549890&r1=1549889&r2=1549890&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4350Test.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/Felix4350Test.java Tue Dec 10 16:54:10 2013
@@ -84,30 +84,8 @@ public class Felix4350Test extends Compo
final Component main = findComponentByName(componentName);
TestCase.assertNotNull(main);
- ServiceRegistration dep1Reg = bundleContext.registerService(SimpleComponent.class.getName(),
- new ServiceFactory()
- {
- public Object getService(Bundle bundle, ServiceRegistration registration)
- {
- return new SimpleComponent();
- }
- public void ungetService(Bundle bundle, ServiceRegistration registration, Object service)
- {
- }
- }, null);
- ServiceRegistration dep2Reg = bundleContext.registerService(SimpleComponent2.class.getName(),
- new ServiceFactory()
- {
- public Object getService(Bundle bundle, ServiceRegistration registration)
- {
- delay(1000);
- return new SimpleComponent2();
- }
- public void ungetService(Bundle bundle, ServiceRegistration registration, Object service)
- {
- }
- }, null);
-
+ ServiceRegistration dep1Reg = register(new SimpleComponent(), 0);
+ ServiceRegistration dep2Reg = register(new SimpleComponent2(), 1000);
main.enable();
delay(300);
dep1Reg.unregister();
@@ -115,6 +93,41 @@ public class Felix4350Test extends Compo
ComponentInstance mainCompInst = main.getComponentInstance();
TestCase.assertNull(mainCompInst);
+
+ dep1Reg = register(new SimpleComponent(), 0);
+ delay(300);
+
+ mainCompInst = main.getComponentInstance();
+ TestCase.assertNotNull(mainCompInst);
+
+ main.disable();
+ dep1Reg.unregister();
+ dep2Reg.unregister();
+
+ dep1Reg = register(new SimpleComponent(), 0);
+ dep2Reg = register(new SimpleComponent2(), 1000);
+ main.enable();
+ delay(300);
+ dep1Reg.unregister();
+ delay(100);
+ dep1Reg = register(new SimpleComponent(), 0);
+ delay(2000);
+
+ mainCompInst = main.getComponentInstance();
+ TestCase.assertNotNull(mainCompInst);
+ }
+
+ protected ServiceRegistration register(final Object service, final int delay) {
+ return bundleContext.registerService(service.getClass().getName(), new ServiceFactory() {
+ public Object getService(Bundle bundle, ServiceRegistration registration)
+ {
+ delay(delay);
+ return service;
+ }
+ public void ungetService(Bundle bundle, ServiceRegistration registration, Object service)
+ {
+ }
+ }, null);
}
}