FELIX-4401 fix tests and test assumptions

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1602640 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 2b5c631..29bad0c 100644
--- a/scr/src/test/resources/integration_test_FELIX_4188_1.xml
+++ b/scr/src/test/resources/integration_test_FELIX_4188_1.xml
@@ -14,7 +14,7 @@
 		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>
+            <provide interface="org.apache.felix.scr.integration.components.felix4188.Felix4188Component"/>
         </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 8eccbf7..ef8bbad 100644
--- a/scr/src/test/resources/integration_test_FELIX_4188_2.xml
+++ b/scr/src/test/resources/integration_test_FELIX_4188_2.xml
@@ -14,7 +14,7 @@
 		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>
+            <provide interface="org.apache.felix.scr.integration.components.felix4188.Felix4188Component"/>
         </service>
 	</scr:component>
 </components>
diff --git a/scr/src/test/resources/integration_test_component_concurrency.xml b/scr/src/test/resources/integration_test_component_concurrency.xml
index 3f1dfe8..aeb7c7f 100644
--- a/scr/src/test/resources/integration_test_component_concurrency.xml
+++ b/scr/src/test/resources/integration_test_component_concurrency.xml
@@ -12,7 +12,7 @@
 <components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
 	<scr:component
 		name='org.apache.felix.scr.integration.components.concurrency.A'
-		factory='AFactory' activate='start' enabled='false'>
+		factory='AFactory' activate='start'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.concurrency.A' />
 		<reference name='b'