Remote AS7 testing - SimpleBundleTestCase - ok

jbosgi · Jan 19, 2012 · b9a86ec · b9a86ec
1 parent caff359
commit b9a86ec
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 124 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.jboss.osgi</groupId>
         <artifactId>jboss-osgi-parent</artifactId>
-        <version>1.0.10</version>
+        <version>1.0.12</version>
     </parent>
 
     <name>JBossOSGi</name>
@@ -50,6 +50,7 @@
         <version.apache.felix.log>1.0.0</version.apache.felix.log>
         <version.apache.felix.scr>1.6.0</version.apache.felix.scr>
         <version.izpack>4.3.1</version.izpack>
+        <version.jbossas.710>7.1.0.Final-SNAPSHOT</version.jbossas.710>
         <version.jboss.arquillian.core>1.0.0.CR7</version.jboss.arquillian.core>
         <version.jboss.arquillian.osgi>1.0.0.CR5</version.jboss.arquillian.osgi>
         <version.jboss.logmanager>1.2.0.GA</version.jboss.logmanager>

diff --git a/testsuite/example/pom.xml b/testsuite/example/pom.xml
@@ -34,11 +34,6 @@
 
     <!-- Dependencies -->
     <dependencies>
-        <dependency>
-            <groupId>org.jboss.osgi.framework</groupId>
-            <artifactId>jbosgi-framework-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <!-- Build -->
@@ -101,6 +96,25 @@
         </plugins>
     </build>
 
+    <!-- Profiles -->
+    <profiles>
+        <profile>
+            <id>embedded-testing</id>
+            <activation>
+                <property>
+                    <name>!target.container</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.osgi.framework</groupId>
+                    <artifactId>jbosgi-framework-core</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <!-- Repositories -->
     <repositories>
         <!-- Define the JBoss Repository here because the examples are distributed standalone -->

diff --git a/testsuite/example/src/test/resources/arquillian-remote.xml b/testsuite/example/src/test/resources/arquillian-remote.xml
diff --git a/testsuite/example/src/test/resources/arquillian.xml b/testsuite/example/src/test/resources/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+	<container qualifier="jboss" default="true">
+		<configuration>
+			<property name="jbossHome">${basedir}/../../../jboss-as/build/target/jboss-as-${version.jbossas}</property>
+            <!--
+			<property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-smoke</property>
+			<property name="serverConfig">${jboss.server.config.file.name:standalone.xml}</property>
+			-->
+			<property name="allowConnectingToRunningServer">true</property>
+		</configuration>
+	</container>
+</arquillian>
diff --git a/testsuite/functional/pom.xml b/testsuite/functional/pom.xml
@@ -38,11 +38,24 @@
             <groupId>biz.aQute</groupId>
             <artifactId>bnd</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.osgi.framework</groupId>
-            <artifactId>jbosgi-framework-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
+    <!-- Profiles -->
+    <profiles>
+        <profile>
+            <id>embedded-testing</id>
+            <activation>
+                <property>
+                    <name>!target.container</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.osgi.framework</groupId>
+                    <artifactId>jbosgi-framework-core</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>
diff --git a/testsuite/functional/src/test/resources/arquillian-remote.xml b/testsuite/functional/src/test/resources/arquillian-remote.xml
diff --git a/testsuite/performance/src/test/resources/arquillian-remote.xml b/testsuite/performance/src/test/resources/arquillian-remote.xml
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -95,6 +95,62 @@
             </testResource>
         </testResources>
         <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>${surefire.system.args}</argLine>
+                    <systemProperties>
+                        <property>
+                            <name>java.util.logging.manager</name>
+                            <value>org.jboss.logmanager.LogManager</value>
+                        </property>
+                        <property>
+                            <name>jboss.osgi.vfs.leakDebugging</name>
+                            <value>true</value>
+                        </property>
+                        <property>
+                            <name>org.apache.aries.jmx:org.apache.aries.jmx</name>
+                            <value>${version.apache.aries.jmx}</value>
+                        </property>
+                        <property>
+                            <name>org.apache.aries:org.apache.aries.util</name>
+                            <value>${version.apache.aries.util}</value>
+                        </property>
+                        <property>
+                            <name>org.apache.felix:org.apache.felix.configadmin</name>
+                            <value>${version.apache.felix.configadmin}</value>
+                        </property>
+                        <property>
+                            <name>org.apache.felix:org.apache.felix.eventadmin</name>
+                            <value>${version.apache.felix.eventadmin}</value>
+                        </property>
+                        <property>
+                            <name>org.apache.felix:org.apache.felix.scr</name>
+                            <value>${version.apache.felix.scr}</value>
+                        </property>
+                        <property>
+                            <name>org.jboss.osgi.http:jbosgi-http</name>
+                            <value>${version.jboss.osgi.http}</value>
+                        </property>
+                        <property>
+                            <name>org.jboss.osgi.jmx:jboss-osgi-jmx</name>
+                            <value>${version.jboss.osgi.jmx}</value>
+                        </property>
+                        <property>
+                            <name>org.jboss.osgi.webapp:jbosgi-webapp</name>
+                            <value>${version.jboss.osgi.webapp}</value>
+                        </property>
+                        <property>
+                            <name>org.jboss.osgi.xerces:jboss-osgi-xerces</name>
+                            <value>${version.jboss.osgi.xerces}</value>
+                        </property>
+                        <property>
+                            <name>test.archive.directory</name>
+                            <value>${project.build.directory}/test-libs</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -109,78 +165,33 @@
                 </property>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>org.jboss.arquillian.junit</groupId>
-                    <artifactId>arquillian-junit-container</artifactId>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-container-osgi-embedded</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>${surefire.system.args}</argLine>
-                            <systemProperties>
-                                <property>
-                                    <name>java.util.logging.manager</name>
-                                    <value>org.jboss.logmanager.LogManager</value>
-                                </property>
-                                <property>
-                                    <name>test.archive.directory</name>
-                                    <value>${project.build.directory}/test-libs</value>
-                                </property>
-                                <property>
-                                    <name>jboss.osgi.vfs.leakDebugging</name>
-                                    <value>true</value>
-                                </property>
-                                <property>
-                                    <name>org.apache.aries.jmx:org.apache.aries.jmx</name>
-                                    <value>${version.apache.aries.jmx}</value>
-                                </property>
-                                <property>
-                                    <name>org.apache.aries:org.apache.aries.util</name>
-                                    <value>${version.apache.aries.util}</value>
-                                </property>
-                                <property>
-                                    <name>org.apache.felix:org.apache.felix.configadmin</name>
-                                    <value>${version.apache.felix.configadmin}</value>
-                                </property>
-                                <property>
-                                    <name>org.apache.felix:org.apache.felix.eventadmin</name>
-                                    <value>${version.apache.felix.eventadmin}</value>
-                                </property>
-                                <property>
-                                    <name>org.apache.felix:org.apache.felix.scr</name>
-                                    <value>${version.apache.felix.scr}</value>
-                                </property>
-                                <property>
-                                    <name>org.jboss.osgi.http:jbosgi-http</name>
-                                    <value>${version.jboss.osgi.http}</value>
-                                </property>
-                                <property>
-                                    <name>org.jboss.osgi.jmx:jboss-osgi-jmx</name>
-                                    <value>${version.jboss.osgi.jmx}</value>
-                                </property>
-                                <property>
-                                    <name>org.jboss.osgi.webapp:jbosgi-webapp</name>
-                                    <value>${version.jboss.osgi.webapp}</value>
-                                </property>
-                                <property>
-                                    <name>org.jboss.osgi.xerces:jboss-osgi-xerces</name>
-                                    <value>${version.jboss.osgi.xerces}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
 
+        <profile>
+            <id>jboss710-testing</id>
+            <activation>
+                <property>
+                    <name>target.container</name>
+                    <value>jboss710</value>
+                </property>
+            </activation>
+            <properties>
+                <version.jbossas>${version.jbossas.710}</version.jbossas>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.as</groupId>
+                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
+                    <version>${version.jbossas.710}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>