Simplifies AddPackage repeatable annotation

forge · Jan 24, 2017 · 600ba8b · 600ba8b
1 parent 522b830
commit 600ba8b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 41 deletions.
diff --git a/src/test/java/test/integration/JUnitTestGenerationIntegrationTest.java b/src/test/java/test/integration/JUnitTestGenerationIntegrationTest.java
@@ -13,7 +13,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.integration.extension.AddDependencies;
-import test.integration.extension.AddPackages;
+import test.integration.extension.AddPackage;
 import test.integration.support.ShellTestTemplate;
 
 import javax.inject.Inject;
@@ -22,7 +22,7 @@
 
 @RunWith(Arquillian.class)
 @AddDependencies("org.assertj:assertj-core")
-@AddPackages(ShellTestTemplate.PACKAGE_NAME)
+@AddPackage(ShellTestTemplate.PACKAGE_NAME)
 public class JUnitTestGenerationIntegrationTest extends ShellTestTemplate {
 
    @Test

diff --git a/src/test/java/test/integration/TestNGTestGenerationIntegrationTest.java b/src/test/java/test/integration/TestNGTestGenerationIntegrationTest.java
@@ -14,7 +14,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.integration.extension.AddDependencies;
-import test.integration.extension.AddPackages;
+import test.integration.extension.AddPackage;
 import test.integration.support.ShellTestTemplate;
 import test.integration.support.assertions.ProjectAssert;
 
@@ -24,8 +24,8 @@
 
 @RunWith(Arquillian.class)
 @AddDependencies("org.assertj:assertj-core")
-@AddPackages(value = ShellTestTemplate.PACKAGE_NAME, recursive = false)
-@AddPackages(containing = ProjectAssert.class)
+@AddPackage(value = ShellTestTemplate.PACKAGE_NAME, recursive = false)
+@AddPackage(containing = ProjectAssert.class)
 public class TestNGTestGenerationIntegrationTest extends ShellTestTemplate {
 
     @Test

diff --git a/src/test/java/test/integration/extension/AddPackage.java b/src/test/java/test/integration/extension/AddPackage.java
@@ -0,0 +1,28 @@
+package test.integration.extension;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(AddPackages.class)
+public @interface AddPackage {
+
+    /**
+     * Fully qualified package name to be automatically added, Can be used interchangeable with {@link #containing()}. Does take precedence.
+     */
+    String value() default "";
+
+    /**
+     * Class defining a root package. Can be used interchangeable with {@link #value()}. Does not take precedence
+     */
+    Class<?> containing() default AddPackage.class;
+
+    /**
+     * Indicates if sub-packages should also be added
+     */
+    boolean recursive() default true;
+}
diff --git a/src/test/java/test/integration/extension/AddPackages.java b/src/test/java/test/integration/extension/AddPackages.java
@@ -1,28 +1,14 @@
 package test.integration.extension;
 
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@Repeatable(AddPackagesGroup.class)
 public @interface AddPackages {
 
-    /**
-     * List of packages to be automatically added, Can be used interchangeable with {@link #containing()}. Does take precedence.
-     */
-    String[] value() default "";
+    AddPackage[] value();
 
-    /**
-     * Class defining a root package. Can be used interchangeable with {@link #value()}. Does not take precedence
-     */
-    Class<?>[] containing() default AddPackages.class;
-
-    /**
-     * Indicates if sub-packages should also be added
-     */
-    boolean recursive() default true;
 }
diff --git a/src/test/java/test/integration/extension/AddPackagesGroup.java b/src/test/java/test/integration/extension/AddPackagesGroup.java
diff --git a/src/test/java/test/integration/extension/PackagesArchiveProcessor.java b/src/test/java/test/integration/extension/PackagesArchiveProcessor.java
@@ -6,31 +6,30 @@
 import org.jboss.shrinkwrap.api.container.ClassContainer;
 
 /**
- * Adds packages defined using {@link AddPackages} annotation. 
+ * Adds packages defined using {@link AddPackage} annotation.
  */
 public class PackagesArchiveProcessor implements ApplicationArchiveProcessor {
 
     @Override
     public void process(Archive<?> applicationArchive, TestClass testClass) {
         if (canEnhanceWithPackages(applicationArchive, testClass)) {
-            final AddPackages[] packages = testClass.getJavaClass().getAnnotationsByType(AddPackages.class);
-            for (AddPackages pkg : packages) {
+            final AddPackage[] packages = testClass.getJavaClass().getAnnotationsByType(AddPackage.class);
+            for (AddPackage pkg : packages) {
                 ((ClassContainer) applicationArchive).addPackages(pkg.recursive(), getPackages(pkg));
             }
         }
-
     }
 
-    private String[] getPackages(AddPackages pkg) {
-        if (pkg.value().length == 1 && pkg.value()[0].isEmpty()) {
-            return new String[]{pkg.containing().getPackage().getName()};
+    private String getPackages(AddPackage pkg) {
+        if (pkg.value().isEmpty()) {
+            return pkg.containing().getPackage().getName();
         }
 
         return pkg.value();
     }
 
     private boolean canEnhanceWithPackages(Archive<?> applicationArchive, TestClass testClass) {
         return (applicationArchive instanceof ClassContainer)
-                && testClass.getJavaClass().getAnnotationsByType(AddPackages.class).length > 0;
+                && testClass.getJavaClass().getAnnotationsByType(AddPackage.class).length > 0;
     }
 }