FELIX-4401 Initial refactoring of integration tests to use ServiceComponentRuntime. Does not include factory component tests which do not compile
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1602633 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/test/resources/integration_test_FELIX_4188_1.xml b/scr/src/test/resources/integration_test_FELIX_4188_1.xml
index aa69698..2b5c631 100644
--- a/scr/src/test/resources/integration_test_FELIX_4188_1.xml
+++ b/scr/src/test/resources/integration_test_FELIX_4188_1.xml
@@ -13,5 +13,8 @@
<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
name='org.apache.felix.scr.integration.components.Felix4188Component-1' activate='start' deactivate='stop'>
<implementation class="org.apache.felix.scr.integration.components.felix4188.Felix4188Component" />
+ <service>
+ <provide>org.apache.felix.scr.integration.components.felix4188.Felix4188Component</provide>
+ </service>
</scr:component>
</components>
diff --git a/scr/src/test/resources/integration_test_FELIX_4188_2.xml b/scr/src/test/resources/integration_test_FELIX_4188_2.xml
index 99eec1d..8eccbf7 100644
--- a/scr/src/test/resources/integration_test_FELIX_4188_2.xml
+++ b/scr/src/test/resources/integration_test_FELIX_4188_2.xml
@@ -13,5 +13,8 @@
<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
name='org.apache.felix.scr.integration.components.Felix4188Component-2' activate='start' deactivate='stop'>
<implementation class="org.apache.felix.scr.integration.components.felix4188.Felix4188Component" />
+ <service>
+ <provide>org.apache.felix.scr.integration.components.felix4188.Felix4188Component</provide>
+ </service>
</scr:component>
</components>
diff --git a/scr/src/test/resources/integration_test_simple_components_location.xml b/scr/src/test/resources/integration_test_simple_components_location.xml
index 072c8a6..076f0c2 100644
--- a/scr/src/test/resources/integration_test_simple_components_location.xml
+++ b/scr/src/test/resources/integration_test_simple_components_location.xml
@@ -21,11 +21,11 @@
<!-- component requires configuration -->
<scr:component name="SimpleComponent.configuration.require"
- enabled="false"
+ enabled="true"
configuration-policy="require"
modified="modified" >
<implementation class="org.apache.felix.scr.integration.components.SimpleComponent" />
- <property name="service.pid" value="SimpleComponent.configuration.require" />
+ <!-- <property name="service.pid" value="SimpleComponent.configuration.require" /> -->
</scr:component>
</components>