[jboss-svn-commits] JBoss Common SVN: r3709 - in arquillian/trunk: impl-base/src/main/java/org/jboss/arquillian/impl and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Nov 15 09:46:37 EST 2009
Author: aslak
Date: 2009-11-15 09:46:37 -0500 (Sun, 15 Nov 2009)
New Revision: 3709
Added:
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArchiveGenerator.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArchiveGenerator.java
Removed:
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Artifact.java
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactGenerator.java
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactType.java
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ExpectedException.java
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Packaging.java
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/PackagingType.java
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ResourceDescriptor.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArtifactGenerator.java
Modified:
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/NullArtifactGenerator.java
arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/Arquillian.java
Log:
ARQ-20 Removed unused classes, renamed to match ShrinkWrap names
Copied: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArchiveGenerator.java (from rev 3684, arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactGenerator.java)
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArchiveGenerator.java (rev 0)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArchiveGenerator.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -0,0 +1,10 @@
+package org.jboss.arquillian.api;
+
+import org.jboss.shrinkwrap.api.Archive;
+
+public interface ArchiveGenerator
+{
+ // Packaging SPI
+ Archive<?> generateArchive(Class<?> testCase);
+
+}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Artifact.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Artifact.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Artifact.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,31 +0,0 @@
-package org.jboss.arquillian.api;
-
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Mark this class as requiring an artifact to be deployed for the
- * container. By default all classes in the current package, as well as support
- * classes, will be deployed. The resultant artifact may not support session beans.
- * <p/>
- * This test may be a unit test (in which case, if the suite is run in
- * standalone mode, the artifact itself won't be deployed, just the contained
- * classes and xml config files).
- *
- * @author Pete Muir
- * @see Classes
- * @see IntegrationTest
- * @see Packaging
- * @see Resources
- */
- at Documented
- at Retention(RUNTIME)
- at Target(TYPE)
-public @interface Artifact {
- ArtifactType artifactType() default ArtifactType.JSR299;
-
- boolean addCurrentPackage() default true;
-}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactGenerator.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactGenerator.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactGenerator.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,11 +0,0 @@
-package org.jboss.arquillian.api;
-
-import org.jboss.shrinkwrap.api.Archive;
-
-public interface ArtifactGenerator
-{
- // Packaging SPI
- Archive<?> generateArtifact(Class<?> testCase);
- void generateArtifact(Class<?> testCase, Archive<?> baseArtifact);
-
-}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactType.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactType.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ArtifactType.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,5 +0,0 @@
-package org.jboss.arquillian.api;
-
-public enum ArtifactType {
- JSR299, JSR303
-}
\ No newline at end of file
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ExpectedException.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ExpectedException.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ExpectedException.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,35 +0,0 @@
-package org.jboss.arquillian.api;
-
-/**
- * Thrown if an exception was expected, but non occurred
- *
- * @author Pete Muir
- *
- */
-public class ExpectedException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- public ExpectedException()
- {
- super();
- }
-
- public ExpectedException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public ExpectedException(String message)
- {
- super(message);
- }
-
- public ExpectedException(Throwable cause)
- {
- super(cause);
- }
-
-
-
-}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Packaging.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Packaging.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Packaging.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,28 +0,0 @@
-package org.jboss.arquillian.api;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Mark this test as requiring specific packaging when deployed to a container
- * for intgration testing.
- *
- * @see IntegrationTest
- * @see Artifact
- *
- * @author Pete Muir
- *
- */
- at Documented
- at Retention(RUNTIME)
- at Target(TYPE)
-public @interface Packaging
-{
-
- PackagingType value() default PackagingType.WAR;
-
-}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/PackagingType.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/PackagingType.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/PackagingType.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,5 +0,0 @@
-package org.jboss.arquillian.api;
-
-public enum PackagingType {
- EAR, WAR
-}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ResourceDescriptor.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ResourceDescriptor.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/ResourceDescriptor.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,12 +0,0 @@
-package org.jboss.arquillian.api;
-
-import java.net.URL;
-
-public interface ResourceDescriptor
-{
-
- public String getName();
-
- public URL getSource();
-
-}
\ No newline at end of file
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTest.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -6,11 +6,9 @@
import javax.naming.InitialContext;
-import org.jboss.arquillian.api.Artifact;
-import org.jboss.arquillian.api.ArtifactGenerator;
+import org.jboss.arquillian.api.ArchiveGenerator;
import org.jboss.arquillian.api.Controlable;
import org.jboss.arquillian.api.Deployer;
-import org.jboss.arquillian.api.Packaging;
import org.jboss.arquillian.api.TestMethodExecutor;
import org.jboss.shrinkwrap.api.Archive;
@@ -48,42 +46,21 @@
}
- // TODO: throws MissingArtifactSupportException
- // TODO: SPI lookup based on artifactType
- // TODO: loadArtifactGenerator() ?
- public ArtifactGenerator getArtifactGenerator(Artifact artifact)
+ public ArchiveGenerator getArchiveGenerator()
{
if(DeployableTest.isInContainer())
{
return new NullArtifactGenerator();
}
- return new UserCreatedArtifactGenerator();
+ return new UserCreatedArchiveGenerator();
}
- public ArtifactGenerator getArtifactGenerator(Packaging packaging)
+ public Archive<?> generateArchive(Class<?> testCase)
{
- if(DeployableTest.isInContainer())
- {
- return new NullArtifactGenerator();
- }
- return new UserCreatedArtifactGenerator();
+ return getArchiveGenerator().generateArchive(testCase);
}
-
- public Archive<?> generateArtifact(Class<?> testCase)
- {
-// ArtifactGenerator artifactGenerator = getArtifactGenerator(
-// this.getClass().getAnnotation(Artifact.class));
-//
-// ArtifactGenerator packagingGenerator = getArtifactGenerator(
-// this.getClass().getAnnotation(Packaging.class));
-//
-// TCKArtifact artifact = packagingGenerator.generateArtifact(this.getClass());
-// artifactGenerator.generateArtifact(this.getClass(), artifact);
-//
-// return artifact;
- return getArtifactGenerator((Artifact)null).generateArtifact(testCase);
- }
+
public void run(TestMethodExecutor executor) throws Throwable
{
if(inContainer)
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/NullArtifactGenerator.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/NullArtifactGenerator.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/NullArtifactGenerator.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,20 +1,14 @@
package org.jboss.arquillian.impl;
-import org.jboss.arquillian.api.ArtifactGenerator;
+import org.jboss.arquillian.api.ArchiveGenerator;
import org.jboss.shrinkwrap.api.Archive;
-public class NullArtifactGenerator implements ArtifactGenerator
+public class NullArtifactGenerator implements ArchiveGenerator
{
@Override
- public Archive<?> generateArtifact(Class<?> testCase)
+ public Archive<?> generateArchive(Class<?> testCase)
{
return null;
}
-
- @Override
- public void generateArtifact(Class<?> testCase, Archive<?> baseArtifact)
- {
-
- }
}
Copied: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArchiveGenerator.java (from rev 3684, arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArtifactGenerator.java)
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArchiveGenerator.java (rev 0)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArchiveGenerator.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -0,0 +1,41 @@
+package org.jboss.arquillian.impl;
+
+import java.lang.reflect.Method;
+
+import org.jboss.arquillian.api.ArchiveGenerator;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+
+public class UserCreatedArchiveGenerator implements ArchiveGenerator
+{
+
+ @Override
+ public Archive<?> generateArchive(Class<?> testCase)
+ {
+ Method deploymentMethod = findDeploymentMethod(testCase);
+ if(deploymentMethod == null)
+ {
+ throw new RuntimeException("No static method annotated with " + Deployment.class.getName() + " found");
+ }
+ try
+ {
+ return (Archive<?>)deploymentMethod.invoke(null);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Could not get Deploymnet", e);
+ }
+ }
+
+ private Method findDeploymentMethod(Class<?> testCase) {
+
+ Method[] methods = testCase.getMethods();
+ for(Method method: methods)
+ {
+ if(method.isAnnotationPresent(Deployment.class)) {
+ return method;
+ }
+ }
+ return null;
+ }
+}
Deleted: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArtifactGenerator.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArtifactGenerator.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/UserCreatedArtifactGenerator.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -1,48 +0,0 @@
-package org.jboss.arquillian.impl;
-
-import java.lang.reflect.Method;
-
-import org.jboss.arquillian.api.ArtifactGenerator;
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.shrinkwrap.api.Archive;
-
-public class UserCreatedArtifactGenerator implements ArtifactGenerator
-{
-
- @Override
- public Archive<?> generateArtifact(Class<?> testCase)
- {
- Method deploymentMethod = findDeploymentMethod(testCase);
- if(deploymentMethod == null)
- {
- throw new RuntimeException("No static method annotated with " + Deployment.class.getName() + " found");
- }
- try
- {
- return (Archive<?>)deploymentMethod.invoke(null);
- }
- catch (Exception e)
- {
- throw new RuntimeException("Could not get Deploymnet", e);
- }
- }
-
- @Override
- public void generateArtifact(Class<?> testCase, Archive<?> baseArtifact)
- {
- // TODO Auto-generated method stub
-
- }
-
- private Method findDeploymentMethod(Class<?> testCase) {
-
- Method[] methods = testCase.getMethods();
- for(Method method: methods)
- {
- if(method.isAnnotationPresent(Deployment.class)) {
- return method;
- }
- }
- return null;
- }
-}
Modified: arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/Arquillian.java
===================================================================
--- arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/Arquillian.java 2009-11-15 14:26:42 UTC (rev 3708)
+++ arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/Arquillian.java 2009-11-15 14:46:37 UTC (rev 3709)
@@ -49,7 +49,7 @@
@Override
public void evaluate() throws Throwable
{
- archive = deployableTest.generateArtifact(
+ archive = deployableTest.generateArchive(
Arquillian.this.getTestClass().getJavaClass());
if(archive instanceof WebArchive) {
More information about the jboss-svn-commits
mailing list