[MAINTENANCE] Refactor tests in BMP

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1810274 13f79535-47bb-0310-9956-ffa450edef68

blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBeanAsService.java → blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java

@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.test;
+package org.apache.aries.blueprint.plugin.test.osgiserviceprovider;
 
+import org.apache.aries.blueprint.plugin.test.MyProduced;
+import org.apache.aries.blueprint.plugin.test.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.ops4j.pax.cdi.api.Properties;
 import org.ops4j.pax.cdi.api.Property;
@@ -33,21 +35,21 @@ public class MyFactoryBeanAsService {
     @Named("producedForService")
     @OsgiServiceProvider
     public MyProduced createBeanWithServiceExpose1() {
-        return new MyProduced("My message");
+        return null;
     }
 
     @Produces
     @Named("producedForServiceWithOneInterface")
     @OsgiServiceProvider(classes = MyProduced.class)
     public MyProduced createBeanWithServiceExpose2() {
-        return new MyProduced("My message");
+        return null;
     }
 
     @Produces
     @Named("producedForServiceWithTwoInterfaces")
     @OsgiServiceProvider(classes = {MyProduced.class, ServiceA.class})
     public MyProduced createBeanWithServiceExpose3() {
-        return new MyProduced("My message");
+        return null;
     }
 
     @Produces
@@ -59,6 +61,6 @@ public MyProduced createBeanWithServiceExpose3() {
         @Property(name = "service.ranking", value = "100")
     })
     public MyProduced createBeanWithServiceExpose4() {
-        return new MyProduced("My message");
+        return null;
     }
 }

blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithRanking.java → blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java

@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.test;
+package org.apache.aries.blueprint.plugin.test.osgiserviceprovider;
 
+import org.apache.aries.blueprint.plugin.test.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.ops4j.pax.cdi.api.Properties;
 import org.ops4j.pax.cdi.api.Property;

blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithTypedParameters.java → blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.blueprint.plugin.test;
+package org.apache.aries.blueprint.plugin.test.osgiserviceprovider;
 
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.ops4j.pax.cdi.api.Properties;