FELIX-4070 separate config for component factory tests
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1486755 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentFactoryTest.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentFactoryTest.java
index 631a921..33a9d62 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentFactoryTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentFactoryTest.java
@@ -49,6 +49,7 @@
static
{
+ descriptorFile = "/integration_test_simple_factory_components.xml";
// uncomment to enable debugging of this test class
// paxRunnerVmOption = DEBUG_VM_OPTION;
}
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationComponentFactoryTest.java b/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationComponentFactoryTest.java
index 04fe0bd..3fcb57a 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationComponentFactoryTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationComponentFactoryTest.java
@@ -53,6 +53,7 @@
static
{
NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR = true;
+ descriptorFile = "/integration_test_simple_factory_components.xml";
// uncomment to enable debugging of this test class
// paxRunnerVmOption = DEBUG_VM_OPTION;
}
diff --git a/scr/src/test/resources/integration_test_simple_components.xml b/scr/src/test/resources/integration_test_simple_components.xml
index 905275d..3907051 100644
--- a/scr/src/test/resources/integration_test_simple_components.xml
+++ b/scr/src/test/resources/integration_test_simple_components.xml
@@ -121,63 +121,5 @@
</service>
</scr:component>
- <!-- Component Factory Instances -->
- <scr:component name="factory.component"
- enabled="false"
- factory="factory.component.factory" >
- <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
- </scr:component>
-
- <!-- Component Factory Instances, requiring configuration -->
- <scr:component name="factory.component.configuration"
- enabled="false"
- configuration-policy="require"
- factory="factory.component.factory.configuration" >
- <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
- </scr:component>
-
- <!-- Component Factory Instances, requiring configuration -->
- <scr:component name="factory.component.reference"
- enabled="false"
- configuration-policy="ignore"
- factory="factory.component.factory.reference" >
- <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
- <reference
- name="ref"
- interface="org.apache.felix.scr.integration.components.SimpleService"
- cardinality="1..n"
- policy="static"
- bind="bindSimpleService"
- unbind="unbindSimpleService"
- target="(filterprop=required)"
- />
- </scr:component>
-
- <!-- Component Factory Instances, instance is referred to by another component -->
- <scr:component name="factory.component.referred"
- enabled="false"
- factory="factory.component.factory.referred" >
- <implementation class="org.apache.felix.scr.integration.components.SimpleServiceImpl" />
- <service>
- <provide interface="org.apache.felix.scr.integration.components.SimpleService" />
- </service>
- </scr:component>
-
- <!-- component has a reference to service created by the factory.component.referred factory component-->
- <scr:component name="ComponentReferringToFactoryObject"
- enabled="false"
- immediate="true">
- <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
- <property name="service.pid" value="ComponentReferringToFactoryObject" />
- <reference
- name="ref"
- interface="org.apache.felix.scr.integration.components.SimpleService"
- cardinality="1..1"
- policy="dynamic"
- bind="bindSimpleService"
- unbind="unbindSimpleService"
- target="(service.pid=myFactoryInstance)"
- />
- </scr:component>
</components>
diff --git a/scr/src/test/resources/integration_test_simple_factory_components.xml b/scr/src/test/resources/integration_test_simple_factory_components.xml
new file mode 100644
index 0000000..e81acaf
--- /dev/null
+++ b/scr/src/test/resources/integration_test_simple_factory_components.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
+
+ <!-- Component Factory Instances -->
+ <scr:component name="factory.component"
+ enabled="false"
+ factory="factory.component.factory" >
+ <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
+ </scr:component>
+
+ <!-- Component Factory Instances, requiring configuration -->
+ <scr:component name="factory.component.configuration"
+ enabled="false"
+ configuration-policy="require"
+ factory="factory.component.factory.configuration" >
+ <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
+ </scr:component>
+
+ <!-- Component Factory Instances, requiring configuration -->
+ <scr:component name="factory.component.reference"
+ enabled="false"
+ configuration-policy="ignore"
+ factory="factory.component.factory.reference" >
+ <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
+ <reference
+ name="ref"
+ interface="org.apache.felix.scr.integration.components.SimpleService"
+ cardinality="1..n"
+ policy="static"
+ bind="bindSimpleService"
+ unbind="unbindSimpleService"
+ target="(filterprop=required)"
+ />
+ </scr:component>
+
+ <!-- Component Factory Instances, instance is referred to by another component -->
+ <scr:component name="factory.component.referred"
+ enabled="false"
+ factory="factory.component.factory.referred" >
+ <implementation class="org.apache.felix.scr.integration.components.SimpleServiceImpl" />
+ <service>
+ <provide interface="org.apache.felix.scr.integration.components.SimpleService" />
+ </service>
+ </scr:component>
+
+ <!-- component has a reference to service created by the factory.component.referred factory component-->
+ <scr:component name="ComponentReferringToFactoryObject"
+ enabled="false"
+ immediate="true">
+ <implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
+ <property name="service.pid" value="ComponentReferringToFactoryObject" />
+ <reference
+ name="ref"
+ interface="org.apache.felix.scr.integration.components.SimpleService"
+ cardinality="1..1"
+ policy="dynamic"
+ bind="bindSimpleService"
+ unbind="unbindSimpleService"
+ target="(service.pid=myFactoryInstance)"
+ />
+ </scr:component>
+
+</components>