Author: dkulp
Date: Thu May 15 18:13:45 2014
New Revision: 1594999
URL: http://svn.apache.org/r1594999
Log:
Test: Verify factory functionality for a managed component.
Added:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/FooFactory.java
(with props)
Modified:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.java
aries/trunk/blueprint/blueprint-cm/src/test/resources/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.xml
Added:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/FooFactory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/FooFactory.java?rev=1594999&view=auto
==============================================================================
---
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/FooFactory.java
(added)
+++
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/FooFactory.java
Thu May 15 18:13:45 2014
@@ -0,0 +1,29 @@
+/**
+ * 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.aries.blueprint.compendium.cm;
+
+
+public class FooFactory {
+
+
+ public FooInterface create(){
+ return new Foo();
+ }
+}
+
Propchange:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/FooFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.java?rev=1594999&r1=1594998&r2=1594999&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.java
(original)
+++
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.java
Thu May 15 18:13:45 2014
@@ -298,4 +298,37 @@ public class ManagedServiceFactoryTest e
assertEquals("7", sr2.getProperty("a"));
assertEquals("foo2", sr2.getProperty("b"));
}
+
+ @Test
+ public void testFactoryCreation() throws Exception {
+ ConfigurationAdmin ca = getOsgiService(ConfigurationAdmin.class);
+ Configuration cf =
ca.createFactoryConfiguration("blueprint-sample-managed-service-factory5",
null);
+ Hashtable<String, String> props = new Hashtable<String, String>();
+ props.put("a", "5");
+ cf.update(props);
+
+ BundleContext context = getBundleContext();
+ ServiceReference sr = Helper.getOsgiServiceReference(context, Foo.class,
"(key=foo5)", Helper.DEFAULT_TIMEOUT);
+ assertNotNull(sr);
+ Foo foo = (Foo) context.getService(sr);
+ assertNotNull(foo);
+ assertEquals(5, foo.getA());
+ assertEquals("default", foo.getB());
+ assertEquals("5", sr.getProperty("a"));
+ assertNull(sr.getProperty("b"));
+
+ props = new Hashtable<String, String>();
+ props.put("a", "5");
+ props.put("b", "foo");
+ cf.update(props);
+ Thread.sleep(500);
+
+ // No update of bean after creation
+ assertEquals(5, foo.getA());
+ assertEquals("default", foo.getB());
+
+ // Only initial update of service properties
+ assertEquals("5", sr.getProperty("a"));
+ assertNull(sr.getProperty("b"));
+ }
}
Modified:
aries/trunk/blueprint/blueprint-cm/src/test/resources/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/test/resources/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.xml?rev=1594999&r1=1594998&r2=1594999&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-cm/src/test/resources/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.xml
(original)
+++
aries/trunk/blueprint/blueprint-cm/src/test/resources/org/apache/aries/blueprint/compendium/cm/ManagedServiceFactoryTest.xml
Thu May 15 18:13:45 2014
@@ -57,7 +57,7 @@
<property name="b" value="default" />
</cm:managed-component>
</cm:managed-service-factory>
-
+
<cm:managed-service-factory id="managed-service-factory4"
factory-pid="blueprint-sample-managed-service-factory4"
interface="org.apache.aries.blueprint.compendium.cm.Foo">
@@ -71,5 +71,20 @@
<property name="b" value="default" />
</cm:managed-component>
</cm:managed-service-factory>
+
+ <bean id="fooFactory"
class="org.apache.aries.blueprint.compendium.cm.FooFactory" />
+ <cm:managed-service-factory id="managed-service-factory5"
+
factory-pid="blueprint-sample-managed-service-factory5"
+
interface="org.apache.aries.blueprint.compendium.cm.Foo">
+ <service-properties>
+ <entry key="key" value="foo5" />
+ <cm:cm-properties persistent-id="" />
+ </service-properties>
+ <cm1_3:managed-component factory-ref="fooFactory"
factory-method="create">
+ <cm:managed-properties persistent-id="" />
+ <property name="a" value="1" />
+ <property name="b" value="default" />
+ </cm:managed-component>
+ </cm:managed-service-factory>
</blueprint>
