It turns out that the FELIX-3337 issue is actually invalid, and the bug was in the test itself, not in the dependencymanager. Fixed the test in order to not change the S1 testkey=testvalue property, when updating S1 PID from config admin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1240467 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
index 8475c26..c4b0cdb 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
@@ -46,11 +46,9 @@
* - Service S1 depends on a ConfigurationDependency with propagate = true
* - Service S2 depends on S1 (and has access to the S1 configuration using the S1 service
* properties (because the ConfigurationDependency is propagated)
- * - then the ConfigurationDependency is updated
+ * - then the S1 PID is updated from ConfigAdmin
* - S1 is then called in its updated callback
- * - but S2 is not called in its "change" callback.
- *
- * this test is related to the issue FELIX3337
+ * - S2 is called in its "change" callback.
*/
@RunWith(JUnit4TestRunner.class)
public class FELIX3337_UpdatedConfigurationDependencyWithPropagationTest
@@ -88,7 +86,8 @@
public void update() {
try {
Properties props = new Properties();
- props.put("testkey", "testmodifiedvalue");
+ props.put("testkey", "testvalue");
+ props.put("testkey2", "testvalue2");
m_conf.update(props);
} catch (IOException e) {
Assert.fail("Could not update the configured property: " + e.toString());
@@ -164,6 +163,5 @@
m.remove(s1);
m.remove(s2);
m.remove(s3);
- // ensure we executed all steps inside the component instance
}
}