From 1728c770095e5d0e185552e25cfbc04f39db7ee9 Mon Sep 17 00:00:00 2001 From: Mike Van Date: Thu, 27 Dec 2012 02:25:06 -0800 Subject: [PATCH] Moved testng-integration to the base directory and modified the parent pom.xml to build it immediately after spec-api. --- arquillian/pom.xml | 2 - arquillian/testng-integration/pom.xml | 118 -------------------- .../testng/BasicTestNGIntegrationTestCase.java | 52 --------- .../as/arquillian/testng/GreetingService.java | 30 ----- .../src/test/resources/arquillian.xml | 10 -- pom.xml | 1 + testng-integration/pom.xml | 118 ++++++++++++++++++++ .../testng/BasicTestNGIntegrationTestCase.java | 52 +++++++++ .../as/arquillian/testng/GreetingService.java | 30 +++++ .../src/test/resources/arquillian.xml | 10 ++ 10 files changed, 211 insertions(+), 212 deletions(-) delete mode 100644 arquillian/testng-integration/pom.xml delete mode 100644 arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java delete mode 100644 arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java delete mode 100644 arquillian/testng-integration/src/test/resources/arquillian.xml create mode 100644 testng-integration/pom.xml create mode 100644 testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java create mode 100644 testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java create mode 100644 testng-integration/src/test/resources/arquillian.xml diff --git a/arquillian/pom.xml b/arquillian/pom.xml index eccf173..76e13d9 100644 --- a/arquillian/pom.xml +++ b/arquillian/pom.xml @@ -43,8 +43,6 @@ container-remote protocol-jmx testenricher-msc - testng-integration - common-domain container-remote-domain container-managed-domain diff --git a/arquillian/testng-integration/pom.xml b/arquillian/testng-integration/pom.xml deleted file mode 100644 index 010a45d..0000000 --- a/arquillian/testng-integration/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - 4.0.0 - - - org.jboss.as - jboss-as-arquillian - 7.2.0.Alpha1-SNAPSHOT - - - jboss-as-arquillian-testng-integration - JBoss Application Server: Arquillian TestNG Integration - jar - - - ${project.basedir}/../../build/target/jboss-as-${jboss.as.release.version} - - - - - - org.jboss.as - jboss-as-spec-api - pom - ${project.version} - - - org.jboss.as - jboss-as-arquillian-container-managed - test - - - org.jboss.arquillian.testng - arquillian-testng-container - test - - - org.testng - testng - test - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - process-test-classes - - copy-resources - - - ${basedir}/target/jbossas - true - - - ${jboss.home} - - modules/ - bundles/ - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - java.util.logging.manager - org.jboss.logmanager.LogManager - - - jboss.home - ${basedir}/target/jbossas - - - module.path - ${jboss.home}/modules - - - true - - - - - diff --git a/arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java b/arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java deleted file mode 100644 index cd02129..0000000 --- a/arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * 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.as.arquillian.testng; - -import javax.inject.Inject; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.testng.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * Ensures that the basic startup/deployment etc facilities of the Arquillian container are working with TestNG w/ AS7. AS7-1303 - * - * @author Andrew Lee Rubinger - */ -public class BasicTestNGIntegrationTestCase extends Arquillian { - - @Deployment - public static JavaArchive create() { - final JavaArchive archive = ShrinkWrap.create(JavaArchive.class).addClass(GreetingService.class); - archive.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - return archive; - } - - @Inject - private GreetingService service; - - @Test - public void shouldBeAbleToInject() throws Exception { - Assert.assertNotNull(service); - Assert.assertEquals("Hello Earthling!", service.greet("Earthling")); - } -} diff --git a/arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java b/arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java deleted file mode 100644 index 2b4cdd3..0000000 --- a/arquillian/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * 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.as.arquillian.testng; - -/** - * GreetingService - * - * @author Aslak Knutsen - * @version $Revision: $ - */ -public class GreetingService { - public String greet(String name) { - return "Hello " + name + "!"; - } -} diff --git a/arquillian/testng-integration/src/test/resources/arquillian.xml b/arquillian/testng-integration/src/test/resources/arquillian.xml deleted file mode 100644 index c1fb09c..0000000 --- a/arquillian/testng-integration/src/test/resources/arquillian.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - target/jbossas - - - diff --git a/pom.xml b/pom.xml index 9bab34e..0a157fa 100755 --- a/pom.xml +++ b/pom.xml @@ -6363,6 +6363,7 @@ sar security spec-api + testng-integration transactions web webservices diff --git a/testng-integration/pom.xml b/testng-integration/pom.xml new file mode 100644 index 0000000..51eba2d --- /dev/null +++ b/testng-integration/pom.xml @@ -0,0 +1,118 @@ + + + + + 4.0.0 + + + org.jboss.as + jboss-as-parent + 7.2.0.Alpha1-SNAPSHOT + + + jboss-as-arquillian-testng-integration + JBoss Application Server: Arquillian TestNG Integration + jar + + + ${project.basedir}/../build/target/jboss-as-${jboss.as.release.version} + + + + + + org.jboss.as + jboss-as-spec-api + pom + ${project.version} + + + org.jboss.as + jboss-as-arquillian-container-managed + test + + + org.jboss.arquillian.testng + arquillian-testng-container + test + + + org.testng + testng + test + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + process-test-classes + + copy-resources + + + ${basedir}/target/jbossas + true + + + ${jboss.home} + + modules/ + bundles/ + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + java.util.logging.manager + org.jboss.logmanager.LogManager + + + jboss.home + ${basedir}/target/jbossas + + + module.path + ${jboss.home}/modules + + + true + + + + + diff --git a/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java b/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java new file mode 100644 index 0000000..cd02129 --- /dev/null +++ b/testng-integration/src/test/java/org/jboss/as/arquillian/testng/BasicTestNGIntegrationTestCase.java @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * 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.as.arquillian.testng; + +import javax.inject.Inject; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.testng.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * Ensures that the basic startup/deployment etc facilities of the Arquillian container are working with TestNG w/ AS7. AS7-1303 + * + * @author Andrew Lee Rubinger + */ +public class BasicTestNGIntegrationTestCase extends Arquillian { + + @Deployment + public static JavaArchive create() { + final JavaArchive archive = ShrinkWrap.create(JavaArchive.class).addClass(GreetingService.class); + archive.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + return archive; + } + + @Inject + private GreetingService service; + + @Test + public void shouldBeAbleToInject() throws Exception { + Assert.assertNotNull(service); + Assert.assertEquals("Hello Earthling!", service.greet("Earthling")); + } +} diff --git a/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java b/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java new file mode 100644 index 0000000..2b4cdd3 --- /dev/null +++ b/testng-integration/src/test/java/org/jboss/as/arquillian/testng/GreetingService.java @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * 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.as.arquillian.testng; + +/** + * GreetingService + * + * @author Aslak Knutsen + * @version $Revision: $ + */ +public class GreetingService { + public String greet(String name) { + return "Hello " + name + "!"; + } +} diff --git a/testng-integration/src/test/resources/arquillian.xml b/testng-integration/src/test/resources/arquillian.xml new file mode 100644 index 0000000..c1fb09c --- /dev/null +++ b/testng-integration/src/test/resources/arquillian.xml @@ -0,0 +1,10 @@ + + + + + + target/jbossas + + + -- 1.7.1