[MAINTENANCE] Refactor tests in BMP

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1810275 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 1, 2017 · 64c6c0b · 64c6c0b
1 parent 9ba6af3
commit 64c6c0b
Show file tree

Hide file tree

Showing 31 changed files with 45 additions and 36 deletions.
diff --git a/...maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java b/...maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
@@ -23,9 +23,9 @@
 import org.apache.aries.blueprint.plugin.model.TransactionalDef;
 import org.apache.aries.blueprint.plugin.test.MyBean1;
 import org.apache.aries.blueprint.plugin.test.MyProduced;
-import org.apache.aries.blueprint.plugin.test.ServiceA;
-import org.apache.aries.blueprint.plugin.test.ServiceB;
-import org.apache.aries.blueprint.plugin.test.ServiceD;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceD;
 import org.apache.aries.blueprint.plugin.test.bean.BasicBean;
 import org.apache.aries.blueprint.plugin.test.bean.BeanWithCallbackMethods;
 import org.apache.aries.blueprint.plugin.test.bean.NamedBean;

diff --git a/...nt-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java b/...nt-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java
@@ -23,8 +23,8 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceUnit;
 
-import org.apache.aries.blueprint.plugin.test.ServiceA;
-import org.apache.aries.blueprint.plugin.test.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 

diff --git a/...nt-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java b/...nt-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java
@@ -18,6 +18,8 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 import org.ops4j.pax.cdi.api.OsgiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java b/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java
@@ -21,6 +21,8 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java b/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
@@ -19,6 +19,9 @@
 package org.apache.aries.blueprint.plugin.test;
 
 import org.apache.aries.blueprint.plugin.AnnotatedService;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC;
 import org.ops4j.pax.cdi.api.OsgiService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.DependsOn;

diff --git a/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java b/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
@@ -18,6 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.springframework.context.annotation.DependsOn;
 
 import javax.inject.Named;

diff --git a/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java b/.../blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java
@@ -18,6 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceD;
 import org.ops4j.pax.cdi.api.OsgiService;
 
 import javax.inject.Singleton;

diff --git a/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java b/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
@@ -18,6 +18,8 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC;
 import org.ops4j.pax.cdi.api.OsgiService;
 import org.springframework.beans.factory.annotation.Value;
 

diff --git a/...ueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java b/...ueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
@@ -18,6 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.springframework.context.annotation.Lazy;
 
 import javax.inject.Inject;

diff --git a/...lugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java b/...lugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java
@@ -18,6 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiService;
 
 import javax.inject.Inject;

diff --git a/...ueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java b/...ueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java
@@ -25,6 +25,7 @@
 import javax.persistence.PersistenceUnit;
 import javax.transaction.Transactional;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class ParentBean {

diff --git a/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java b/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java
@@ -20,6 +20,8 @@
 
 import javax.inject.Singleton;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 
 @Singleton

diff --git a/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java b/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java
@@ -18,6 +18,8 @@
  */
 package org.apache.aries.blueprint.plugin.test;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
+
 import javax.inject.Named;
 
 @Named("my1")

diff --git a/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java b/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java
@@ -21,6 +21,7 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.springframework.beans.factory.annotation.Value;
 

diff --git a/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java b/...rint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java
@@ -20,6 +20,7 @@
 
 import javax.inject.Singleton;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 
 @Singleton

diff --git a/...en-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java b/...en-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java
@@ -19,6 +19,7 @@
 package org.apache.aries.blueprint.plugin.test;
 
 import org.apache.aries.blueprint.plugin.AnnotatedService;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 
 import javax.inject.Singleton;
 

diff --git a/...-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java b/...-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java
@@ -21,11 +21,13 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 import org.ops4j.pax.cdi.api.OsgiService;
 
 public class ServiceReferencesParent
 {
-    @Inject @OsgiService(filter="(type=B1)") ServiceB serviceB;
+    @Inject @OsgiService(filter="(type=B1)")
+    ServiceB serviceB;
 
     @Named("serviceB2Id") @Inject @OsgiService(filter="(type=B2)") ServiceB serviceB2;
 

diff --git a/...rg/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java b/...rg/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
@@ -6,9 +6,9 @@
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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
@@ -19,28 +19,16 @@
 package org.apache.aries.blueprint.plugin.test.cditransactional;
 
 import org.apache.aries.blueprint.plugin.test.ParentBean;
-import org.springframework.context.annotation.Lazy;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Singleton;
 import javax.transaction.cdi.Transactional;
 import javax.transaction.cdi.Transactional.TxType;
 
 @Singleton
-@Transactional(value=TxType.REQUIRES_NEW)
-@Lazy
+@Transactional(value = TxType.REQUIRES_NEW)
 public class CdiTransactionalAnnotatedBean extends ParentBean {
 
-    public void overridenInit() {
-        // By overriding the method and removing the annotation, this method has lost its
-        // @PostConstruct method because it isn't @Inherited
-    }
-
-    @PostConstruct
-    public void init() {
-
-    }
-
     @Transactional(TxType.NOT_SUPPORTED)
     public void txNotSupported() {
     }

diff --git a/...org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java b/...org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
@@ -20,7 +20,6 @@
 
 import org.apache.aries.blueprint.annotation.config.ConfigProperties;
 import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor;
-import org.ops4j.pax.cdi.api.OsgiService;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;

diff --git a/...aries/blueprint/plugin/test/ServiceA.java → ...rint/plugin/test/interfaces/ServiceA.java b/...aries/blueprint/plugin/test/ServiceA.java → ...rint/plugin/test/interfaces/ServiceA.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.interfaces;
 
 public interface ServiceA {
 

diff --git a/...aries/blueprint/plugin/test/ServiceB.java → ...rint/plugin/test/interfaces/ServiceB.java b/...aries/blueprint/plugin/test/ServiceB.java → ...rint/plugin/test/interfaces/ServiceB.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.interfaces;
 
 public interface ServiceB {
 

diff --git a/...aries/blueprint/plugin/test/ServiceC.java → ...rint/plugin/test/interfaces/ServiceC.java b/...aries/blueprint/plugin/test/ServiceC.java → ...rint/plugin/test/interfaces/ServiceC.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.interfaces;
 
 public interface ServiceC {
 

diff --git a/...aries/blueprint/plugin/test/ServiceD.java → ...rint/plugin/test/interfaces/ServiceD.java b/...aries/blueprint/plugin/test/ServiceD.java → ...rint/plugin/test/interfaces/ServiceD.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.interfaces;
 
 public interface ServiceD {
 }
diff --git a/...va/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java b/...va/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java
@@ -19,7 +19,7 @@
 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.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.ops4j.pax.cdi.api.Properties;
 import org.ops4j.pax.cdi.api.Property;

diff --git a/...t/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java b/...t/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java
@@ -18,7 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.test.osgiserviceprovider;
 
-import org.apache.aries.blueprint.plugin.test.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 import org.ops4j.pax.cdi.api.Properties;
 import org.ops4j.pax.cdi.api.Property;

diff --git a/...g/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java b/...g/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java
@@ -21,7 +21,7 @@
 import com.google.inject.Singleton;
 import org.apache.aries.blueprint.annotation.referencelistener.Cardinality;
 import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener;
-import org.apache.aries.blueprint.plugin.test.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 
 import javax.inject.Named;
 

diff --git a/...lueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java b/...lueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java
@@ -20,9 +20,8 @@
 
 import org.apache.aries.blueprint.annotation.referencelistener.Cardinality;
 import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener;
-import org.apache.aries.blueprint.plugin.test.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 
-import javax.inject.Named;
 import javax.inject.Singleton;
 
 @ReferenceListener(referenceInterface = ServiceA.class, cardinality = Cardinality.MULTIPLE,

diff --git a/...a/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java b/...a/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java
@@ -22,7 +22,7 @@
 import org.apache.aries.blueprint.annotation.referencelistener.Bind;
 import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener;
 import org.apache.aries.blueprint.annotation.referencelistener.Unbind;
-import org.apache.aries.blueprint.plugin.test.ServiceA;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA;
 
 import javax.inject.Singleton;
 

diff --git a/...a/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java b/...a/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java
@@ -21,7 +21,7 @@
 import org.apache.aries.blueprint.annotation.referencelistener.Availability;
 import org.apache.aries.blueprint.annotation.referencelistener.Cardinality;
 import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener;
-import org.apache.aries.blueprint.plugin.test.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Named;

diff --git a/.../org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java b/.../org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java
@@ -20,7 +20,7 @@
 
 import org.apache.aries.blueprint.annotation.referencelistener.Bind;
 import org.apache.aries.blueprint.annotation.referencelistener.Unbind;
-import org.apache.aries.blueprint.plugin.test.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 
 public class ReferenceListenerToProduce {
     @Bind

diff --git a/.../blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java b/.../blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java
@@ -18,7 +18,7 @@
  */
 package org.apache.aries.blueprint.plugin.test.referencelistener;
 
-import org.apache.aries.blueprint.plugin.test.ServiceB;
+import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB;
 
 public class ReferenceListenerToProduceWithoutAnnotation {
     public void addMe(ServiceB serviceB) {