You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2010/11/15 13:15:49 UTC
svn commit: r1035244 -
/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java
Author: marrs
Date: Mon Nov 15 12:15:48 2010
New Revision: 1035244
URL: http://svn.apache.org/viewvc?rev=1035244&view=rev
Log:
FELIX-2696 Created a test case for this issue.
Added:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java (with props)
Added: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java?rev=1035244&view=auto
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java (added)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java Mon Nov 15 12:15:48 2010
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.dm.test;
+
+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 java.io.IOException;
+import java.util.Dictionary;
+import java.util.Properties;
+
+import junit.framework.Assert;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedService;
+
+@RunWith(JUnit4TestRunner.class)
+public class FELIX_2696_ConfigurationAndServiceDependencyTest extends Base {
+ @Configuration
+ public static Option[] configuration() {
+ return options(
+ provision(
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.1.0"),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").version("1.2.4"),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
+ )
+ );
+ }
+
+ @Test
+ public void testComponentWithRequiredConfigurationAndServicePropertyPropagation(BundleContext context) {
+ DependencyManager m = new DependencyManager(context);
+ // helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+ // create a service provider and consumer
+ Component s1 = m.createComponent()
+ .setImplementation(new ConfigurationConsumer(e))
+ .add(m.createServiceDependency().setService(ServiceInterface.class).setRequired(true))
+ .add(m.createConfigurationDependency().setPid("test"));
+ Component s2 = m.createComponent()
+ .setImplementation(new ConfigurationCreator(e))
+ .add(m.createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true));
+ Component s3 = m.createComponent()
+ .setInterface(ServiceInterface.class.getName(), null)
+ .setImplementation(DependentServiceProvider.class);
+ m.add(s1);
+ m.add(s2);
+ m.add(s3);
+ e.waitForStep(2, 5000);
+ m.remove(s3);
+ m.add(s3);
+ // after adding the required dependency again, the issue in FELIX-2696 means that the
+ // updated() method is not invoked for the new instance, and init() is, so our step
+ // count will only go up to 3 (not 4) causing this test to fail
+ e.waitForStep(4, 5000);
+ m.remove(s3);
+ m.remove(s2);
+ m.remove(s1);
+ }
+
+ public static class ConfigurationCreator {
+ private volatile ConfigurationAdmin m_ca;
+ private final Ensure m_ensure;
+
+ public ConfigurationCreator(Ensure e) {
+ m_ensure = e;
+ }
+
+ public void init() {
+ try {
+ org.osgi.service.cm.Configuration conf = m_ca.getConfiguration("test", null);
+ Properties props = new Properties();
+ props.put("testkey", "testvalue");
+ conf.update(props);
+ }
+ catch (IOException e) {
+ Assert.fail("Could not create configuration: " + e.getMessage());
+ }
+ }
+ }
+
+ public static class ConfigurationConsumer implements ManagedService {
+ private boolean m_isConfigured;
+ private boolean m_isInitialized;
+ private final Ensure m_ensure;
+
+ public ConfigurationConsumer(Ensure e) {
+ m_ensure = e;
+ }
+
+ public void updated(Dictionary props) throws ConfigurationException {
+ if (props != null) {
+ if (!"testvalue".equals(props.get("testkey"))) {
+ Assert.fail("Could not find the configured property.");
+ }
+ m_ensure.step();
+ }
+ }
+
+ public void init() {
+ m_ensure.step();
+ }
+ }
+
+ public static interface ServiceInterface {
+ }
+
+ public static class DependentServiceProvider implements ServiceInterface {
+ }
+}
Propchange: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX_2696_ConfigurationAndServiceDependencyTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain