- diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
- index c10615c..6fe37ba 100644
- --- a/integration-tests/pom.xml
- +++ b/integration-tests/pom.xml
- @@ -15,7 +15,7 @@
- <description></description>
- <properties>
- - <version.arquillian>1.0.0.Alpha4</version.arquillian>
- + <version.arquillian>1.0.0.Alpha5</version.arquillian>
- <version.haml>~>3.0</version.haml>
- <version.jboss-server-manager>1.0.3.GA</version.jboss-server-manager>
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/JobsTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/JobsTest.java
- index e776093..b99a705 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/JobsTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/JobsTest.java
- @@ -19,7 +19,8 @@
- package org.torquebox.integration.arquillian.alacarte;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertFalse;
- +import static org.junit.Assert.assertTrue;
- import java.io.BufferedReader;
- import java.io.File;
- @@ -28,14 +29,13 @@ import java.util.HashSet;
- import java.util.Set;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Before;
- import org.junit.Test;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class JobsTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/ServicesTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/ServicesTest.java
- index 40c122f..1d8e7c8 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/ServicesTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/alacarte/ServicesTest.java
- @@ -19,7 +19,8 @@
- package org.torquebox.integration.arquillian.alacarte;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertFalse;
- +import static org.junit.Assert.assertTrue;
- import java.io.BufferedReader;
- import java.io.File;
- @@ -28,14 +29,13 @@ import java.util.HashSet;
- import java.util.Set;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Before;
- import org.junit.Test;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ServicesTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedExternalTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedExternalTest.java
- index 65d3a10..37421a7 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedExternalTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedExternalTest.java
- @@ -20,11 +20,10 @@
- package org.torquebox.integration.arquillian.override;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ArchivedExternalTest extends ExplodedExternalTest {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedInternalTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedInternalTest.java
- index 758b980..3622ed0 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedInternalTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedInternalTest.java
- @@ -20,11 +20,10 @@
- package org.torquebox.integration.arquillian.override;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ArchivedInternalTest extends ExplodedInternalTest {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedWithoutDescriptorTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedWithoutDescriptorTest.java
- index 99bd200..27b8fdb 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedWithoutDescriptorTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ArchivedWithoutDescriptorTest.java
- @@ -22,15 +22,14 @@ package org.torquebox.integration.arquillian.override;
- import java.util.zip.ZipFile;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.ShrinkWrap;
- import org.jboss.shrinkwrap.api.importer.ZipImporter;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Ignore;
- @Ignore
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ArchivedWithoutDescriptorTest extends ArchivedInternalTest {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedExternalTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedExternalTest.java
- index 81549ea..0f5e9e5 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedExternalTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedExternalTest.java
- @@ -19,14 +19,13 @@
- package org.torquebox.integration.arquillian.override;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ExplodedExternalTest extends AbstractOverrideTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedInternalTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedInternalTest.java
- index a550984..d69dc7e 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedInternalTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/override/ExplodedInternalTest.java
- @@ -20,11 +20,10 @@
- package org.torquebox.integration.arquillian.override;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ExplodedInternalTest extends AbstractOverrideTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/AuthTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/AuthTest.java
- index 7bfeb9f..aed269b 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/AuthTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/AuthTest.java
- @@ -19,21 +19,21 @@
- package org.torquebox.integration.arquillian.rack;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import org.apache.http.auth.AuthScope;
- import org.apache.http.auth.Credentials;
- import org.apache.http.auth.UsernamePasswordCredentials;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.jboss.util.Base64;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class AuthTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/BasicTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/BasicTest.java
- index 0521126..b72f218 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/BasicTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/BasicTest.java
- @@ -19,17 +19,17 @@
- package org.torquebox.integration.arquillian.rack;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupArchiveTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupArchiveTest.java
- index 5806cef..b57ebce 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupArchiveTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupArchiveTest.java
- @@ -19,17 +19,16 @@
- package org.torquebox.integration.arquillian.rack;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertTrue;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class NoRootRackupArchiveTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupTest.java
- index eb03e07..a7ebc57 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/NoRootRackupTest.java
- @@ -19,17 +19,16 @@
- package org.torquebox.integration.arquillian.rack;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class NoRootRackupTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/ReloaderRackTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/ReloaderRackTest.java
- index 77c2ab5..cecbeb4 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/ReloaderRackTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rack/ReloaderRackTest.java
- @@ -19,20 +19,21 @@
- package org.torquebox.integration.arquillian.rack;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- +import static org.junit.Assert.assertTrue;
- import java.util.HashSet;
- import java.util.Set;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class ReloaderRackTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveBackwardsCompatTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveBackwardsCompatTest.java
- index eb11ae9..1ea8748 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveBackwardsCompatTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveBackwardsCompatTest.java
- @@ -19,13 +19,13 @@
- package org.torquebox.integration.arquillian.rails2;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import java.io.File;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.ShrinkWrap;
- import org.jboss.shrinkwrap.api.asset.Asset;
- import org.jboss.shrinkwrap.api.asset.StringAsset;
- @@ -34,7 +34,7 @@ import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicArchiveBackwardsCompatTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveTest.java
- index c3dd372..53995b8 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicArchiveTest.java
- @@ -19,13 +19,13 @@
- package org.torquebox.integration.arquillian.rails2;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import java.io.File;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.ShrinkWrap;
- import org.jboss.shrinkwrap.api.asset.Asset;
- import org.jboss.shrinkwrap.api.asset.StringAsset;
- @@ -34,7 +34,7 @@ import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicArchiveTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicBackwardsCompatTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicBackwardsCompatTest.java
- index 5636c3a..ebe5d84 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicBackwardsCompatTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicBackwardsCompatTest.java
- @@ -19,17 +19,17 @@
- package org.torquebox.integration.arquillian.rails2;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicBackwardsCompatTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicProductionTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicProductionTest.java
- index ef4adb8..034fbab 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicProductionTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicProductionTest.java
- @@ -19,20 +19,22 @@
- package org.torquebox.integration.arquillian.rails2;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertFalse;
- +import static org.junit.Assert.assertNotNull;
- +import static org.junit.Assert.assertTrue;
- import java.io.File;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Ignore;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicProductionTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicTest.java
- index faee303..b856adf 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/BasicTest.java
- @@ -19,17 +19,17 @@
- package org.torquebox.integration.arquillian.rails2;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/FrozenTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/FrozenTest.java
- index 09739c7..76ef4b8 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/FrozenTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/FrozenTest.java
- @@ -19,20 +19,20 @@
- package org.torquebox.integration.arquillian.rails2;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import java.util.List;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.By;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class FrozenTest extends AbstractIntegrationTestCase {
- private static final String[] GEM_NAMES = { "railties", "activesupport", "actionpack", "activerecord", "actionmailer", "activeresource", };
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/SessionHandlingTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/SessionHandlingTest.java
- index 92413bd..01279f8 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/SessionHandlingTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails2/SessionHandlingTest.java
- @@ -20,12 +20,11 @@
- package org.torquebox.integration.arquillian.rails2;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.torquebox.integration.arquillian.rails.CommonSessionHandlingTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class SessionHandlingTest extends CommonSessionHandlingTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/BasicTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/BasicTest.java
- index 61ac82d..7a96086 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/BasicTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/BasicTest.java
- @@ -19,17 +19,17 @@
- package org.torquebox.integration.arquillian.rails3;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/CachedJavascriptArchiveTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/CachedJavascriptArchiveTest.java
- index 2c4342b..7bad185 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/CachedJavascriptArchiveTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/CachedJavascriptArchiveTest.java
- @@ -19,19 +19,19 @@
- package org.torquebox.integration.arquillian.rails3;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import java.io.File;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractOnTheFlyArchivingTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class CachedJavascriptArchiveTest extends AbstractOnTheFlyArchivingTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/FormHandlingTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/FormHandlingTest.java
- index 6a8177c..c6d8728 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/FormHandlingTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/FormHandlingTest.java
- @@ -19,20 +19,22 @@
- package org.torquebox.integration.arquillian.rails3;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- +import static org.junit.Assert.assertNull;
- +import static org.junit.Assert.assertTrue;
- import java.net.URL;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebDriver.Options;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class FormHandlingTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/SessionHandlingTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/SessionHandlingTest.java
- index e6b3293..f99c51d 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/SessionHandlingTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/rails3/SessionHandlingTest.java
- @@ -20,12 +20,11 @@
- package org.torquebox.integration.arquillian.rails3;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.torquebox.integration.arquillian.rails.CommonSessionHandlingTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class SessionHandlingTest extends CommonSessionHandlingTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/BasicTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/BasicTest.java
- index 5560177..690f012 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/BasicTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/BasicTest.java
- @@ -19,17 +19,17 @@
- package org.torquebox.integration.arquillian.sinatra;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- +import static org.junit.Assert.assertNotNull;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class BasicTest extends AbstractIntegrationTestCase {
- @Deployment
- diff --git a/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/SinatraQueuesTest.java b/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/SinatraQueuesTest.java
- index a9f0b09..ae48d2b 100644
- --- a/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/SinatraQueuesTest.java
- +++ b/integration-tests/src/test/java/org/torquebox/integration/arquillian/sinatra/SinatraQueuesTest.java
- @@ -19,17 +19,16 @@
- package org.torquebox.integration.arquillian.sinatra;
- -import static org.junit.Assert.*;
- +import static org.junit.Assert.assertEquals;
- import org.jboss.arquillian.api.Deployment;
- -import org.jboss.arquillian.api.Run;
- -import org.jboss.arquillian.api.RunModeType;
- +import org.jboss.arquillian.api.RunAsClient;
- import org.jboss.shrinkwrap.api.spec.JavaArchive;
- import org.junit.Test;
- import org.openqa.selenium.WebElement;
- import org.torquebox.integration.arquillian.AbstractIntegrationTestCase;
- -@Run(RunModeType.AS_CLIENT)
- +@RunAsClient
- public class SinatraQueuesTest extends AbstractIntegrationTestCase {
- @Deployment