Split the composite test suite
Add the annotation test suite (checking annotations processing)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@652169 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/tests.composite/pom.xml b/ipojo/tests/tests.composite/pom.xml
index 9162a38..7661528 100644
--- a/ipojo/tests/tests.composite/pom.xml
+++ b/ipojo/tests/tests.composite/pom.xml
@@ -65,7 +65,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.felix.ipojo.test.composite.service
+ org.apache.felix.ipojo.test.composite.service, org.apache.felix.ipojo.test.composite.component, org.apache.felix.ipojo.test.composite.util
</Export-Package>
<Bundle-SymbolicName>
${pom.artifactId}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/CompositeTestSuite.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/CompositeTestSuite.java
index efa9de3..a3bd8df 100644
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/CompositeTestSuite.java
+++ b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/CompositeTestSuite.java
@@ -21,13 +21,7 @@
import junit.framework.Test;
import org.apache.felix.ipojo.junit4osgi.OSGiTestSuite;
-import org.apache.felix.ipojo.test.composite.exporter.ExportTestSuite;
-import org.apache.felix.ipojo.test.composite.importer.ImportTestSuite;
import org.apache.felix.ipojo.test.composite.infrastructure.InfrastructureTestSuite;
-import org.apache.felix.ipojo.test.composite.instance.SimpleInstance;
-import org.apache.felix.ipojo.test.composite.instantiator.InstantiatorTestSuite;
-import org.apache.felix.ipojo.test.composite.provides.ProvidesTestSuite;
-import org.apache.felix.ipojo.test.composite.test.CompositeTest;
import org.osgi.framework.BundleContext;
public class CompositeTestSuite {
@@ -35,13 +29,6 @@
public static Test suite(BundleContext bc) {
OSGiTestSuite ots = new OSGiTestSuite("iPOJO Composites Test Suite", bc);
ots.addTest(InfrastructureTestSuite.suite(bc));
- ots.addTest(InstantiatorTestSuite.suite(bc));
- ots.addTest(ImportTestSuite.suite(bc));
- ots.addTest(ExportTestSuite.suite(bc));
- ots.addTestSuite(CompositeTest.class);
- ots.addTestSuite(SimpleInstance.class);
- ots.addTest(ProvidesTestSuite.suite(bc));
-
return ots;
}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/ExportTestSuite.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/ExportTestSuite.java
deleted file mode 100644
index d9b84f1..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/ExportTestSuite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.ipojo.test.composite.exporter;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.felix.ipojo.junit4osgi.OSGiTestSuite;
-import org.osgi.framework.BundleContext;
-
-public class ExportTestSuite extends TestSuite {
-
- public static Test suite(BundleContext bc) {
- OSGiTestSuite ots = new OSGiTestSuite("Composite Service Exporters Test Suite", bc);
- ots.addTestSuite(SimpleExport.class);
- ots.addTestSuite(OptionalExport.class);
- ots.addTestSuite(MultipleExport.class);
- ots.addTestSuite(OptionalMultipleExport.class);
- ots.addTestSuite(FilteredExport.class);
- ots.setBundleContext(bc);
- return ots;
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
deleted file mode 100644
index 8353c03..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * 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.ipojo.test.composite.exporter;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BazService;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class FilteredExport extends OSGiTestCase {
-
- ComponentInstance export1;
- Factory fooProvider;
- ComponentInstance foo1 = null, foo2 = null;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
-
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to create foos : " + e.getMessage());
- }
-
- foo1.stop();
- foo2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "composite.export.5");
- Properties props = new Properties();
- props.put("name", "export");
- try {
- export1 = factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Fail to instantiate exporter " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- export1.dispose();
- foo1 = null;
- foo2 = null;
- export1 = null;
- }
-
- public void test1() {
- export1.start();
-
- // Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
-
- // Test invalidity
- assertTrue("Check invalidity - 0", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo1.stop();
- assertTrue("Check invalidity - 3", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo2.stop();
- assertTrue("Check invalidity - 4", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check invalidity - 5", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 0);
- }
-
- public void test2() {
- export1.start();
-
- // Test invalidity
- assertTrue("Check invalidity - 0", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 3", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke());
-
- foo1.stop();
- assertTrue("Check invalidity - 4", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 5", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke());
- }
-
- public void test3() {
- foo1.start();
- foo2.start();
-
- export1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo1.stop();
- assertTrue("Check invalidity - 2", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 0);
-
- foo2.stop();
- assertTrue("Check invalidity - 3", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 4", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke());
- }
-
- public void test4() {
- foo1.start();
- foo2.start();
-
- export1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo1.stop();
- assertTrue("Check invalidity - 3", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check invalidity - 4", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
- }
-
-
-
- private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
- return ref != null;
- }
-
- private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export1.getInstanceName()+")");
- return refs.length;
- }
-
- private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
- if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- return fs.foo();
- }
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
deleted file mode 100644
index fed07ba..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * 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.ipojo.test.composite.exporter;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BazService;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class MultipleExport extends OSGiTestCase {
-
- ComponentInstance export3;
- Factory fooProvider;
- ComponentInstance foo1 = null, foo2 = null;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
-
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to create foos : " + e.getMessage());
- }
-
- foo1.stop();
- foo2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "composite.export.3");
- Properties props = new Properties();
- props.put("name", "export");
- try {
- export3 = factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Fail to instantiate exporter " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- export3.dispose();
- foo1 = null;
- foo2 = null;
- export3 = null;
- }
-
- public void test1() {
- export3.start();
-
- // Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
-
- // Test invalidity
- assertTrue("Check invalidity - 0", export3.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke(1));
-
- foo2.start();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 2", invoke(2));
-
- foo1.stop();
- assertTrue("Check validity - 3", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3 ("+countFooServiceProvided()+")", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke(1));
-
- foo2.stop();
- assertTrue("Check invalidity - 4", export3.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 5", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke(1));
- }
-
- public void test2() {
- export3.start();
-
- // Test invalidity
- assertTrue("Check invalidity - 0", export3.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 2", invoke(2));
-
- foo2.stop();
- assertTrue("Check validity - 3", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke(1));
-
- foo1.stop();
- assertTrue("Check invalidity - 4", export3.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 5", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke(1));
- }
-
- public void test3() {
- foo1.start();
- foo2.start();
-
- export3.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 1", invoke(2));
-
- foo1.stop();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke(1));
-
- foo2.stop();
- assertTrue("Check invalidity - 3", export3.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 4", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke(1));
- }
-
- public void test4() {
- foo1.start();
- foo2.start();
-
- export3.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 1", invoke(2));
-
- foo2.stop();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke(1));
-
- foo1.stop();
- assertTrue("Check invalidity - 3", export3.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 4", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke(1));
- }
-
-
-
- private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
- return ref != null;
- }
-
- private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
- return refs.length;
- }
-
- private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
- if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- context.ungetService(ref);
- return fs.foo();
- }
-
- private boolean invoke(int nb) {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
- if(refs == null) { return false; }
- if (nb > refs.length) { return false; }
- for(int i = 0; i < nb; i++) {
- BazService fs = (BazService) context.getService(refs[i]);
- context.ungetService(refs[i]);
- if(!fs.foo()) { return false; }
- }
- return true;
- }
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
deleted file mode 100644
index 4f78f49..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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.ipojo.test.composite.exporter;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BazService;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class OptionalExport extends OSGiTestCase {
-
- ComponentInstance export2;
- Factory fooProvider;
- ComponentInstance foo1 = null, foo2 = null;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
-
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to create foos : " + e.getMessage());
- }
-
- foo1.stop();
- foo2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "composite.export.2");
- Properties props = new Properties();
- props.put("name", "export");
- try {
- export2 = factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Fail to instantiate exporter " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- export2.dispose();
- foo1 = null;
- foo2 = null;
- export2 = null;
- }
-
- public void test1() {
- export2.start();
-
- // Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
-
- // Test validity
- assertTrue("Check validity - 0", export2.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo1.stop();
- assertTrue("Check validity - 3", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3 ("+countFooServiceProvided()+")", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 4", export2.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 5", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke());
- }
-
- public void test2() {
- export2.start();
-
- // Test invalidity
- assertTrue("Check validity - 0", export2.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 3", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke());
-
- foo1.stop();
- assertTrue("Check validity - 4", export2.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 5", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke());
- }
-
- public void test3() {
- foo1.start();
- foo2.start();
-
- export2.start();
- assertTrue("Check validity - 1", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo1.stop();
- assertTrue("Check validity - 2", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 3", export2.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 4", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke());
- }
-
- public void test4() {
- foo1.start();
- foo2.start();
-
- export2.start();
- assertTrue("Check validity - 1", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 2", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo1.stop();
- assertTrue("Check validity - 3", export2.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 4", export2.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke());
- }
-
-
-
- private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export2.getInstanceName());
- return ref != null;
- }
-
- private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export2.getInstanceName()+")");
- return refs.length;
- }
-
- private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export2.getInstanceName());
- if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- return fs.foo();
- }
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
deleted file mode 100644
index a285ef0..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * 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.ipojo.test.composite.exporter;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BazService;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class OptionalMultipleExport extends OSGiTestCase {
-
- ComponentInstance export3;
- Factory fooProvider;
- ComponentInstance foo1 = null, foo2 = null;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
-
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to create foos : " + e.getMessage());
- }
-
- foo1.stop();
- foo2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "composite.export.4");
- Properties props = new Properties();
- props.put("name", "export");
- try {
- export3 = factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Fail to instantiate exporter " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- export3.dispose();
- foo1 = null;
- foo2 = null;
- export3 = null;
- }
-
- public void test1() {
- export3.start();
-
- // Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
-
- // Test invalidity
- assertTrue("Check validity - 0", export3.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke(1));
-
- foo2.start();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 2", invoke(2));
-
- foo1.stop();
- assertTrue("Check validity - 3", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3 ("+countFooServiceProvided()+")", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke(1));
-
- foo2.stop();
- assertTrue("Check validity - 4", export3.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 5", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke(1));
- }
-
- public void test2() {
- export3.start();
-
- // Test invalidity
- assertTrue("Check validity - 0", export3.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 2", invoke(2));
-
- foo2.stop();
- assertTrue("Check validity - 3", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke(1));
-
- foo1.stop();
- assertTrue("Check validity - 4", export3.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 5", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke(1));
- }
-
- public void test3() {
- foo1.start();
- foo2.start();
-
- export3.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 1", invoke(2));
-
- foo1.stop();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke(1));
-
- foo2.stop();
- assertTrue("Check validity - 3", export3.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 4", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke(1));
- }
-
- public void test4() {
- foo1.start();
- foo2.start();
-
- export3.start();
- assertTrue("Check validity - 1", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 2);
- assertTrue("Check invocation - 1", invoke(2));
-
- foo2.stop();
- assertTrue("Check validity - 2", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke(1));
-
- foo1.stop();
- assertTrue("Check validity - 3", export3.getState() == ComponentInstance.VALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 4", export3.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke(1));
- }
-
-
-
- private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
- return ref != null;
- }
-
- private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
- return refs.length;
- }
-
- private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
- if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- context.ungetService(ref);
- return fs.foo();
- }
-
- private boolean invoke(int nb) {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
- if(refs == null) { return false; }
- if (nb > refs.length) { return false; }
- for(int i = 0; i < nb; i++) {
- BazService fs = (BazService) context.getService(refs[i]);
- context.ungetService(refs[i]);
- if(!fs.foo()) { return false; }
- }
- return true;
- }
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
deleted file mode 100644
index b0bf922..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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.ipojo.test.composite.exporter;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BazService;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class SimpleExport extends OSGiTestCase {
-
- ComponentInstance export1;
- Factory fooProvider;
- ComponentInstance foo1 = null, foo2 = null;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
-
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to create foos : " + e.getMessage());
- }
-
- foo1.stop();
- foo2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "composite.export.1");
- Properties props = new Properties();
- props.put("name", "export");
- try {
- export1 = factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Fail to instantiate exporter " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- export1.dispose();
- foo1 = null;
- foo2 = null;
- export1 = null;
- }
-
- public void test1() {
- export1.start();
-
- // Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
-
- // Test invalidity
- assertTrue("Check invalidity - 0", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo1.stop();
- assertTrue("Check validity - 3", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3 ("+countFooServiceProvided()+")", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke());
-
- foo2.stop();
- assertTrue("Check invalidity - 4", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 5", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke());
- }
-
- public void test2() {
- export1.start();
-
- // Test invalidity
- assertTrue("Check invalidity - 0", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 0", isFooServiceProvided());
- assertEquals("Check number of provides - 0", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.start();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 3", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 3", invoke());
-
- foo1.stop();
- assertTrue("Check invalidity - 4", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 5", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 5", isFooServiceProvided());
- assertEquals("Check number of provides - 5", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 5", invoke());
- }
-
- public void test3() {
- foo1.start();
- foo2.start();
-
- export1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo1.stop();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo2.stop();
- assertTrue("Check invalidity - 3", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo1.start();
- assertTrue("Check validity - 4", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke());
- }
-
- public void test4() {
- foo1.start();
- foo2.start();
-
- export1.start();
- assertTrue("Check validity - 1", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 1", isFooServiceProvided());
- assertEquals("Check number of provides - 1", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 1", invoke());
-
- foo2.stop();
- assertTrue("Check validity - 2", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 2", isFooServiceProvided());
- assertEquals("Check number of provides - 2", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 2", invoke());
-
- foo1.stop();
- assertTrue("Check invalidity - 3", export1.getState() == ComponentInstance.INVALID);
- assertFalse("Check providing - 3", isFooServiceProvided());
- assertEquals("Check number of provides - 3", countFooServiceProvided(), 0);
-
- foo2.start();
- assertTrue("Check validity - 4", export1.getState() == ComponentInstance.VALID);
- assertTrue("Check providing - 4", isFooServiceProvided());
- assertEquals("Check number of provides - 4", countFooServiceProvided(), 1);
- assertTrue("Check invocation - 4", invoke());
- }
-
-
-
- private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
- return ref != null;
- }
-
- private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export1.getInstanceName()+")");
- return refs.length;
- }
-
- private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
- if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- return fs.foo();
- }
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
deleted file mode 100644
index 1466677..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class DelayedFilteredImport extends OSGiTestCase {
-
- ComponentInstance import1;
- Factory fooProvider;
- ComponentInstance foo1, foo2;
-
- public void setUp() {
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
- try {
- import1 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
-
- import1.stop();
-
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Cannot instantiate foo providers : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- import1.dispose();
- foo1 = null;
- foo2 = null;
- import1 = null;
- }
-
- public void testSimple() {
- import1.start();
- //Two providers
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.stop();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.stop();
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo2.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
- public void testSimple2() {
- import1.start();
- //Two providers
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo2.stop();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo1.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
deleted file mode 100644
index 47688ee..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class DelayedMultipleImport extends OSGiTestCase {
-
- ComponentInstance import2;
- Factory fooProvider;
- ComponentInstance foo1, foo2;
-
- public void setUp() {
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.2");
- try {
- import2 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
-
- import2.stop();
-
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Cannot instantiate foo providers : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- import2.dispose();
- foo1 = null;
- foo2 = null;
- import2 = null;
- }
-
- public void testSimple() {
- import2.start();
- //Two providers
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import2);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- fs = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation (2)", fs.foo());
- sc.ungetService(refs[1]);
-
- foo1.stop();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.stop();
- assertTrue("Test component invalidity - 2", import2.getState() == ComponentInstance.INVALID);
-
- foo2.start();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
- public void testSimple2() {
- import2.start();
- //Two providers
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import2);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- fs = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[1]);
-
- foo2.stop();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component invalidity - 2", import2.getState() == ComponentInstance.INVALID);
-
- foo1.start();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
deleted file mode 100644
index 6e36797..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class DelayedOptionalImport extends OSGiTestCase {
-
- ComponentInstance import3;
- Factory fooProvider;
- ComponentInstance foo1, foo2;
-
- public void setUp() {
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.3");
- try {
- import3 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
-
- import3.stop();
-
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Cannot instantiate foo providers : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- import3.dispose();
- foo1 = null;
- foo2 = null;
- import3 = null;
- }
-
- public void testSimple() {
- import3.start();
- //Two providers
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import3);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.stop();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.stop();
- assertTrue("Test component validity - 2", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo non-availability inside the composite - 3.1", refs.length, 0);
-
- foo2.start();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
- public void testSimple2() {
- import3.start();
- //Two providers
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import3);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo2.stop();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component validity - 2", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 0);
-
- foo1.start();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
deleted file mode 100644
index 0dac390..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class DelayedOptionalMultipleImport extends OSGiTestCase {
-
- ComponentInstance import4;
- Factory fooProvider;
- ComponentInstance foo1, foo2;
-
- public void setUp() {
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.4");
- try {
- import4 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
-
- import4.stop();
-
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Cannot instantiate foo providers : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- import4.dispose();
- foo1 = null;
- foo2 = null;
- import4 = null;
- }
-
- public void testSimple() {
- import4.start();
- //Two providers
- assertTrue("Test component validity", import4.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import4);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- fs = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation (2)", fs.foo());
- sc.ungetService(refs[1]);
-
- foo1.stop();
- assertTrue("Test component validity", import4.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import4);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.stop();
- assertTrue("Test component validity - 2", import4.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import4);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo availability inside the composite - 1", refs.length, 0);
-
- foo2.start();
- assertTrue("Test component validity", import4.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import4);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
- public void testSimple2() {
- import4.start();
- //Two providers
- assertTrue("Test component validity", import4.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import4);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- fs = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[1]);
-
- foo2.stop();
- assertTrue("Test component validity", import4.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import4);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component validity - 2", import4.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import4);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo availability inside the composite - 1", refs.length, 0);
-
- foo1.start();
- assertTrue("Test component validity", import4.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import4);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
deleted file mode 100644
index 2d89ee8..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class DelayedSimpleImport extends OSGiTestCase {
-
- ComponentInstance import1;
- Factory fooProvider;
- ComponentInstance foo1, foo2;
-
- public void setUp() {
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
- try {
- import1 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
-
- import1.stop();
-
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Cannot instantiate foo providers : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- import1.dispose();
- foo1 = null;
- foo2 = null;
- import1 = null;
- }
-
- public void testSimple() {
- import1.start();
-
- //Two providers
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.stop();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.stop();
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo2.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
- public void testSimple2() {
- import1.start();
- //Two providers
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo2.stop();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo1.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
deleted file mode 100644
index 221ecda..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class FilteredImport extends OSGiTestCase {
-
- ComponentInstance import1;
- Factory fooProvider;
- Factory fooProvider2;
-
- ComponentInstance foo1, foo2;
-
- public void setUp() {
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.5");
- try {
- import1 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
- import1.stop();
-
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- fooProvider2 = Utils.getFactoryByName(context, "COMPO-FooProviderType-2");
- assertNotNull("Check fooProvider availability", fooProvider2);
-
- Properties p1 = new Properties();
- p1.put("name", "foo1");
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo1 = fooProvider.createComponentInstance(p1);
- foo2 = fooProvider2.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Cannot instantiate foo providers : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- import1.dispose();
- foo1 = null;
- foo2 = null;
- import1 = null;
- }
-
- public void testSimple() {
- import1.start();
- //Two providers
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.stop();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.stop();
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo2.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
- public void testSimple2() {
- import1.start();
- //Two providers
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo2.stop();
- assertTrue("Test component invalidity - 1", import1.getState() == ComponentInstance.INVALID);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo1.start();
- assertTrue("Test component invalidity - 3", import1.getState() == ComponentInstance.INVALID);
-
- foo2.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/ImportTestSuite.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/ImportTestSuite.java
deleted file mode 100644
index 2f25b2c..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/ImportTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import junit.framework.Test;
-
-import org.apache.felix.ipojo.junit4osgi.OSGiTestSuite;
-import org.osgi.framework.BundleContext;
-
-public class ImportTestSuite {
-
- public static Test suite(BundleContext bc) {
- OSGiTestSuite ots = new OSGiTestSuite("Composite Import Test Suite", bc);
- ots.addTestSuite(SimpleImport.class);
- ots.addTestSuite(DelayedSimpleImport.class);
- ots.addTestSuite(OptionalImport.class);
- ots.addTestSuite(DelayedOptionalImport.class);
- ots.addTestSuite(MultipleImport.class);
- ots.addTestSuite(DelayedMultipleImport.class);
- ots.addTestSuite(OptionalMultipleImport.class);
- ots.addTestSuite(DelayedOptionalMultipleImport.class);
- ots.addTestSuite(FilteredImport.class);
- ots.addTestSuite(DelayedFilteredImport.class);
- return ots;
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
deleted file mode 100644
index c8eedce..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class MultipleImport extends OSGiTestCase {
-
- ComponentInstance import2;
- Factory fooProvider;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.2");
- try {
- import2 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- import2.dispose();
- import2 = null;
- }
-
- public void testSimple() {
- // No provider -> Invalid
- assertTrue("Test component invalidity", import2.getState() == ComponentInstance.INVALID);
-
- ComponentInstance foo = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import2);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2 ("+refs.length+")", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- FooService fs2 = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation", fs2.foo());
- sc.ungetService(refs[0]);
- sc.ungetService(refs[1]);
-
- // Stop the second provider
- foo2.dispose();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the foo provider
- foo.stop();
-
- // No provider -> Invalid
- assertTrue("Test component invalidity - 2", import2.getState() == ComponentInstance.INVALID);
-
- foo.start();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import2.getState() == ComponentInstance.INVALID);
- }
-
- public void testSimple2() {
- // No provider -> Invalid
- assertTrue("Test component invalidity", import2.getState() == ComponentInstance.INVALID);
-
- ComponentInstance foo1 = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo1 = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import2);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2 ("+refs.length+")", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- FooService fs2 = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation", fs2.foo());
- sc.ungetService(refs[0]);
- sc.ungetService(refs[1]);
-
- // Stop the first provider
- foo1.stop();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the second foo provider
- foo2.dispose();
-
- // No provider -> Invalid
- assertTrue("Test component invalidity - 2", import2.getState() == ComponentInstance.INVALID);
-
- foo1.start();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import2.getState() == ComponentInstance.INVALID);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
deleted file mode 100644
index 0fb3f89..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class OptionalImport extends OSGiTestCase {
-
- ComponentInstance import3;
- Factory fooProvider;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.3");
- try {
- import3 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- import3.dispose();
- import3 = null;
- }
-
- public void testSimple() {
- // No provider -> valid
- assertTrue("Test component invalidity", import3.getState() == ComponentInstance.VALID);
-
- ComponentInstance foo = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import3);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.dispose();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the foo provider
- foo.stop();
-
- // No provider -> Invalid
- assertTrue("Test component invalidity - 2", import3.getState() == ComponentInstance.VALID);
-
- foo.start();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import3.getState() == ComponentInstance.VALID);
- }
-
- public void testSimple2() {
- // No provider -> valid
- assertTrue("Test component invalidity", import3.getState() == ComponentInstance.VALID);
-
- ComponentInstance foo1 = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo1 = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import3);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo1.stop();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the foo provider
- foo2.dispose();
-
- // No provider -> Invalid
- assertTrue("Test component invalidity - 2", import3.getState() == ComponentInstance.VALID);
-
- foo1.start();
- assertTrue("Test component validity", import3.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import3);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import3.getState() == ComponentInstance.VALID);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
deleted file mode 100644
index a7c71b0..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class OptionalMultipleImport extends OSGiTestCase {
-
- ComponentInstance import2;
- Factory fooProvider;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.4");
- try {
- import2 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- fail("Cannot instantiate the component : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- import2.dispose();
- import2 = null;
- }
-
- public void testSimple() {
- // No provider -> valid
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
-
- ComponentInstance foo = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import2);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2 ("+refs.length+")", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- FooService fs2 = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation", fs2.foo());
- sc.ungetService(refs[0]);
- sc.ungetService(refs[1]);
-
- // Stop the second provider
- foo2.dispose();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the foo provider
- foo.stop();
-
- // No provider -> valid
- assertTrue("Test component validity - 2", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo non-availability inside the composite - 1", refs.length, 0);
-
- foo.start();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo.dispose();
- // No provider -> Invalid
- assertTrue("Test component validity - 3", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo non-availability inside the composite - 2", refs.length, 0);
- }
-
- public void testSimple2() {
- // No provider -> Invalid
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
-
- ComponentInstance foo1 = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo1 = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import2);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2 ("+refs.length+")", refs.length, 2);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- FooService fs2 = (FooService) sc.getService(refs[1]);
- assertTrue("Test foo invocation", fs2.foo());
- sc.ungetService(refs[0]);
- sc.ungetService(refs[1]);
-
- // Stop the first provider
- foo1.stop();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the second foo provider
- foo2.dispose();
-
- // No provider -> Invalid
- assertTrue("Test component validity - 2", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo non-availability inside the composite - 1", refs.length, 0);
-
- foo1.start();
- assertTrue("Test component validity", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import2.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import2);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertEquals("Test foo non-availability inside the composite - 2", refs.length, 0);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
deleted file mode 100644
index 31f2b5a..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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.ipojo.test.composite.importer;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class SimpleImport extends OSGiTestCase {
-
- ComponentInstance import1;
- Factory fooProvider;
-
- public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- assertNotNull("Check fooProvider availability", fooProvider);
-
- Properties p = new Properties();
- p.put("name", "importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
- try {
- import1 = compFact.createComponentInstance(p);
- } catch(Exception e) {
- e.printStackTrace();
- fail("Cannot instantiate the component : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- import1.dispose();
- import1 = null;
- }
-
- public void testSimple() {
- // No provider -> Invalid
- assertTrue("Test component invalidity - 0 ("+import1.getState()+")", import1.getState() == ComponentInstance.INVALID);
-
- ComponentInstance foo = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity - 1", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the second provider
- foo2.dispose();
- assertTrue("Test component validity - 2", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the foo provider
- foo.stop();
-
- // No provider -> Invalid
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo.start();
- assertTrue("Test component validity - 3", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import1.getState() == ComponentInstance.INVALID);
- }
-
- public void testSimple2() {
- // No provider -> Invalid
- assertTrue("Test component invalidity", import1.getState() == ComponentInstance.INVALID);
-
- ComponentInstance foo1 = null;
- Properties p = new Properties();
- p.put("name", "foo");
- try {
- foo1 = fooProvider.createComponentInstance(p);
- } catch(Exception e) {
- fail("Fail to instantiate the foo component " + e.getMessage());
- }
-
- ComponentInstance foo2 = null;
- Properties p2 = new Properties();
- p2.put("name", "foo2");
- try {
- foo2 = fooProvider.createComponentInstance(p2);
- } catch(Exception e) {
- fail("Fail to instantiate the foo2 component " + e.getMessage());
- }
-
- // The foo service is available => import1 must be valid
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(import1);
- ServiceReference[] refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 1", refs);
- assertEquals("Test foo availability inside the composite - 1.2", refs.length, 1);
- FooService fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // Stop the first provider
- foo1.stop();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 2", refs);
- assertEquals("Test foo availability inside the composite - 2.1 ("+refs.length+")", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- // stop the second foo provider
- foo2.dispose();
-
- // No provider -> Invalid
- assertTrue("Test component invalidity - 2", import1.getState() == ComponentInstance.INVALID);
-
- foo1.start();
- assertTrue("Test component validity", import1.getState() == ComponentInstance.VALID);
- sc = Utils.getServiceContext(import1);
- refs = Utils.getServiceReferences(sc, FooService.class.getName(), null);
- assertNotNull("Test foo availability inside the composite - 3", refs);
- assertEquals("Test foo availability inside the composite - 3.1", refs.length, 1);
- fs = (FooService) sc.getService(refs[0]);
- assertTrue("Test foo invocation", fs.foo());
- sc.ungetService(refs[0]);
-
- foo1.dispose();
- // No provider -> Invalid
- assertTrue("Test component invalidity - 3", import1.getState() == ComponentInstance.INVALID);
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
deleted file mode 100644
index 179c296..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 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.ipojo.test.composite.instance;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.architecture.InstanceDescription;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class SimpleInstance extends OSGiTestCase {
-
- private ComponentFactory fooFactory1, fooFactory2;
- private ComponentFactory compoFactory;
- private ComponentInstance empty;
-
-
- public void setUp() {
- fooFactory1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
- fooFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooProviderType-Dyn2");
- compoFactory = (ComponentFactory) Utils.getFactoryByName(context, "composite.inst.1");
- Factory fact = Utils.getFactoryByName(context, "composite.empty");
- Properties props = new Properties();
- props.put("name", "empty-X");
- try {
- empty = fact.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot create the empty composite : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- empty.dispose();
- empty = null;
- }
-
- public void testCreation() {
- Properties props = new Properties();
- props.put("name", "under-A");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- fail("Cannot instantiate under from " + compoFactory.getName() + " -> " + e.getMessage());
- }
-
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailability() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
-
- assertNotNull("Check service availability", sc.getServiceReference(FooService.class.getName()));
- assertEquals("Check service provider", Utils.getServiceReferences(sc, FooService.class.getName(), null).length, 2);
-
- under.dispose();
- }
-
- public void testCreationLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props, sc);
- } catch(Exception e) {
- e.printStackTrace();
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailabilityLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under-X");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
-
- assertNotNull("Check service availability", sc2.getServiceReference(FooService.class.getName()));
- assertEquals("Check service providers", Utils.getServiceReferences(sc2, FooService.class.getName(), null).length, 2);
-
- under.dispose();
- }
-
- public void testFactoryManagement() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- fooFactory1.stop();
- assertTrue("Check instance invalidity - 2", under.getState() == ComponentInstance.INVALID);
-
- fooFactory1.start();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
-
- fooFactory2.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
-
- fooFactory2.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fooFactory1.start();
- fooFactory2.start();
- }
-
- public void testFactoryManagementLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- fooFactory1.stop();
- assertTrue("Check instance invalidity - 2", under.getState() == ComponentInstance.INVALID);
-
- fooFactory1.start();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
-
- fooFactory2.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
-
- fooFactory2.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fooFactory1.start();
- fooFactory2.start();
- }
-
- public void atestArchitecture() { //TODO : to reactive
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = compoFactory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- ServiceReference ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- Architecture arch = (Architecture) context.getService(ref);
- InstanceDescription id = arch.getInstanceDescription();
-
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- InstanceDescription[] contained = id.getContainedInstances();
- assertEquals("Check contained instances count (" + contained.length + ")", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.INVALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 0);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
deleted file mode 100644
index 2c851ea..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.ipojo.test.composite.instantiator;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class ConfigurableInstantiation extends OSGiTestCase {
-
- private ComponentFactory acceptF;
- private ComponentFactory refuse1F;
- private ComponentFactory refuse2F;
-
- public void setUp() {
- acceptF = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.5-accept");
- refuse1F = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.5-refuse1");
- refuse2F = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.5-refuse2");
-
- }
-
- public void tearDown() { }
-
- public void testAccept() {
- Properties props = new Properties();
- props.put("name", "under-A");
- ComponentInstance under = null;
- try {
- under = acceptF.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
-
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
- ServiceReference ref = sc.getServiceReference(FooService.class.getName());
- assertNotNull("Check refs not null", ref);
- FooService foo = (FooService) sc.getService(ref);
- Properties p = foo.fooProps();
- boolean b = ((Boolean) p.get("boolProp")).booleanValue();
- String s = (String) p.get("strProp");
- int i = ( (Integer) p.get("intProp")).intValue();
- assertTrue("Test boolean", b);
- assertEquals("Test string", s, "foo");
-
- assertEquals("Test int", i, 5); // The code fix to 5.
- under.dispose();
- }
-
- public void testRefuse1() {
- Properties props = new Properties();
- props.put("name", "under-ref1");
- ComponentInstance under = null;
- try {
- under = refuse1F.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
-
- assertTrue("Check that under is not valid", under.getState() == ComponentInstance.INVALID);
-
- under.dispose();
- }
-
- public void testRefuse2() {
- Properties props = new Properties();
- props.put("name", "under-ref2");
- ComponentInstance under = null;
- try {
- under = refuse2F.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
-
- assertTrue("Check that under is not valid", under.getState() == ComponentInstance.INVALID);
-
- under.dispose();
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java
deleted file mode 100644
index 7497b3a..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/InstantiatorTestSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.ipojo.test.composite.instantiator;
-
-import junit.framework.Test;
-
-import org.apache.felix.ipojo.junit4osgi.OSGiTestSuite;
-import org.osgi.framework.BundleContext;
-
-public class InstantiatorTestSuite {
-
- public static Test suite(BundleContext bc) {
- OSGiTestSuite ots = new OSGiTestSuite("Composite Service Instantiation Test Suite", bc);
- ots.addTestSuite(SimpleInstantiation.class);
- ots.addTestSuite(OptionalInstantiation.class);
- ots.addTestSuite(MultipleInstantiation.class);
- ots.addTestSuite(OptionalMultipleInstantiation.class);
- ots.addTestSuite(ConfigurableInstantiation.class);
- return ots;
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
deleted file mode 100644
index f155add..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * 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.ipojo.test.composite.instantiator;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.architecture.InstanceDescription;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BarService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class MultipleInstantiation extends OSGiTestCase {
-
- private ComponentFactory bar2Factory;
- private ComponentInstance empty;
-
- public void setUp() {
- bar2Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.2");
- Factory fact = Utils.getFactoryByName(context, "composite.empty");
- Properties props = new Properties();
- props.put("name", "empty");
- try {
- empty = fact.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot create the empty composite : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- empty.dispose();
- empty = null;
- }
-
- public void testCreation() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailability() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc.getServiceReference(BarService.class.getName()));
- int count = Utils.getServiceReferences(sc, BarService.class.getName(), null).length;
- assertEquals("Check service provider number : " + count, count, 3);
-
- under.dispose();
- }
-
- public void testCreationLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailabilityLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc2.getServiceReference(BarService.class.getName()));
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 3);
-
- under.dispose();
- }
-
- public void testFactoryManagement() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- ServiceContext sc = Utils.getServiceContext(under);
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 2);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 1);
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 0);
-
- fact1.start();
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 1);
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
- public void testFactoryManagementLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 2);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 1);
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 0);
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 1);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
- public void testArchitecture() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- ServiceReference ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- Architecture arch = (Architecture) context.getService(ref);
- InstanceDescription id = arch.getInstanceDescription();
-
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- InstanceDescription[] contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 3);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.2");
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 2);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.2");
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.2");
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.INVALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 0);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.2");
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.2");
-
- context.ungetService(ref);
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
deleted file mode 100644
index e617d64..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * 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.ipojo.test.composite.instantiator;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.architecture.InstanceDescription;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BarService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class OptionalInstantiation extends OSGiTestCase {
-
- private ComponentFactory bar1Factory;
- private ComponentInstance empty;
-
- public void setUp() {
- bar1Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.3");
- Factory fact = Utils.getFactoryByName(context, "composite.empty");
- Properties props = new Properties();
- props.put("name", "empty");
- try {
- empty = fact.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot create the empty composite : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- empty.dispose();
- empty = null;
- }
-
- public void testCreation() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailability() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc.getServiceReference(BarService.class.getName()));
-
- under.dispose();
- }
-
- public void testCreationLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailabilityLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc2.getServiceReference(BarService.class.getName()));
-
- under.dispose();
- }
-
- public void testFactoryManagement() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
-
- fact3.stop();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
- assertNull("Check that no Bar Service is available", sc.getServiceReference(BarService.class.getName()));
-
- fact1.start();
- assertTrue("Check instance validity - 5", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
- public void testFactoryManagementLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
-
- fact3.stop();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
-
- fact1.start();
- assertTrue("Check instance validity - 5", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
- public void testArchitecture() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
-
- ServiceReference ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- Architecture arch = (Architecture) context.getService(ref);
- assertNotNull("Check architecture", arch);
- InstanceDescription id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- InstanceDescription[] contained = id.getContainedInstances();
- assertNotNull("Check contained not null", contained);
- assertEquals("Check contained instances count ("+contained.length+") - 1", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.3");
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.3");
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.3");
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 0);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.3");
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.3");
-
- context.ungetService(ref);
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
deleted file mode 100644
index a3d9351..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * 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.ipojo.test.composite.instantiator;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BarService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-
-public class OptionalMultipleInstantiation extends OSGiTestCase {
-
- private ComponentFactory bar2Factory;
- private ComponentInstance empty;
-
- public void setUp() {
- bar2Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.4");
- assertNotNull("Check bar2factory availability", bar2Factory);
-
- Factory fact = Utils.getFactoryByName(context, "composite.empty");
- Properties props = new Properties();
- props.put("name", "empty");
- try {
- empty = fact.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot create the empty composite : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- empty.dispose();
- empty = null;
- }
-
- public void testCreation() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailability() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc.getServiceReference(BarService.class.getName()));
- int count = Utils.getServiceReferences(sc, BarService.class.getName(), null).length;
- assertEquals("Check service provider number : " + count, count, 3);
-
- under.dispose();
- }
-
- public void testCreationLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailabilityLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc2.getServiceReference(BarService.class.getName()));
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 3);
-
- under.dispose();
- }
-
- public void testFactoryManagement() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- ServiceContext sc = Utils.getServiceContext(under);
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 2);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 1);
-
- fact3.stop();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 0);
-
- fact1.start();
- assertEquals("Check service provider number", Utils.getServiceReferences(sc, BarService.class.getName(), null).length, 1);
- assertTrue("Check instance validity - 5", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
- public void testFactoryManagementLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar2Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 2);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 1);
-
- fact3.stop();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 0);
-
- fact1.start();
- assertTrue("Check instance validity - 5", under.getState() == ComponentInstance.VALID);
- assertEquals("Check service provider number", Utils.getServiceReferences(sc2, BarService.class.getName(), null).length, 1);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
deleted file mode 100644
index 4430c19..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * 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.ipojo.test.composite.instantiator;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.architecture.InstanceDescription;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BarService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class SimpleInstantiation extends OSGiTestCase {
-
- private ComponentFactory bar1Factory;
- private ComponentInstance empty;
-
- public void setUp() {
- bar1Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.1");
- Factory fact = Utils.getFactoryByName(context, "composite.empty");
- Properties props = new Properties();
- props.put("name", "empty-X");
- try {
- empty = fact.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot create the empty composite : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- empty.dispose();
- empty = null;
- }
-
- public void testCreation() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailability() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc.getServiceReference(BarService.class.getName()));
-
- under.dispose();
- }
-
- public void testCreationLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- under.dispose();
- }
-
- public void testServiceAvailabilityLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under-X");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity", under.getState() == ComponentInstance.VALID);
- ServiceContext sc2 = Utils.getServiceContext(under);
- assertNotNull("Check service availability", sc2.getServiceReference(BarService.class.getName()));
-
- under.dispose();
- }
-
- public void testFactoryManagement() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
- public void testFactoryManagementLevel2() {
- ServiceContext sc = Utils.getServiceContext(empty);
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props, sc);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- assertTrue("Check instance validity - 1", under.getState() == ComponentInstance.VALID);
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
- public void testArchitecture() {
- Properties props = new Properties();
- props.put("name", "under");
- ComponentInstance under = null;
- try {
- under = bar1Factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate under : " + e.getMessage());
- }
- ServiceReference ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- Architecture arch = (Architecture) context.getService(ref);
- InstanceDescription id = arch.getInstanceDescription();
-
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- InstanceDescription[] contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- ComponentFactory fact1 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-1");
- ComponentFactory fact2 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-2");
- ComponentFactory fact3 = (ComponentFactory) Utils.getFactoryByName(context, "COMPO-FooBarProviderType-3");
-
- fact1.stop();
- assertTrue("Check instance validity - 2", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- fact2.stop();
- assertTrue("Check instance validity - 3", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- fact3.stop();
- assertTrue("Check instance invalidity", under.getState() == ComponentInstance.INVALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.INVALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 0);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- fact1.start();
- assertTrue("Check instance validity - 4", under.getState() == ComponentInstance.VALID);
- ref = Utils.getServiceReferenceByName(context, Architecture.class.getName(), "under");
- assertNotNull("Check architecture availability", ref);
- arch = (Architecture) context.getService(ref);
- id = arch.getInstanceDescription();
- assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
- contained = id.getContainedInstances();
- assertEquals("Check contained instances count", contained.length, 1);
- assertEquals("Check that no object are created" , id.getCreatedObjects().length, 0);
- assertEquals("Check instance name" , id.getName(), "under");
- assertEquals("Check component type name" , id.getComponentDescription().getName(), "composite.bar.1");
-
- under.dispose();
- fact2.start();
- fact3.start();
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/ProvidesTestSuite.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/ProvidesTestSuite.java
deleted file mode 100644
index 413ff58..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/ProvidesTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import junit.framework.Test;
-
-import org.apache.felix.ipojo.junit4osgi.OSGiTestSuite;
-import org.osgi.framework.BundleContext;
-
-public class ProvidesTestSuite {
-
- public static Test suite(BundleContext bc) {
- OSGiTestSuite ots = new OSGiTestSuite("Composite Service Providing Test Suite", bc);
- ots.addTestSuite(TestComp0.class);
- ots.addTestSuite(TestComp1.class);
- ots.addTestSuite(TestComp2.class);
- ots.addTestSuite(TestComp3.class);
- ots.addTestSuite(TestComp4.class);
- ots.addTestSuite(TestComp5.class);
- ots.addTestSuite(TestComp6.class);
- ots.addTestSuite(TestComp7.class);
- ots.addTestSuite(TestComp8.class);
-
- return ots;
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
deleted file mode 100644
index d3e26a8..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.service.Toto;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp0 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
- private ComponentFactory tataFactory2;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot create an instance : " + e.getMessage());
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- fail("Cannot create an instance : " + e.getMessage());
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-0");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- fail("Cannot create an instance : " + e.getMessage());
- }
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
- tataFactory2.start();
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertNotNull("Assert toto service - 1", context.getServiceReference(Toto.class.getName()));
- assertTrue("Assert under state - 2", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 3", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- Integer tataStr = (Integer) props.get("tataStr");
- Integer tataStrs = (Integer) props.get("tataStrs");
- Integer tata_2 = (Integer) props.get("tata_2");
- Integer tata_3 = (Integer) props.get("tata_3");
- Integer tata1 = (Integer) props.get("tata1");
- Integer tata1_1 = (Integer) props.get("tata1_1");
- Integer tata5 = (Integer) props.get("tata5");
- Integer tata5_1 = (Integer) props.get("tata5_1");
- Integer tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
- assertEquals("Assert tataStr - 3", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 3", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 3", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 3", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 3", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 3", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 3", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 3", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 3", tata5_2.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 4", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- assertEquals("Assert tataStr - 4", tataStr.intValue(), 2);
- assertEquals("Assert tataStrs - 4", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 4", tata_2.intValue(), 2);
- assertEquals("Assert tata_3 - 4", tata_3.intValue(), 2);
- assertEquals("Assert tata1 - 4", tata1.intValue(), 2);
- assertEquals("Assert tata1_1 - 4", tata1_1.intValue(), 2);
- assertEquals("Assert tata5 - 4", tata5.intValue(), 2);
- assertEquals("Assert tata5_1 - 4", tata5_1.intValue(), 2);
- assertEquals("Assert tata5_2 - 4", tata5_2.intValue(), 2);
-
- context.ungetService(ref);
- tota = null;
-
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 6", toto.intValue(), 3);
- assertEquals("Assert toto_2 - 6", toto_2.intValue(), 3);
- assertEquals("Assert toto_3 - 6", toto_3.intValue(), 3);
- assertEquals("Assert toto_4 - 6", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 6", tata.intValue(), 1);
- assertEquals("Assert tataStr - 6", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 6", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 6", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 6", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 6", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 6", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 6", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 6", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 6", tata5_2.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- totoProv.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
-
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
- private void invokeArrays(Tota tota) {
-
- int[] a = new int[] {1,2,3};
- assertEquals("Assert invoke tataint[]", tota.tataInts(a), a);
-
- long[] b = new long[] {1,2,3};
- assertEquals("Assert invoke tataLong[]", tota.tataLongs(b), b);
-
- double[] c = new double[] {1,2,3};
- assertEquals("Assert invoke tataDouble[]", tota.tataDoubles(c), c);
-
- char[] d = new char[] {'a','b', 'c'};
- assertEquals("Assert invoke tataChar[]", tota.tataChars(d), d);
-
- boolean[] e = new boolean[] {true, false};
- assertEquals("Assert invoke tataBoolean[]", tota.tataBooleans(e), e);
-
- byte[] f = new byte[] {(byte) 1};
- assertEquals("Assert invoke tataByte[]", tota.tataBytes(f), f);
-
- short[] g = new short[] {(short) 1};
- assertEquals("Assert invoke tataShort[]", tota.tataShorts(g), g);
-
- float[] h = new float[] {5,6,7};
- assertEquals("Assert invoke tataFloat[]", tota.tataFloats(h), h);
-
- }
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeTata(Tota tota) {
- tota.tata(1,2);
- tota.tata("tototototo");
- }
-
- private void invokeTata1(Tota tota) {
- assertEquals("Assert tata1", tota.tata1("foo"), "foo");
- assertEquals("Assert tata1 - 2", tota.tata1(new char[] {'a','b','c'}), "abc");
- }
-
- private void invokeTata5(Tota tota) {
- assertEquals("Assert tata5 -1", tota.tata5("foo",1), "foo"+1);
- assertEquals("Assert tata5 - 2", tota.tata5(new String[] {"a","b","c"}, 1), "31");
- assertEquals("Assert tata5 - 3", tota.tata5("foo", new int[] {1,2,3}), "foo3");
- }
-
- private void invokeAdd(Tota tota) {
- assertEquals("Assert add", tota.add(1,1,1), 3);
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- invokeArrays(tota);
- invokeStr(tota);
- invokeTata(tota);
- invokeTata1(tota);
- invokeTata5(tota);
- invokeAdd(tota);
- invokeToto(tota);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
deleted file mode 100644
index 95d64be..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp1 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
- private ComponentFactory tataFactory2;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
-
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-1");
- Properties props2 = new Properties();
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- fail("Cannot create the instance : " + e.getMessage());
- }
-
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
- tataFactory2.start();
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2 ("+under.getState()+")", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- Integer tataStr = (Integer) props.get("tataStr");
- Integer tataStrs = (Integer) props.get("tataStrs");
- Integer tata_2 = (Integer) props.get("tata_2");
- Integer tata_3 = (Integer) props.get("tata_3");
- Integer tata1 = (Integer) props.get("tata1");
- Integer tata1_1 = (Integer) props.get("tata1_1");
- Integer tata5 = (Integer) props.get("tata5");
- Integer tata5_1 = (Integer) props.get("tata5_1");
- Integer tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
- assertEquals("Assert tataStr - 3", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 3", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 3", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 3", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 3", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 3", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 3", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 3", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 3", tata5_2.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 4", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- assertEquals("Assert tataStr - 4", tataStr.intValue(), 2);
- assertEquals("Assert tataStrs - 4", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 4", tata_2.intValue(), 2);
- assertEquals("Assert tata_3 - 4", tata_3.intValue(), 2);
- assertEquals("Assert tata1 - 4", tata1.intValue(), 2);
- assertEquals("Assert tata1_1 - 4", tata1_1.intValue(), 2);
- assertEquals("Assert tata5 - 4", tata5.intValue(), 2);
- assertEquals("Assert tata5_1 - 4", tata5_1.intValue(), 2);
- assertEquals("Assert tata5_2 - 4", tata5_2.intValue(), 2);
-
- context.ungetService(ref);
- tota = null;
-
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 6", toto.intValue(), 3);
- assertEquals("Assert toto_2 - 6", toto_2.intValue(), 3);
- assertEquals("Assert toto_3 - 6", toto_3.intValue(), 3);
- assertEquals("Assert toto_4 - 6", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 6", tata.intValue(), 1);
- assertEquals("Assert tataStr - 6", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 6", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 6", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 6", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 6", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 6", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 6", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 6", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 6", tata5_2.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), under.getInstanceName()));
-
- totoProv.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), under.getInstanceName()));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
-
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
- private void invokeArrays(Tota tota) {
-
- int[] a = new int[] {1,2,3};
- assertEquals("Assert invoke tataint[]", tota.tataInts(a), a);
-
- long[] b = new long[] {1,2,3};
- assertEquals("Assert invoke tataLong[]", tota.tataLongs(b), b);
-
- double[] c = new double[] {1,2,3};
- assertEquals("Assert invoke tataDouble[]", tota.tataDoubles(c), c);
-
- char[] d = new char[] {'a','b', 'c'};
- assertEquals("Assert invoke tataChar[]", tota.tataChars(d), d);
-
- boolean[] e = new boolean[] {true, false};
- assertEquals("Assert invoke tataBoolean[]", tota.tataBooleans(e), e);
-
- byte[] f = new byte[] {(byte) 1};
- assertEquals("Assert invoke tataByte[]", tota.tataBytes(f), f);
-
- short[] g = new short[] {(short) 1};
- assertEquals("Assert invoke tataShort[]", tota.tataShorts(g), g);
-
- float[] h = new float[] {5,6,7};
- assertEquals("Assert invoke tataFloat[]", tota.tataFloats(h), h);
-
- }
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeTata(Tota tota) {
- tota.tata(1,2);
- tota.tata("tototototo");
- }
-
- private void invokeTata1(Tota tota) {
- assertEquals("Assert tata1", tota.tata1("foo"), "foo");
- assertEquals("Assert tata1 - 2", tota.tata1(new char[] {'a','b','c'}), "abc");
- }
-
- private void invokeTata5(Tota tota) {
- assertEquals("Assert tata5 -1", tota.tata5("foo",1), "foo"+1);
- assertEquals("Assert tata5 - 2", tota.tata5(new String[] {"a","b","c"}, 1), "31");
- assertEquals("Assert tata5 - 3", tota.tata5("foo", new int[] {1,2,3}), "foo3");
- }
-
- private void invokeAdd(Tota tota) {
- assertEquals("Assert add", tota.add(1,1,1), 3);
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- invokeArrays(tota);
- invokeStr(tota);
- invokeTata(tota);
- invokeTata1(tota);
- invokeTata5(tota);
- invokeAdd(tota);
- invokeToto(tota);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
deleted file mode 100644
index 763080f..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp2 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
- private ComponentFactory tataFactory2;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-2");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
- tataFactory2.start();
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2 ("+under.getState()+")", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
-
- invokeAll(tota);
-
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- Integer toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 3 (" + toto_1.intValue() + ")", toto_1.intValue(), 1);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 4 ("+toto.intValue()+")", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4 ("+toto_2.intValue()+")", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 4", toto_1.intValue(), 3);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
-
- context.ungetService(ref);
- tota = null;
-
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 6 ("+toto.intValue()+")", toto.intValue(), 3);
- assertEquals("Assert toto_2 - 6 ("+toto_2.intValue()+")", toto_2.intValue(), 3);
- assertEquals("Assert toto_3 - 6", toto_3.intValue(), 3);
- assertEquals("Assert toto_4 - 6", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 6", toto_1.intValue(), 4);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 6", tata.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- totoProv.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- tota.toto1("foo2");
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- invokeToto(tota);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
deleted file mode 100644
index 07ac5d3..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp3 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
- private ComponentFactory tataFactory2;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-3");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
- tataFactory2.start();
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2 ("+under.getState()+")", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- Integer toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 3 (" + toto_1.intValue() + ")", toto_1.intValue(), 1);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
-
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 4 ("+toto.intValue()+")", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4 ("+toto_2.intValue()+")", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 4", toto_1.intValue(), 2);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- context.ungetService(ref);
- tota = null;
-
- // Stop the factory
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- totoProv.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAllOpt(tota);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 4", tata.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- tataFactory.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- tota.toto1("foo");
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- invokeToto(tota);
- }
-
- private void invokeAllOpt(Tota tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- invokeTotoOpt(tota);
- }
-
- private void invokeTotoOpt(Tota tota) {
- try {
- tota.toto();
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
-
- try {
- tota.toto(1,2);
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- tota.toto1("foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
deleted file mode 100644
index 0d0f36c..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp4 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
- private ComponentFactory tataFactory2;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-4");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void tearDown() {
- tataFactory2.start();
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2 ("+under.getState()+")", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- Integer toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 3 (" + toto_1.intValue() + ")", toto_1.intValue(), 1);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 4 ("+toto.intValue()+")", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4 ("+toto_2.intValue()+")", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 4", toto_1.intValue(), 2);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- context.ungetService(ref);
- tota = null;
-
- // Stop the factory
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- totoProv.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAllOpt(tota);
- // Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 6", tata.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- tataFactory.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- tota.toto1("foo");
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- invokeToto(tota);
- }
-
- private void invokeAllOpt(Tota tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- invokeTotoOpt(tota);
- }
-
- private void invokeTotoOpt(Tota tota) {
- try {
- tota.toto();
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
-
- try {
- tota.toto(1,2);
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- tota.toto1("foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
deleted file mode 100644
index 7dd11f7..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp5 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
- private ComponentFactory tataFactory2;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-5");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- fail("Cannot create an instance from comp-5 : " + e.getMessage());
- }
-
- }
-
- public void tearDown() {
- tataFactory2.start();
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2 ("+under.getState()+")", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- Integer toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 3 (" + toto_1.intValue() + ")", toto_1.intValue(), 1);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 4 ("+toto.intValue()+")", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4 ("+toto_2.intValue()+")", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 4", toto_1.intValue(), 3);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- context.ungetService(ref);
- tota = null;
-
- // Stop the factory
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- totoProv.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAllOpt(tota);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- assertEquals("Assert tata - 6", tata.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- tataFactory.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
-
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- tota.toto1("foo");
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- invokeToto(tota);
- }
-
- private void invokeAllOpt(Tota tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- invokeTotoOpt(tota);
- }
-
- private void invokeTotoOpt(Tota tota) {
- try {
- tota.toto();
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
-
- try {
- tota.toto(1,2);
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- tota.toto1("foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
deleted file mode 100644
index 609c23c..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tata;
-import org.apache.felix.ipojo.test.composite.service.Toto;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp6 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
-
- tataFactory.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-6");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- ServiceReference refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- ServiceReference refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNull("Assert no toto service - 1", refToto);
- assertNull("Assert no tata service - 1", refTata);
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2 ("+under.getState()+")", under.getState() == ComponentInstance.INVALID);
- refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNull("Assert no toto service - 2", refToto);
- assertNull("Assert no tata service - 2", refTata);
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNotNull("Assert toto service - 3", refToto);
- assertNotNull("Assert tata service - 3", refTata);
- Toto toto = (Toto) context.getService(refToto);
- Tata tata = (Tata) context.getService(refTata);
-
- invokeAll(tata);
- invokeToto(toto);
-
- // Check toto
- Properties props = toto.getProps();
- Integer toto_0 = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- Integer toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 3 ("+toto_0.intValue()+")", toto_0.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 3 (" + toto_1.intValue() + ")", toto_1.intValue(), 1);
- //Check tata
- props = tata.getPropsTata();
- Integer tata_0 = (Integer) props.get("tata");
- assertEquals("Assert tata - 3", tata_0.intValue(), 1);
-
- context.ungetService(refToto);
- context.ungetService(refTata);
- toto = null;
- tata = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNotNull("Assert toto service - 4", refToto);
- assertNotNull("Assert tata service - 4", refTata);
-
- toto = (Toto) context.getService(refToto);
- tata = (Tata) context.getService(refTata);
- invokeAll(tata);
- invokeToto(toto);
-
- // Check toto
- props = toto.getProps();
- toto_0 = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- toto_1 = (Integer) props.get("toto1");
- assertEquals("Assert toto - 4 ("+toto_0.intValue()+")", toto_0.intValue(), 2);
- assertEquals("Assert toto_2 - 4 ("+toto_2.intValue()+")", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- assertEquals("Assert toto1 - 4", toto_1.intValue(), 3);
- //Check tata
- props = tata.getPropsTata();
- tata_0 = (Integer) props.get("tata");
- assertEquals("Assert tata - 4", tata_0.intValue(), 2);
- context.ungetService(refToto);
- context.ungetService(refTata);
- toto = null;
- tata = null;
-
- // Stop the factory
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNull("Assert no toto service - 5", refToto);
- assertNull("Assert no tata service - 5", refTata);
-
- totoProv2.stop();
- totoProv.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNotNull("Assert toto service - 6", refToto);
- assertNotNull("Assert tata service - 6", refTata);
- toto = (Toto) context.getService(refToto);
- tata = (Tata) context.getService(refTata);
-
- invokeAll(tata);
- invokeTotoOpt(toto);
- // Check tata
- props = tata.getPropsTata();
- tata_0 = (Integer) props.get("tata");
- assertEquals("Assert tata - 6", tata_0.intValue(), 1);
- context.ungetService(refToto);
- context.ungetService(refTata);
- toto = null;
- tata = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- tataFactory.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- refToto = Utils.getServiceReferenceByName(context, Toto.class.getName(), "ff");
- refTata = Utils.getServiceReferenceByName(context, Tata.class.getName(), "ff");
- assertNull("Assert no toto service - 7", refToto);
- assertNull("Assert no tata service - 7", refTata);
-
- under.dispose();
- under = null;
- }
-
- private void invoke(Tata tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
-
- private void invokeStr(Tata tota) {
- tota.tataStr();
- }
-
- private void invokeToto(Toto tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- tota.toto1("foo");
- }
-
- private void invokeAll(Tata tota) {
- invoke(tota);
- //invokeArrays(tota);
- invokeStr(tota);
- //invokeTata(tota);
- //invokeTata1(tota);
- //invokeTata5(tota);
- //invokeAdd(tota);
- }
-
- private void invokeTotoOpt(Toto tota) {
- try {
- tota.toto();
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
-
- try {
- tota.toto(1,2);
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
-
- try {
- tota.toto1("foo");
- fail("UnsupportedOperationException expected");
- } catch(UnsupportedOperationException e) { }
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
deleted file mode 100644
index 67a6c19..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp7 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
- private ComponentFactory tataFactory2;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-7");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- }
- tataFactory.stop();
-
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
- tataFactory2.start();
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 1);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- Integer tataStr = (Integer) props.get("tataStr");
- Integer tataStrs = (Integer) props.get("tataStrs");
- Integer tata_2 = (Integer) props.get("tata_2");
- Integer tata_3 = (Integer) props.get("tata_3");
- Integer tata1 = (Integer) props.get("tata1");
- Integer tata1_1 = (Integer) props.get("tata1_1");
- Integer tata5 = (Integer) props.get("tata5");
- Integer tata5_1 = (Integer) props.get("tata5_1");
- Integer tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
- assertEquals("Assert tataStr - 3", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 3", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 3", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 3", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 3", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 3", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 3", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 3", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 3", tata5_2.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 4", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 2);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- assertEquals("Assert tataStr - 4", tataStr.intValue(), 2);
- assertEquals("Assert tataStrs - 4", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 4", tata_2.intValue(), 2);
- assertEquals("Assert tata_3 - 4", tata_3.intValue(), 2);
- assertEquals("Assert tata1 - 4", tata1.intValue(), 2);
- assertEquals("Assert tata1_1 - 4", tata1_1.intValue(), 2);
- assertEquals("Assert tata5 - 4", tata5.intValue(), 2);
- assertEquals("Assert tata5_1 - 4", tata5_1.intValue(), 2);
- assertEquals("Assert tata5_2 - 4", tata5_2.intValue(), 2);
-
- context.ungetService(ref);
- tota = null;
-
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- assertEquals("Assert toto - 6", toto.intValue(), 3);
- assertEquals("Assert toto_2 - 6", toto_2.intValue(), 3);
- assertEquals("Assert toto_3 - 6", toto_3.intValue(), 3);
- assertEquals("Assert toto_4 - 6", toto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 6", 1, tata.intValue());
- assertEquals("Assert tataStr - 6", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 6", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 6", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 6", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 6", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 6", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 6", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 6", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 6", tata5_2.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- totoProv.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
- private void invokeArrays(Tota tota) {
-
- int[] a = new int[] {1,2,3};
- assertEquals("Assert invoke tataint[]", tota.tataInts(a), a);
-
- long[] b = new long[] {1,2,3};
- assertEquals("Assert invoke tataLong[]", tota.tataLongs(b), b);
-
- double[] c = new double[] {1,2,3};
- assertEquals("Assert invoke tataDouble[]", tota.tataDoubles(c), c);
-
- char[] d = new char[] {'a','b', 'c'};
- assertEquals("Assert invoke tataChar[]", tota.tataChars(d), d);
-
- boolean[] e = new boolean[] {true, false};
- assertEquals("Assert invoke tataBoolean[]", tota.tataBooleans(e), e);
-
- byte[] f = new byte[] {(byte) 1};
- assertEquals("Assert invoke tataByte[]", tota.tataBytes(f), f);
-
- short[] g = new short[] {(short) 1};
- assertEquals("Assert invoke tataShort[]", tota.tataShorts(g), g);
-
- float[] h = new float[] {5,6,7};
- assertEquals("Assert invoke tataFloat[]", tota.tataFloats(h), h);
-
- }
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeTata(Tota tota) {
- tota.tata(1,2);
- tota.tata("tototototo");
- }
-
- private void invokeTata1(Tota tota) {
- assertEquals("Assert tata1", tota.tata1("foo"), "foo");
- assertEquals("Assert tata1 - 2", tota.tata1(new char[] {'a','b','c'}), "abc");
- }
-
- private void invokeTata5(Tota tota) {
- assertEquals("Assert tata5 -1", tota.tata5("foo",1), "foo"+1);
- assertEquals("Assert tata5 - 2", tota.tata5(new String[] {"a","b","c"}, 1), "31");
- assertEquals("Assert tata5 - 3", tota.tata5("foo", new int[] {1,2,3}), "foo3");
- }
-
- private void invokeAdd(Tota tota) {
- assertEquals("Assert add", tota.add(1,1,1), 3);
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- invokeArrays(tota);
- invokeStr(tota);
- invokeTata(tota);
- invokeTata1(tota);
- invokeTata5(tota);
- invokeAdd(tota);
- invokeToto(tota);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
deleted file mode 100644
index f9ceb09..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * 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.ipojo.test.composite.provides;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentFactory;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.component.TotoProvider;
-import org.apache.felix.ipojo.test.composite.component.TotoProviderGlue;
-import org.apache.felix.ipojo.test.composite.service.Tota;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.ServiceReference;
-
-public class TestComp8 extends OSGiTestCase {
-
- private ComponentFactory tataFactory;
- private ComponentFactory totoFactory;
- private ComponentFactory tataFactory2;
-
- private ComponentInstance totoProv, totoProv2;
- private ComponentInstance under;
-
- public void setUp() {
- tataFactory = (ComponentFactory) Utils.getFactoryByName(context, "tata");
- totoFactory = (ComponentFactory) Utils.getFactoryByName(context, "toto");
- tataFactory2 = (ComponentFactory) Utils.getFactoryByName(context, "comp-6");
- tataFactory2.stop();
-
- Properties props = new Properties();
- props.put("name", "toto provider");
- try {
- totoProv = totoFactory.createComponentInstance(props);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- Properties props3 = new Properties();
- props3.put("name", "toto provider 2");
- try {
- totoProv2 = totoFactory.createComponentInstance(props3);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- totoProv.stop();
- totoProv2.stop();
-
- Factory factory = Utils.getFactoryByName(context, "comp-8");
- Properties props2 = new Properties();
- props2.put("name", "ff");
- try {
- under = factory.createComponentInstance(props2);
- } catch(Exception e) {
- e.printStackTrace();
- }
- tataFactory.stop();
-
- }
-
- public void tearDown() {
- tataFactory.start();
- totoProv.dispose();
- totoProv = null;
- totoProv2.dispose();
- totoProv2 = null;
- tataFactory2.start();
-
- // Reset counters
- TotoProvider.toto = 0;
- TotoProvider.toto_2 = 0;
- TotoProvider.toto_3 = 0;
- TotoProvider.toto_4 = 0;
- TotoProvider.toto1 = 0;
- TotoProviderGlue.toto = 0;
- TotoProviderGlue.toto_2 = 0;
- TotoProviderGlue.toto_3 = 0;
- TotoProviderGlue.toto_4 = 0;
- TotoProviderGlue.toto1 = 0;
- }
-
- public void testSimple() {
- // Neither factory nor instance
- assertTrue("Assert under state - 1", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 1", context.getServiceReference(Tota.class.getName()));
-
- // Start the importer
- totoProv.start();
- assertTrue("Assert under state - 2", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 2", context.getServiceReference(Tota.class.getName()));
-
- // Start the factory
- tataFactory.start();
- assertTrue("Assert under state - 3", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 3", context.getServiceReference(Tota.class.getName()));
- ServiceReference ref = context.getServiceReference(Tota.class.getName());
- Tota tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- Properties props = tota.getProps();
- Integer toto = (Integer) props.get("toto");
- Integer toto_2 = (Integer) props.get("toto_2");
- Integer toto_3 = (Integer) props.get("toto_3");
- Integer toto_4 = (Integer) props.get("toto_4");
- Integer gtoto = (Integer) props.get("gtoto");
- Integer gtoto_2 = (Integer) props.get("gtoto_2");
- Integer gtoto_3 = (Integer) props.get("gtoto_3");
- Integer gtoto_4 = (Integer) props.get("gtoto_4");
- assertEquals("Assert toto - 3 ("+toto.intValue()+")", toto.intValue(), 1);
- assertEquals("Assert toto_2 - 3", toto_2.intValue(), 1);
- assertEquals("Assert toto_3 - 3", toto_3.intValue(), 0);
- assertEquals("Assert toto_4 - 3", toto_4.intValue(), 0);
- assertEquals("Assert gtoto - 3 ("+gtoto.intValue()+")", gtoto.intValue(), 1);
- assertEquals("Assert gtoto_2 - 3", gtoto_2.intValue(), 1);
- assertEquals("Assert gtoto_3 - 3", gtoto_3.intValue(), 1);
- assertEquals("Assert gtoto_4 - 3", gtoto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- Integer tata = (Integer) props.get("tata");
- Integer tataStr = (Integer) props.get("tataStr");
- Integer tataStrs = (Integer) props.get("tataStrs");
- Integer tata_2 = (Integer) props.get("tata_2");
- Integer tata_3 = (Integer) props.get("tata_3");
- Integer tata1 = (Integer) props.get("tata1");
- Integer tata1_1 = (Integer) props.get("tata1_1");
- Integer tata5 = (Integer) props.get("tata5");
- Integer tata5_1 = (Integer) props.get("tata5_1");
- Integer tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 3", tata.intValue(), 1);
- assertEquals("Assert tataStr - 3", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 3", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 3", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 3", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 3", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 3", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 3", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 3", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 3", tata5_2.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Start a second import
- totoProv2.start();
- assertTrue("Assert under state - 4", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 4", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- gtoto = (Integer) props.get("gtoto");
- gtoto_2 = (Integer) props.get("gtoto_2");
- gtoto_3 = (Integer) props.get("gtoto_3");
- gtoto_4 = (Integer) props.get("gtoto_4");
- assertEquals("Assert toto - 4", toto.intValue(), 2);
- assertEquals("Assert toto_2 - 4", toto_2.intValue(), 2);
- assertEquals("Assert toto_3 - 4", toto_3.intValue(), 0);
- assertEquals("Assert toto_4 - 4", toto_4.intValue(), 0);
- assertEquals("Assert gtoto - 4 ("+gtoto.intValue()+")", gtoto.intValue(), 2);
- assertEquals("Assert gtoto_2 - 4", gtoto_2.intValue(), 2);
- assertEquals("Assert gtoto_3 - 4", gtoto_3.intValue(), 2);
- assertEquals("Assert gtoto_4 - 4", gtoto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 4", tata.intValue(), 2);
- assertEquals("Assert tataStr - 4", tataStr.intValue(), 2);
- assertEquals("Assert tataStrs - 4", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 4", tata_2.intValue(), 2);
- assertEquals("Assert tata_3 - 4", tata_3.intValue(), 2);
- assertEquals("Assert tata1 - 4", tata1.intValue(), 2);
- assertEquals("Assert tata1_1 - 4", tata1_1.intValue(), 2);
- assertEquals("Assert tata5 - 4", tata5.intValue(), 2);
- assertEquals("Assert tata5_1 - 4", tata5_1.intValue(), 2);
- assertEquals("Assert tata5_2 - 4", tata5_2.intValue(), 2);
-
- context.ungetService(ref);
- tota = null;
-
- tataFactory.stop();
- assertTrue("Assert under state - 5", under.getState() == ComponentInstance.INVALID);
- assertNull("Assert no tota service - 5", context.getServiceReference(Tota.class.getName()));
-
- totoProv2.stop();
- tataFactory.start();
- assertTrue("Assert under state - 6", under.getState() == ComponentInstance.VALID);
- assertNotNull("Assert tota service - 6", context.getServiceReference(Tota.class.getName()));
- ref = context.getServiceReference(Tota.class.getName());
- tota = (Tota) context.getService(ref);
- invokeAll(tota);
- // Check toto
- props = tota.getProps();
- toto = (Integer) props.get("toto");
- toto_2 = (Integer) props.get("toto_2");
- toto_3 = (Integer) props.get("toto_3");
- toto_4 = (Integer) props.get("toto_4");
- gtoto = (Integer) props.get("gtoto");
- gtoto_2 = (Integer) props.get("gtoto_2");
- gtoto_3 = (Integer) props.get("gtoto_3");
- gtoto_4 = (Integer) props.get("gtoto_4");
- assertEquals("Assert toto - 6", toto.intValue(), 3);
- assertEquals("Assert toto_2 - 6", toto_2.intValue(), 3);
- assertEquals("Assert toto_3 - 6", toto_3.intValue(), 0);
- assertEquals("Assert toto_4 - 6", toto_4.intValue(), 0);
- assertEquals("Assert gtoto - 6 ("+gtoto.intValue()+")", gtoto.intValue(), 3);
- assertEquals("Assert gtoto_2 - 6", gtoto_2.intValue(), 3);
- assertEquals("Assert gtoto_3 - 6", gtoto_3.intValue(), 3);
- assertEquals("Assert gtoto_4 - 6", gtoto_4.intValue(), 0);
- //Check tata
- props = tota.getPropsTata();
- tata = (Integer) props.get("tata");
- tataStr = (Integer) props.get("tataStr");
- tataStrs = (Integer) props.get("tataStrs");
- tata_2 = (Integer) props.get("tata_2");
- tata_3 = (Integer) props.get("tata_3");
- tata1 = (Integer) props.get("tata1");
- tata1_1 = (Integer) props.get("tata1_1");
- tata5 = (Integer) props.get("tata5");
- tata5_1 = (Integer) props.get("tata5_1");
- tata5_2 = (Integer) props.get("tata5_2");
- assertEquals("Assert tata - 6", tata.intValue(), 1);
- assertEquals("Assert tataStr - 6", tataStr.intValue(), 1);
- assertEquals("Assert tataStrs - 6", tataStrs.intValue(), 0);
- assertEquals("Assert tata_2 - 6", tata_2.intValue(), 1);
- assertEquals("Assert tata_3 - 6", tata_3.intValue(), 1);
- assertEquals("Assert tata1 - 6", tata1.intValue(), 1);
- assertEquals("Assert tata1_1 - 6", tata1_1.intValue(), 1);
- assertEquals("Assert tata5 - 6", tata5.intValue(), 1);
- assertEquals("Assert tata5_1 - 6", tata5_1.intValue(), 1);
- assertEquals("Assert tata5_2 - 6", tata5_2.intValue(), 1);
- context.ungetService(ref);
- tota = null;
-
- // Is arch exposed
- assertNotNull("Test arch", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
-
- totoProv.stop();
-
- assertTrue("Assert under state - 7", under.getState() == ComponentInstance.INVALID);
- assertNotNull("Test arch-2", Utils.getServiceReferenceByName(context, Architecture.class.getName(), "ff"));
- assertNull("Assert no tota service - 7", context.getServiceReference(Tota.class.getName()));
-
- under.dispose();
- under = null;
- }
-
-
-
- private void invoke(Tota tota) {
- tota.tata();
-
- assertEquals("Assert invoke tataint", tota.tataInt(2), 2);
- assertEquals("Assert invoke tataLong", tota.tataLong(2), 2);
- assertEquals("Assert invoke tataDouble", tota.tataDouble(2), 2);
- assertEquals("Assert invoke tataChar", tota.tataChar('a'), 'a');
- assertTrue("Assert invoke tataBoolean", tota.tataBoolean(true));
- assertEquals("Assert invoke tataByte", tota.tataByte((byte)2), 2);
- assertEquals("Assert invoke tataShort", tota.tataShort((short)5), 5);
- assertEquals("Assert invoke tataFloat", tota.tataFloat(5), 5);
-
- }
-
- private void invokeArrays(Tota tota) {
-
- int[] a = new int[] {1,2,3};
- assertEquals("Assert invoke tataint[]", tota.tataInts(a), a);
-
- long[] b = new long[] {1,2,3};
- assertEquals("Assert invoke tataLong[]", tota.tataLongs(b), b);
-
- double[] c = new double[] {1,2,3};
- assertEquals("Assert invoke tataDouble[]", tota.tataDoubles(c), c);
-
- char[] d = new char[] {'a','b', 'c'};
- assertEquals("Assert invoke tataChar[]", tota.tataChars(d), d);
-
- boolean[] e = new boolean[] {true, false};
- assertEquals("Assert invoke tataBoolean[]", tota.tataBooleans(e), e);
-
- byte[] f = new byte[] {(byte) 1};
- assertEquals("Assert invoke tataByte[]", tota.tataBytes(f), f);
-
- short[] g = new short[] {(short) 1};
- assertEquals("Assert invoke tataShort[]", tota.tataShorts(g), g);
-
- float[] h = new float[] {5,6,7};
- assertEquals("Assert invoke tataFloat[]", tota.tataFloats(h), h);
-
- }
-
- private void invokeStr(Tota tota) {
- tota.tataStr();
- }
-
- private void invokeTata(Tota tota) {
- tota.tata(1,2);
- tota.tata("tototototo");
- }
-
- private void invokeTata1(Tota tota) {
- assertEquals("Assert tata1", tota.tata1("foo"), "foo");
- assertEquals("Assert tata1 - 2", tota.tata1(new char[] {'a','b','c'}), "abc");
- }
-
- private void invokeTata5(Tota tota) {
- assertEquals("Assert tata5 -1", tota.tata5("foo",1), "foo"+1);
- assertEquals("Assert tata5 - 2", tota.tata5(new String[] {"a","b","c"}, 1), "31");
- assertEquals("Assert tata5 - 3", tota.tata5("foo", new int[] {1,2,3}), "foo3");
- }
-
- private void invokeAdd(Tota tota) {
- assertEquals("Assert add", tota.add(1,1,1), 3);
- }
-
- private void invokeToto(Tota tota) {
- tota.toto();
- assertEquals("Assert toto", tota.toto("foo"), "foo");
- tota.toto(1,2);
- }
-
- private void invokeAll(Tota tota) {
- invoke(tota);
- invokeArrays(tota);
- invokeStr(tota);
- invokeTata(tota);
- invokeTata1(tota);
- invokeTata5(tota);
- invokeAdd(tota);
- invokeToto(tota);
- }
-
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java b/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
deleted file mode 100644
index e7f73bb..0000000
--- a/ipojo/tests/tests.composite/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * 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.ipojo.test.composite.test;
-
-import java.util.Properties;
-
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.ServiceContext;
-import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
-import org.apache.felix.ipojo.test.composite.service.BazService;
-import org.apache.felix.ipojo.test.composite.service.CheckService;
-import org.apache.felix.ipojo.test.composite.service.FooService;
-import org.apache.felix.ipojo.test.composite.util.Utils;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-public class CompositeTest extends OSGiTestCase {
-
- public void testAPI() {
- Factory fact1 = Utils.getFactoryByName(context, "composite.empty");
- Properties p = new Properties();
- p.put("name", "empty-1");
- ComponentInstance empty = null;
- try {
- empty = fact1.createComponentInstance(p);
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
-
- ServiceContext sc = Utils.getServiceContext(empty);
-
- Factory fact2 = Utils.getFactoryByName(context, "composite.test.2");
- Properties props2 = new Properties();
- props2.put("name", "2"); // 2
- Factory fact3 = Utils.getFactoryByName(context, "composite.test.3");
- Properties props3 = new Properties();
- props3.put("name", "3");
- ComponentInstance comp2 = null;
- ComponentInstance comp3 = null;
- try {
- comp2 = fact2.createComponentInstance(props2, sc);
- comp3 = fact3.createComponentInstance(props3, sc);
- } catch(Throwable e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
-
- assertTrue("Test comp3", comp3.getState() == ComponentInstance.VALID);
- assertTrue("Test comp2", comp2.getState() == ComponentInstance.VALID);
-
- ServiceReference ref = null;
-
- ref = Utils.getServiceReferenceByName(sc, CheckService.class.getName(), "2"); // 2
-
- assertNotNull("Check ref", ref);
- CheckService cs = (CheckService) sc.getService(ref);
- assertTrue("Check invoke", cs.check());
-
- comp3.dispose();
- comp2.dispose();
- empty.dispose();
- }
-
- public void testInstantiator() {
- String type = "composite.instantiator";
- Factory fact = Utils.getFactoryByName(context, type);
- ComponentInstance ci = null;
- Properties p = new Properties();
- p.put("name", "mon_coeur");
- try {
- ci = fact.createComponentInstance(p);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- assertTrue("Check ci", ci.getState() == ComponentInstance.VALID);
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), "mon_coeur");
- assertNotNull("Check ref",ref);
- BazService bs = (BazService) context.getService(ref);
- assertTrue("Check invocation", bs.foo());
- context.ungetService(ref);
- ref = Utils.getServiceReferenceByName(context, FooService.class.getName(), "mon_coeur");
- assertNotNull("Check ref 2 ",ref);
- FooService fs = (FooService) context.getService(ref);
- assertTrue("Check invocation", fs.foo());
- context.ungetService(ref);
- ci.dispose();
- }
-
- public void testAPI2() {
- Factory fact1 = Utils.getFactoryByName(context, "composite.empty");
- Properties p = new Properties();
- p.put("name", "empty-2");
- ComponentInstance empty = null;
- try {
- empty = fact1.createComponentInstance(p);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- ServiceContext sc = Utils.getServiceContext(empty);
-
- Factory fact2 = Utils.getFactoryByName(sc, "composite.test.2");
- Properties props2 = new Properties();
- props2.put("name", "4");
- Factory fact3 = Utils.getFactoryByName(sc, "composite.test.3");
- Properties props3 = new Properties();
- props3.put("name", "5");
- ComponentInstance comp2 = null;
- ComponentInstance comp3 = null;
- try {
- comp2 = fact2.createComponentInstance(props2, sc);
- comp3 = fact3.createComponentInstance(props3, sc);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- assertTrue("Test comp3", comp3.getState() == ComponentInstance.VALID);
- assertTrue("Test comp2", comp2.getState() == ComponentInstance.VALID);
-
- ServiceReference ref = null;
-
- ref = Utils.getServiceReferenceByName(sc, CheckService.class.getName(), "4");
-
- assertNotNull("Check ref", ref);
- CheckService cs = (CheckService) sc.getService(ref);
- assertTrue("Check invoke", cs.check());
-
- comp3.dispose();
- comp2.dispose();
- empty.dispose();
- }
-
-
- public void testApplication() {
- Factory factory = Utils.getFactoryByName(context, "composite.test.1");
- ComponentInstance ci = null;
- Properties props = new Properties();
- props.put("name", "Test");
- try {
- ci = factory.createComponentInstance(props);
- } catch(Exception e) {
- fail("Cannot instantiate Test " + e.getMessage());
- }
-
- assertTrue("Check ci state", ci.getState() == ComponentInstance.VALID );
-
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(CheckService.class.getName(), "(instance.name=Test)");
- } catch (InvalidSyntaxException e) {
- fail("Invalid filter : " + e.getMessage());
- }
- assertNotNull("Check refs not null", refs);
- CheckService cs = (CheckService) context.getService(refs[0]);
-
- assertTrue("Check invocation", cs.check());
- ci.dispose();
-
- }
-
-}
diff --git a/ipojo/tests/tests.composite/src/main/resources/metadata.xml b/ipojo/tests/tests.composite/src/main/resources/metadata.xml
index 23636cf..49b8637 100644
--- a/ipojo/tests/tests.composite/src/main/resources/metadata.xml
+++ b/ipojo/tests/tests.composite/src/main/resources/metadata.xml
@@ -71,223 +71,37 @@
</provides>
</component>
- <!-- Composite -->
- <composite name="composite.empty" factory="true" architecture="true">
- </composite>
-
- <composite name="composite.bar.1" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService"/>
- </composite>
-
- <composite name="composite.bar.2" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService" aggregate="true"/>
- </composite>
-
- <composite name="composite.bar.3" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService" optional="true"/>
- </composite>
-
- <composite name="composite.bar.4" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.FooService" aggregate="true" optional="true"/>
- </composite>
-
- <composite name="composite.bar.5-accept" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.FooService">
- <property name="boolean" value="true"/>
- <property name="string" value="foo"/>
- <property name="strAprop" value="{foo, bar, baz}"/>
- <property name="int" value="5"/>
- </subservice>
- </composite>
-
- <composite name="composite.bar.5-refuse1" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService">
- <property name="foo" value="bar"/>
- <property name="boolean" value="true"/>
- <property name="string" value="foo"/>
- <property name="strAprop" value="{foo, bar, baz}"/>
- <property name="int" value="5"/>
- </subservice>
- </composite>
-
- <composite name="composite.bar.5-refuse2" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService">
- <property name="string" value="foo"/>
- <property name="strAprop" value="{foo, bar, baz}"/>
- </subservice>
- </composite>
-
- <composite name="composite.inst.1" factory="true" architecture="true">
- <instance component="COMPO-FooProviderType-1" /> <!-- name="FooProv" -->
- <instance component="COMPO-FooProviderType-Dyn2">
- <property name="boolean" value="true"/>
- <property name="string" value="foo"/>
- <property name="strAProp" value="{a,b,c}"/>
- </instance>
- </composite>
-
- <composite name="composite.requires.1" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.FooService" scope="composite"/>
- </composite>
-
- <composite name="composite.requires.2" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.FooService" aggregate="true" scope="composite"/>
- </composite>
-
- <composite name="composite.requires.3" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.FooService" optional="true" scope="composite"/>
- </composite>
-
- <composite name="composite.requires.4" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.FooService" optional="true" aggregate="true" scope="composite"/>
- </composite>
-
- <composite name="composite.requires.5" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.FooService" filter="(&(int=2)(long=40))" scope="composite"/>
- </composite>
-
- <component className="org.apache.felix.ipojo.test.composite.component.BazProviderType1" factory="BazProviderType" scope="composite">
- <provides/>
+ <component
+ className="org.apache.felix.ipojo.test.composite.component.BazProviderType1"
+ factory="BazProviderType" scope="composite">
+ <provides />
</component>
- <composite name="composite.export.1" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.BazService" aggregate="true" optional="true" filter="(!(instance.name=export))" scope="composite"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService"/>
- </composite>
+ <component
+ classname="org.apache.felix.ipojo.test.composite.component.TataProvider"
+ factory="tata">
+ <provides />
+ </component>
+
+ <component
+ classname="org.apache.felix.ipojo.test.composite.component.TotoProvider"
+ factory="toto" architecture="true">
+ <provides />
+ </component>
+
+ <component
+ classname="org.apache.felix.ipojo.test.composite.component.TotoProviderGlue"
+ factory="totoglue">
+ <requires field="m_toto" scope="composite" />
+ </component>
- <composite name="composite.export.2" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.BazService" scope="composite" aggregate="true" optional="true" filter="(!(instance.name=export))"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService" optional="true"/>
- </composite>
-
- <composite name="composite.export.3" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.BazService" scope="composite" aggregate="true" optional="true" filter="(!(instance.name=export))"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService" aggregate="true"/>
- </composite>
-
- <composite name="composite.export.4" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.BazService" aggregate="true" optional="true" filter="(!(instance.name=export))" scope="composite"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService" aggregate="true" optional="true"/>
- </composite>
-
- <composite name="composite.export.5" architecture="true">
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.BazService" aggregate="true" optional="true" filter="(!(instance.name=export))" scope="composite"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService" filter="(instance.name=foo1)"/>
+ <!-- Composite -->
+ <composite name="composite.empty" factory="true" architecture="true">
</composite>
<component className="org.apache.felix.ipojo.test.composite.component.Baz2CheckProvider" factory="Baz2CheckProvider" architecture="true">
<requires field="fs" scope="composite"/>
<provides/>
</component>
-
- <composite name="composite.test.3" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BazService" aggregate="true" filter="(factory.name=BazProviderType)"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService"/>
- </composite>
-
- <composite name="composite.test.2" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.CheckService" filter="(factory.name=Baz2CheckProvider)"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.CheckService"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.BazService" scope="composite"/>
- </composite>
-
- <composite name="composite.test.1" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BazService" filter="(factory.name=composite.test.3)" />
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.CheckService" filter="(factory.name=composite.test.2)"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.CheckService"/>
- </composite>
-
- <composite name="composite.instantiator" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BazService" filter="(factory.name=composite.test.3)"/>
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.FooService"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.BazService"/>
- <provides action="export" specification="org.apache.felix.ipojo.test.composite.service.FooService"/>
- </composite>
-
- <!-- Test composition provides -->
- <component classname="org.apache.felix.ipojo.test.composite.component.TataProvider" factory="tata">
- <provides/>
- </component>
-
- <component classname="org.apache.felix.ipojo.test.composite.component.TotoProvider" factory="toto" architecture="true">
- <provides/>
- </component>
-
- <component classname="org.apache.felix.ipojo.test.composite.component.TotoProviderGlue" factory="totoglue">
- <requires field="m_toto" scope="composite"/>
- </component>
-
- <composite name="comp-0" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota"/>
- </composite>
-
- <composite name="comp-1" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota">
- <delegation method="tataInt" policy="One"/>
- <delegation method="toto1" policy="All"/>
- </provides>
- </composite>
-
- <composite name="comp-2" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata" aggregate="true"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto" aggregate="true"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota">
- <delegation method="tataInt" policy="One"/>
- <delegation method="toto1" policy="All"/>
- </provides>
- </composite>
-
- <composite name="comp-3" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto" optional="true"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota">
- </provides>
- </composite>
-
- <composite name="comp-4" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto" optional="true"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota">
- <delegation method="tataInt" policy="One"/>
- <delegation method="toto1" policy="All"/>
- </provides>
- </composite>
-
- <composite name="comp-5" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata" aggregate="true"/>
- <!-- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto" aggregate ="true" optional="true"/> -->
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota">
- <delegation method="tataInt" policy="One"/>
- <delegation method="toto1" policy="All"/>
- </provides>
- </composite>
-
- <composite name="comp-6" architecture="true">
- <subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.Tata" aggregate="true"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto" aggregate="true" optional="true"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Toto">
- <delegation method="toto1" policy="All"/>
- </provides>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tata">
- <delegation method="tataInt" policy="One"/>
- </provides>
- </composite>
-
- <composite name="comp-7" architecture="true">
- <instance component="tata"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota"/>
- </composite>
-
- <composite name="comp-8" architecture="true">
- <instance component="tata"/>
- <instance component="totoglue"/>
- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto"/>
- <provides action="implement" specification="org.apache.felix.ipojo.test.composite.service.Tota"/>
- </composite>
</ipojo>