[jboss-cvs] JBossAS SVN: r93540 - in projects/jboss-osgi/trunk: testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99 and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-09-15 10:38:01 -0400 (Tue, 15 Sep 2009)
New Revision: 93540

Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java
Log:
Move profiles to jboss-osgi-parent

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-09-15 14:37:29 UTC (rev 93539)
+++ projects/jboss-osgi/trunk/pom.xml	2009-09-15 14:38:01 UTC (rev 93540)
@@ -253,6 +253,130 @@
       </build>
     </profile>
 
+    <!--
+      Name: embedded-testing 
+      Descr: Setup for embedded integration testing
+    -->
+    <profile>
+      <id>embedded-testing</id>
+      <activation>
+        <property>
+          <name>!target.container</name>
+        </property>
+      </activation>
+      <properties>
+        <surefire.argline.parent>-Djava.security.manager.disabled</surefire.argline.parent>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>${surefire.argline.parent}</argLine>
+              <systemProperties>
+                <property>
+                  <name>java.protocol.handler.pkgs</name>
+                  <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+                </property>
+                <property>
+                  <name>jndi.server.port</name>
+                  <value>1199</value>
+                </property>
+                <property>
+                  <name>log4j.output.dir</name>
+                  <value>${project.build.directory}</value>
+                </property>
+                <property>
+                  <name>jboss.osgi.framework.properties</name>
+                  <value>${jboss.osgi.framework.properties}</value>
+                </property>
+                <property>
+                  <name>org.jboss.osgi.husky.Invoker</name>
+                  <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+                </property>
+                <property>
+                  <name>test.archive.directory</name>
+                  <value>${project.build.directory}/test-libs</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+    <!--
+      Name: remote-testing 
+      Descr: Setup for remote integration testing
+    -->
+    <profile>
+      <id>remote-testing</id>
+      <activation>
+        <property>
+          <name>target.container</name>
+        </property>
+      </activation>
+      <properties>
+        <surefire.argline.parent>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/tst.policy</surefire.argline.parent>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>${surefire.argline.parent}</argLine>
+              <systemProperties>
+                <property>
+                  <name>java.protocol.handler.pkgs</name>
+                  <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+                </property>
+                <property>
+                  <name>jboss.bind.address</name>
+                  <value>${jboss.bind.address}</value>
+                </property>
+                <property>
+                  <name>jndi.server.port</name>
+                  <value>1099</value>
+                </property>
+                <property>
+                  <name>log4j.output.dir</name>
+                  <value>${project.build.directory}</value>
+                </property>
+                <property>
+                  <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
+                  <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
+                </property>
+                <property>
+                  <name>jboss.osgi.framework.properties</name>
+                  <value>${jboss.osgi.framework.properties}</value>
+                </property>
+                <property>
+                  <name>org.jboss.osgi.husky.Invoker</name>
+                  <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+                </property>
+                <property>
+                  <name>org.jboss.osgi.husky.runtime.connector.host</name>
+                  <value>${jboss.bind.address}</value>
+                </property>
+                <property>
+                  <name>org.jboss.osgi.husky.runtime.connector.port</name>
+                  <value>5401</value>
+                </property>
+                <property>
+                  <name>target.container</name>
+                  <value>${target.container}</value>
+                </property>
+                <property>
+                  <name>test.archive.directory</name>
+                  <value>${project.build.directory}/test-libs</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
   </profiles>
 
 </project>

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java	2009-09-15 14:37:29 UTC (rev 93539)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGI99TestCase.java	2009-09-15 14:38:01 UTC (rev 93540)
@@ -24,7 +24,6 @@
 //$Id: OSGI39TestCase.java 87103 2009-04-09 22:18:31Z thomas.diesler at jboss.com $
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
@@ -64,7 +63,7 @@
    public void testInstallOnly() throws Exception
    {
       OSGiBundle bundleA = runtime.installBundle("jbosgi99-bundleA.jar");
-      assertTrue("Bundle installed", bundleA.getState() == Bundle.INSTALLED || bundleA.getState() == Bundle.RESOLVED);
+      assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState());
 
       bundleA.start();
       assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState());