[jboss-svn-commits] JBoss Common SVN: r4426 - in arquillian/trunk: containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30 and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun May 23 16:06:30 EDT 2010
Author: aslak
Date: 2010-05-23 16:06:29 -0400 (Sun, 23 May 2010)
New Revision: 4426
Added:
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Run.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeClient.java
Removed:
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunMode.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java
Modified:
arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunModeType.java
arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ApplicationArchiveDeploymentGenerator.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ClientProfileBuilder.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ContainerProfileBuilder.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/AbstractRunModeHandler.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeployment.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeploymentTestCase.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocalTestCase.java
Log:
ARQ-126 Renamed RunMode to @Run(AS_CLIENT) and @Run(IN_CONTAINER)
Copied: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Run.java (from rev 4389, arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunMode.java)
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Run.java (rev 0)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/Run.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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
+ * 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.api;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies the RunMode a Test should run in.
+ *
+ * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+ at Documented
+ at Retention(RUNTIME)
+ at Target(ElementType.TYPE)
+public @interface Run
+{
+ RunModeType value();
+}
Deleted: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunMode.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunMode.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunMode.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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
- * 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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.arquillian.api;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Specifies the RunMode a Test should run in.
- *
- * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
- * @version $Revision: $
- */
- at Documented
- at Retention(RUNTIME)
- at Target(ElementType.TYPE)
-public @interface RunMode
-{
- RunModeType value();
-}
Modified: arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunModeType.java
===================================================================
--- arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunModeType.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/api/src/main/java/org/jboss/arquillian/api/RunModeType.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -25,15 +25,15 @@
public enum RunModeType
{
/**
- * In LOCAL mode the @Deployment is processed and deployed to the Container,
+ * In AS_CLIENT mode the @Deployment is processed and deployed to the Container,
* but the test is not executed inside the container.
*/
- LOCAL,
+ AS_CLIENT,
/**
- * In Remote mode the @Deployment is processed and deployed to the container along side the test
+ * In IN_CONTAINER mode the @Deployment is processed and deployed to the container along side the test
* case and the test case is executed inside the container. <br/>
* This is the default mode when none specified.
*/
- REMOTE
+ IN_CONTAINER
}
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -16,14 +16,15 @@
*/
package org.jboss.arquillian.glassfish.embedded30;
+import static org.jboss.arquillian.api.RunModeType.AS_CLIENT;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.URL;
import java.util.logging.Logger;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.api.RunMode;
-import org.jboss.arquillian.api.RunModeType;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -39,7 +40,7 @@
* @version $Revision: $
*/
@RunWith(Arquillian.class)
- at RunMode(RunModeType.LOCAL)
+ at Run(AS_CLIENT)
public class GlassFishEmbeddedContainerTestCase
{
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -16,13 +16,14 @@
*/
package com.acme.web;
+import static org.jboss.arquillian.api.RunModeType.AS_CLIENT;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.URL;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.api.RunMode;
-import org.jboss.arquillian.api.RunModeType;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -38,7 +39,7 @@
* @version $Revision: $
*/
@RunWith(Arquillian.class)
- at RunMode(RunModeType.LOCAL)
+ at Run(AS_CLIENT)
public class LocalRunServletTestCase
{
@Deployment
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ApplicationArchiveDeploymentGenerator.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ApplicationArchiveDeploymentGenerator.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ApplicationArchiveDeploymentGenerator.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -22,7 +22,7 @@
import org.jboss.shrinkwrap.api.Archive;
/**
- * A {@link DeploymentGenerator} that will return the ApplicationArchive as is. Used for {@link RunModeType#LOCAL}.
+ * A {@link DeploymentGenerator} that will return the ApplicationArchive as is. Used for {@link RunModeType#AS_CLIENT}.
*
* @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
* @version $Revision: $
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ClientProfileBuilder.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ClientProfileBuilder.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ClientProfileBuilder.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -17,7 +17,7 @@
package org.jboss.arquillian.impl.context;
import org.jboss.arquillian.impl.handler.ActivateRunModeTypeDeployment;
-import org.jboss.arquillian.impl.handler.ActivateRunModeTypeLocal;
+import org.jboss.arquillian.impl.handler.ActivateRunModeTypeClient;
import org.jboss.arquillian.impl.handler.ArchiveDeploymentExporter;
import org.jboss.arquillian.impl.handler.ArchiveGenerator;
import org.jboss.arquillian.impl.handler.ContainerCreator;
@@ -26,15 +26,10 @@
import org.jboss.arquillian.impl.handler.ContainerStopper;
import org.jboss.arquillian.impl.handler.ContainerTestExecuter;
import org.jboss.arquillian.impl.handler.ContainerUndeployer;
-import org.jboss.arquillian.impl.handler.ExecutionTimer;
-import org.jboss.arquillian.spi.event.suite.After;
import org.jboss.arquillian.spi.event.suite.AfterClass;
import org.jboss.arquillian.spi.event.suite.AfterSuite;
-import org.jboss.arquillian.spi.event.suite.Before;
import org.jboss.arquillian.spi.event.suite.BeforeClass;
import org.jboss.arquillian.spi.event.suite.BeforeSuite;
-import org.jboss.arquillian.spi.event.suite.EventHandler;
-import org.jboss.arquillian.spi.event.suite.SuiteEvent;
import org.jboss.arquillian.spi.event.suite.Test;
/**
@@ -72,7 +67,7 @@
public void buildClassContext(ClassContext context, Class<?> testClass)
{
/*
- * If RunMode LOCAL a local DeploymentGenerator that returns the ApplicationArchive is bound to the context,
+ * If RunMode AS_CLIENT a local DeploymentGenerator that returns the ApplicationArchive is bound to the context,
* else the ClientDeploymentGenerator is used.
*/
context.register(BeforeClass.class, new ActivateRunModeTypeDeployment());
@@ -81,7 +76,7 @@
context.register(BeforeClass.class, new ContainerDeployer());
context.register(AfterClass.class, new ContainerUndeployer());
- context.register(BeforeClass.class, new ActivateRunModeTypeLocal());
+ context.register(BeforeClass.class, new ActivateRunModeTypeClient());
context.register(BeforeClass.class, new ArchiveDeploymentExporter());
}
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ContainerProfileBuilder.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ContainerProfileBuilder.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/context/ContainerProfileBuilder.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -16,17 +16,9 @@
*/
package org.jboss.arquillian.impl.context;
-import org.jboss.arquillian.impl.handler.ExecutionTimer;
import org.jboss.arquillian.impl.handler.TestCaseEnricher;
import org.jboss.arquillian.impl.handler.TestEventExecuter;
-import org.jboss.arquillian.spi.event.suite.After;
-import org.jboss.arquillian.spi.event.suite.AfterClass;
-import org.jboss.arquillian.spi.event.suite.AfterSuite;
import org.jboss.arquillian.spi.event.suite.Before;
-import org.jboss.arquillian.spi.event.suite.BeforeClass;
-import org.jboss.arquillian.spi.event.suite.BeforeSuite;
-import org.jboss.arquillian.spi.event.suite.EventHandler;
-import org.jboss.arquillian.spi.event.suite.SuiteEvent;
import org.jboss.arquillian.spi.event.suite.Test;
/**
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/AbstractRunModeHandler.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/AbstractRunModeHandler.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/AbstractRunModeHandler.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -16,7 +16,7 @@
*/
package org.jboss.arquillian.impl.handler;
-import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.api.RunModeType;
import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.spi.event.suite.ClassEvent;
@@ -36,26 +36,26 @@
*/
public final void callback(Context context, ClassEvent event) throws Exception
{
- boolean isLocalMode = false;
- if(event.getTestClass().isAnnotationPresent(RunMode.class))
+ boolean isClientMode = false;
+ if(event.getTestClass().isAnnotationPresent(Run.class))
{
- RunModeType runModeType = event.getTestClass().getAnnotation(RunMode.class).value();
- if(RunModeType.LOCAL == runModeType)
+ RunModeType runModeType = event.getTestClass().getAnnotation(Run.class).value();
+ if(RunModeType.AS_CLIENT == runModeType)
{
- isLocalMode = true;
+ isClientMode = true;
}
}
- if(isLocalMode)
+ if(isClientMode)
{
- hasLocalRunMode(context);
+ hasClientRunMode(context);
}
else
{
- hasRemoteRunMode(context);
+ hasContainerRunMode(context);
}
}
- protected abstract void hasLocalRunMode(Context context);
+ protected abstract void hasClientRunMode(Context context);
- protected abstract void hasRemoteRunMode(Context context);
+ protected abstract void hasContainerRunMode(Context context);
}
\ No newline at end of file
Copied: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeClient.java (from rev 4397, arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java)
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeClient.java (rev 0)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeClient.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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
+ * 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.impl.handler;
+
+import org.jboss.arquillian.api.Run;
+import org.jboss.arquillian.api.RunModeType;
+import org.jboss.arquillian.spi.ContainerMethodExecutor;
+import org.jboss.arquillian.spi.Context;
+import org.jboss.arquillian.spi.TestMethodExecutor;
+import org.jboss.arquillian.spi.TestResult;
+import org.jboss.arquillian.spi.TestResult.Status;
+import org.jboss.arquillian.spi.event.suite.BeforeClass;
+
+/**
+ * Handler that will setup the context as defined by the {@link RunModeType#AS_CLIENT}. <br/>
+ * Only activates local run mode if the TestClass is annotated with a {@link RunModeType#AS_CLIENT} {@link Run}.<br/>
+ * <br/>
+ *
+ * <b>Exports:</b><br/>
+ * {@link ContainerMethodExecutor}<br/>
+ *
+ * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class ActivateRunModeTypeClient extends AbstractRunModeHandler<BeforeClass>
+{
+
+ @Override
+ protected void hasClientRunMode(Context context)
+ {
+ context.add(ContainerMethodExecutor.class, new LocalMethodExecutor());
+ }
+
+ @Override
+ protected void hasContainerRunMode(Context context)
+ {
+ // NO-OP, Use the ContainerMethodExecutor provided by the DeployableContainer
+ }
+
+ // TODO: this is a copy of the protocol-local Executor. Move to SPI and remove protocol local?
+ static class LocalMethodExecutor implements ContainerMethodExecutor
+ {
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.ContainerMethodExecutor#invoke(org.jboss.arquillian.spi.TestMethodExecutor)
+ */
+ public TestResult invoke(TestMethodExecutor testMethodExecutor)
+ {
+ TestResult result = new TestResult();
+ try
+ {
+ testMethodExecutor.invoke();
+ result.setStatus(Status.PASSED);
+ }
+ catch (final Throwable e)
+ {
+ result.setStatus(Status.FAILED);
+ result.setThrowable(e);
+ }
+ return result;
+ }
+ }
+}
\ No newline at end of file
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeployment.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeployment.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeployment.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -30,9 +30,9 @@
/**
* Handler that will setup the context as defined by the {@link RunModeType}.<br/>
- * <b>{@link RunModeType#LOCAL}</b>: Binds the {@link ApplicationArchiveDeploymentGenerator}, a {@link DeploymentGenerator} that only
+ * <b>{@link RunModeType#AS_CLIENT}</b>: Binds the {@link ApplicationArchiveDeploymentGenerator}, a {@link DeploymentGenerator} that only
* use the {@link ApplicationArchiveGenerator} SPI.<br/>
- * <b>{@link RunModeType#REMOTE}</b>: Binds the {@link ClientDeploymentGenerator}, a {@link DeploymentGenerator} that use the
+ * <b>{@link RunModeType#IN_CONTAINER}</b>: Binds the {@link ClientDeploymentGenerator}, a {@link DeploymentGenerator} that use the
* full Packager SPI. {@link DeploymentPackager}, {@link ApplicationArchiveGenerator}, {@link ApplicationArchiveProcessor}, {@link AuxiliaryArchiveAppender} and
* {@link AuxiliaryArchiveProcessor}<br/>
* <br/>
@@ -50,7 +50,7 @@
* @see org.jboss.arquillian.impl.handler.AbstractRunModeHandler#hasLocalRunMode(org.jboss.arquillian.spi.Context)
*/
@Override
- protected void hasLocalRunMode(Context context)
+ protected void hasClientRunMode(Context context)
{
context.add(DeploymentGenerator.class, new ApplicationArchiveDeploymentGenerator(context.getServiceLoader()));
}
@@ -59,7 +59,7 @@
* @see org.jboss.arquillian.impl.handler.AbstractRunModeHandler#hasRemoteRunMode(org.jboss.arquillian.spi.Context)
*/
@Override
- protected void hasRemoteRunMode(Context context)
+ protected void hasContainerRunMode(Context context)
{
context.add(DeploymentGenerator.class, new ClientDeploymentGenerator(context.getServiceLoader()));
}
Deleted: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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
- * 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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.arquillian.impl.handler;
-
-import org.jboss.arquillian.api.RunMode;
-import org.jboss.arquillian.api.RunModeType;
-import org.jboss.arquillian.spi.ContainerMethodExecutor;
-import org.jboss.arquillian.spi.Context;
-import org.jboss.arquillian.spi.TestMethodExecutor;
-import org.jboss.arquillian.spi.TestResult;
-import org.jboss.arquillian.spi.TestResult.Status;
-import org.jboss.arquillian.spi.event.suite.BeforeClass;
-
-/**
- * Handler that will setup the context as defined by the {@link RunModeType#LOCAL}. <br/>
- * Only activates local run mode if the TestClass is annotated with a {@link RunModeType#LOCAL} {@link RunMode}.<br/>
- * <br/>
- *
- * <b>Exports:</b><br/>
- * {@link ContainerMethodExecutor}<br/>
- *
- * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public class ActivateRunModeTypeLocal extends AbstractRunModeHandler<BeforeClass>
-{
-
- @Override
- protected void hasLocalRunMode(Context context)
- {
- context.add(ContainerMethodExecutor.class, new LocalMethodExecutor());
- }
-
- @Override
- protected void hasRemoteRunMode(Context context)
- {
- // NO-OP, Use the ContainerMethodExecutor provided by the DeployableContainer
- }
-
- // TODO: this is a copy of the protocol-local Executor. Move to SPI and remove protocol local?
- static class LocalMethodExecutor implements ContainerMethodExecutor
- {
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.ContainerMethodExecutor#invoke(org.jboss.arquillian.spi.TestMethodExecutor)
- */
- public TestResult invoke(TestMethodExecutor testMethodExecutor)
- {
- TestResult result = new TestResult();
- try
- {
- testMethodExecutor.invoke();
- result.setStatus(Status.PASSED);
- }
- catch (final Throwable e)
- {
- result.setStatus(Status.FAILED);
- result.setThrowable(e);
- }
- return result;
- }
- }
-}
\ No newline at end of file
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeploymentTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeploymentTestCase.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeDeploymentTestCase.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -18,7 +18,7 @@
import junit.framework.Assert;
-import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.api.RunModeType;
import org.jboss.arquillian.impl.ApplicationArchiveDeploymentGenerator;
import org.jboss.arquillian.impl.ClientDeploymentGenerator;
@@ -81,10 +81,10 @@
}
- @RunMode(RunModeType.LOCAL)
+ @Run(RunModeType.AS_CLIENT)
private static class TestWithRunModeLocal { }
- @RunMode(RunModeType.REMOTE)
+ @Run(RunModeType.IN_CONTAINER)
private static class TestWithRunModeRemote { }
private static class TestWithRunModeNone { }
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocalTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocalTestCase.java 2010-05-23 19:45:58 UTC (rev 4425)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocalTestCase.java 2010-05-23 20:06:29 UTC (rev 4426)
@@ -18,7 +18,7 @@
import junit.framework.Assert;
-import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.Run;
import org.jboss.arquillian.api.RunModeType;
import org.jboss.arquillian.impl.context.ClassContext;
import org.jboss.arquillian.impl.context.SuiteContext;
@@ -48,7 +48,7 @@
{
ClassContext context = new ClassContext(new SuiteContext(serviceLoader));
- ActivateRunModeTypeLocal handler = new ActivateRunModeTypeLocal();
+ ActivateRunModeTypeClient handler = new ActivateRunModeTypeClient();
handler.callback(context, new BeforeClass(TestWithRunModeLocal.class));
Assert.assertNotNull(
@@ -61,7 +61,7 @@
{
ClassContext context = new ClassContext(new SuiteContext(serviceLoader));
- ActivateRunModeTypeLocal handler = new ActivateRunModeTypeLocal();
+ ActivateRunModeTypeClient handler = new ActivateRunModeTypeClient();
handler.callback(context, new BeforeClass(TestWithRunModeRemote.class));
Assert.assertNull(
@@ -74,7 +74,7 @@
{
ClassContext context = new ClassContext(new SuiteContext(serviceLoader));
- ActivateRunModeTypeLocal handler = new ActivateRunModeTypeLocal();
+ ActivateRunModeTypeClient handler = new ActivateRunModeTypeClient();
handler.callback(context, new BeforeClass(TestWithNoRunMode.class));
Assert.assertNull(
@@ -82,10 +82,10 @@
context.get(ContainerMethodExecutor.class));
}
- @RunMode(RunModeType.LOCAL)
+ @Run(RunModeType.AS_CLIENT)
private static class TestWithRunModeLocal { }
- @RunMode(RunModeType.REMOTE)
+ @Run(RunModeType.IN_CONTAINER)
private static class TestWithRunModeRemote { }
private static class TestWithNoRunMode { }
More information about the jboss-svn-commits
mailing list