Renamed ArtifactType to ArchiveType

forge · Sep 24, 2014 · aa761de · aa761de
1 parent 077d3ea
commit aa761de
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/...orge/arquillian/command/ArtifactType.java → ...forge/arquillian/command/ArchiveType.java b/...orge/arquillian/command/ArtifactType.java → ...forge/arquillian/command/ArchiveType.java
@@ -10,18 +10,19 @@
 import org.jboss.forge.roaster.model.util.Types;
 
 /**
+ * The Archive type to be generated in the tests
  * 
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
-public enum ArtifactType
+public enum ArchiveType
 {
    JAR("org.jboss.shrinkwrap.api.spec.JavaArchive"),
    WAR("org.jboss.shrinkwrap.api.spec.WebArchive");
 
    private final String className;
    private final String simpleClassName;
 
-   private ArtifactType(String className)
+   private ArchiveType(String className)
    {
       this.className = className;
       this.simpleClassName = Types.toSimpleName(className);

diff --git a/src/main/java/org/jboss/forge/arquillian/command/CreateTestCommand.java b/src/main/java/org/jboss/forge/arquillian/command/CreateTestCommand.java
@@ -68,8 +68,8 @@ public class CreateTestCommand extends AbstractProjectCommand implements UIComma
    private UIInput<Boolean> enableJPA;
 
    @Inject
-   @WithAttributes(shortName = 'a', label = "Artifact Type", defaultValue = "JAR")
-   private UISelectOne<ArtifactType> artifactType;
+   @WithAttributes(shortName = 'a', label = "Archive Type", defaultValue = "JAR")
+   private UISelectOne<ArchiveType> archiveType;
 
    @Override
    public UICommandMetadata getMetadata(UIContext context)
@@ -83,7 +83,7 @@ public UICommandMetadata getMetadata(UIContext context)
    @Override
    public void initializeUI(final UIBuilder builder) throws Exception
    {
-      builder.add(targets).add(enableJPA).add(artifactType);
+      builder.add(targets).add(enableJPA).add(archiveType);
 
       Project project = getSelectedProject(builder);
       final List<JavaClassSource> sources = new ArrayList<>();
@@ -139,7 +139,7 @@ public Result execute(UIExecutionContext context) throws Exception
       for (JavaClassSource clazz : targets.getValue())
       {
          JavaResource test = createTest(getSelectedProject(context), clazz, enableJPA.getValue(),
-                  artifactType.getValue());
+                  archiveType.getValue());
          resources.add(test);
          results.add(Results.success("Created test class " + test.getJavaType().getQualifiedName()));
       }
@@ -160,7 +160,7 @@ protected ProjectFactory getProjectFactory()
       return projectFactory;
    }
 
-   private JavaResource createTest(Project project, JavaClassSource classUnderTest, boolean enableJPA, ArtifactType type)
+   private JavaResource createTest(Project project, JavaClassSource classUnderTest, boolean enableJPA, ArchiveType type)
             throws FileNotFoundException
    {
       final TestFrameworkFacet testFrameworkFacet = project.getFacet(TestFrameworkFacet.class);
@@ -175,15 +175,15 @@ private JavaResource createTest(Project project, JavaClassSource classUnderTest,
       return java.saveTestJavaSource(testClass);
    }
 
-   private VelocityContext initializeVelocityContext(boolean enableJPA, ArtifactType type, JavaSource<?> javaSource)
+   private VelocityContext initializeVelocityContext(boolean enableJPA, ArchiveType type, JavaSource<?> javaSource)
    {
       VelocityContext context = new VelocityContext();
       context.put("package", javaSource.getPackage());
       context.put("ClassToTest", javaSource.getName());
       context.put("classToTest", javaSource.getName().toLowerCase());
       context.put("packageImport", javaSource.getPackage());
       context.put("enableJPA", enableJPA);
-      context.put("artifactType", type);
+      context.put("archiveType", type);
       return context;
    }
 }
diff --git a/src/main/resources/JUnitTest.vtl b/src/main/resources/JUnitTest.vtl
@@ -5,7 +5,7 @@ import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import ${artifactType.className};
+import ${archiveType.className};
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.junit.Assert;
 import org.junit.Test;
@@ -20,8 +20,8 @@ public class ${ClassToTest}Test {
     private ${ClassToTest} ${classToTest};
 
     @Deployment
-    public static ${artifactType.simpleClassName} createDeployment() {
-        return ShrinkWrap.create(${artifactType.simpleClassName}.class)
+    public static ${archiveType.simpleClassName} createDeployment() {
+        return ShrinkWrap.create(${archiveType.simpleClassName}.class)
                 .addClass(${ClassToTest}.class)
                 #if($enableJPA)
                 .addAsManifestResource("META-INF/persistence.xml", "persistence.xml")

diff --git a/src/main/resources/TestNGTest.vtl b/src/main/resources/TestNGTest.vtl
@@ -6,7 +6,7 @@ import org.jboss.arquillian.container.test.api.Deployment;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import ${artifactType.className};
+import ${archiveType.className};
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.arquillian.testng.Arquillian;
 
@@ -17,8 +17,8 @@ public class ${ClassToTest}Test extends Arquillian {
     private ${ClassToTest} ${classToTest};
 
     @Deployment 
-    public static ${artifactType.simpleClassName} createDeployment() {
-        return ShrinkWrap.create(${artifactType.simpleClassName}.class)
+    public static ${archiveType.simpleClassName} createDeployment() {
+        return ShrinkWrap.create(${archiveType.simpleClassName}.class)
                 .addClass(${ClassToTest}.class)
                 #if($enableJPA)
                 .addAsManifestResource("META-INF/persistence.xml", "persistence.xml")