Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsboshev2009-06-01 14:13:33 +0000
committersboshev2009-06-01 14:13:33 +0000
commit15273d1363ca5822c52078565e3f55e821b474e5 (patch)
tree5203c1fa6c7ee6c7c69017f461aa5ea7775d6647
parent7b5e2146ae562e29081b2ef08a20cb78000ebd87 (diff)
downloadrt.equinox.bundles-15273d1363ca5822c52078565e3f55e821b474e5.tar.gz
rt.equinox.bundles-15273d1363ca5822c52078565e3f55e821b474e5.tar.xz
rt.equinox.bundles-15273d1363ca5822c52078565e3f55e821b474e5.zip
test updated to test the case described in Bug 278333R3_5
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/BindUnbindRegistrator.java4
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/components.xml2
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java2
3 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/BindUnbindRegistrator.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/BindUnbindRegistrator.java
index dbdef0742..35b425f4d 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/BindUnbindRegistrator.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/BindUnbindRegistrator.java
@@ -53,6 +53,10 @@ public class BindUnbindRegistrator implements PropertiesProvider {
protected void unbindSr(ServiceReference sr) {
setDataBits(UNBIND_SR);
}
+
+ protected void unbindCmMap2(ComponentManager sr, Map props) {
+ setDataBits(UNBIND_CM_MAP);
+ }
protected void bindCm(ComponentManager ce) {
setDataBits(BIND_CM);
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/components.xml b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/components.xml
index 36b9fb4c1..e477a6b6c 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/components.xml
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb13/org/eclipse/equinox/ds/tests/tb13/components.xml
@@ -44,7 +44,7 @@
bind="bindSr"
interface="org.eclipse.equinox.ds.tests.tbc.ComponentManager"
name="componentenabler"
- unbind="unbindSr"/>
+ unbind="unbindCmMap2"/>
</component>
<!-- bind/unbind with ComponentEnabler; old XML Schema -->
diff --git a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java
index 8784d0d81..e32d757fb 100644
--- a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java
+++ b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java
@@ -1933,7 +1933,7 @@ public class DSTest extends TestCase {
assertEquals("Bind method of " + SR_NS110 + " should be called", 1 << 0, (1 << 0) & getBaseConfigData(bs));
enabler.enableComponent(SR_NS110, false);
Thread.sleep(timeout * 3);
- assertEquals("Unbind method of " + SR_NS110 + " should be called", 1 << 1, (1 << 1) & getBaseConfigData(bs));
+ assertEquals("Unbind method of " + SR_NS110 + " should be called", 1 << 5, (1 << 5) & getBaseConfigData(bs));
bs = getBaseService(CE_NS100);
assertNotNull("Component " + CE_NS100 + " should be activated", bs);

Back to the top