[jboss-cvs] JBossAS SVN: r90469 - in projects/jboss-osgi/trunk: spi/src/main/java/org/jboss/osgi/spi/testing/internal and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-06-19 07:38:07 -0400 (Fri, 19 Jun 2009)
New Revision: 90469

Modified:
   projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java
Log:
Disable BP testing for remote runtimes

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml	2009-06-19 11:16:46 UTC (rev 90468)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml	2009-06-19 11:38:07 UTC (rev 90469)
@@ -144,15 +144,14 @@
   <profiles>
   
     <!--
-      Name: framework-equinox
-      Descr: Setup for Equinox framework integration testing
+      Name: explicit-framework
+      Descr: Setup for framework integration testing
     -->
     <profile>
-      <id>framework-equinox</id>
+      <id>explicit-framework</id>
       <activation>
         <property>
           <name>framework</name>
-          <value>equinox</value>
         </property>
       </activation>
       <build>
@@ -166,41 +165,16 @@
         </plugins>
       </build>
     </profile>
-
-    <!--
-      Name: framework-knopflerfish
-      Descr: Setup for Knopflerfish framework integration testing
-    -->
-    <profile>
-      <id>framework-knopflerfish</id>
-      <activation>
-        <property>
-          <name>framework</name>
-          <value>knopflerfish</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     
     <!--
-      Name: jboss501
-      Descr: Setup for jboss501 integration testing
+      Name: remote-testing 
+      Descr: Setup for remote integration testing
     -->
     <profile>
-      <id>jboss501</id>
+      <id>remote-testing</id>
       <activation>
         <property>
           <name>target.container</name>
-          <value>jboss501</value>
         </property>
       </activation>
       <build>
@@ -214,55 +188,6 @@
         </plugins>
       </build>
     </profile>
-
-    <!--
-      Name: jboss510
-      Descr: Setup for jboss510 integration testing
-    -->
-    <profile>
-      <id>jboss510</id>
-      <activation>
-        <property>
-          <name>target.container</name>
-          <value>jboss510</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!--
-      Name: jboss600
-      Descr: Setup for jboss600 integration testing
-    -->
-    <profile>
-      <id>jboss600</id>
-      <activation>
-        <property>
-          <name>target.container</name>
-          <value>jboss600</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
   </profiles>
 
 </project>

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java	2009-06-19 11:16:46 UTC (rev 90468)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java	2009-06-19 11:38:07 UTC (rev 90469)
@@ -221,9 +221,7 @@
    public void shutdown()
    {
       super.shutdown();
-      
-      // https://jira.jboss.org/jira/browse/JBOSGI-107
-      //getPackageAdmin().refreshPackages(null);
+      getPackageAdmin().refreshPackages(null);
    }
 
    private RemoteFramework getRemoteFramework()

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java	2009-06-19 11:16:46 UTC (rev 90468)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java	2009-06-19 11:38:07 UTC (rev 90469)
@@ -31,7 +31,6 @@
 import org.jboss.osgi.spi.testing.OSGiPackageAdmin;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
@@ -130,7 +129,6 @@
    }
 
    @Test
-   @Ignore(value="[JBOSGI-107] MC service cannot be refreshed")
    public void testWiringToUninstalledPackageAdmin() throws Exception
    {
       OSGiRuntime runtime = getDefaultRuntime();