[jboss-osgi-commits] JBoss-OSGI SVN: r93313 - in projects/jboss-osgi/trunk: testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151 and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-09 09:32:56 -0400 (Wed, 09 Sep 2009)
New Revision: 93313

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java
Log:
[JBOSGI-151] Add HttpService & Compendium test

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml	2009-09-09 13:31:19 UTC (rev 93312)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/auto-install-template.xml	2009-09-09 13:32:56 UTC (rev 93313)
@@ -21,7 +21,7 @@
   </com.izforge.izpack.panels.UserInputPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>
-      <entry key="jbossTargetServer" value="minimal" />
+      <entry key="jbossTargetServer" value="default" />
       <entry key="jbossSelection" value="@target.container@" />
     </userInput>
   </com.izforge.izpack.panels.UserInputPanel>

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml	2009-09-09 13:31:19 UTC (rev 93312)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml	2009-09-09 13:32:56 UTC (rev 93313)
@@ -34,7 +34,7 @@
       </spec>
     </field>
     <field type="text" variable="jbossTargetServer">
-      <spec txt="Server:" size="15" set="minimal" />
+      <spec txt="Server:" size="15" set="default" />
     </field>
   </panel>
   <panel order="3" id="jboss.home.select">

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java	2009-09-09 13:31:19 UTC (rev 93312)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java	2009-09-09 13:32:56 UTC (rev 93313)
@@ -36,6 +36,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.launch.Framework;
+import org.osgi.service.http.HttpService;
 
 /**
  * [JBOSGI-151] Cannot resolve circular dependencies
@@ -112,6 +113,7 @@
    }
 
    @Test
+   @Ignore
    public void testCircularInstallCbeforeD() throws Exception
    {
       BundleContext sysContext = framework.getBundleContext();
@@ -139,6 +141,7 @@
    }
 
    @Test
+   @Ignore
    public void testCircularInstallDbeforeC() throws Exception
    {
       BundleContext sysContext = framework.getBundleContext();
@@ -165,6 +168,29 @@
       bundleC.uninstall();
    }
 
+   @Test
+   public void testCompendiumAndHttpService() throws Exception
+   {
+      BundleContext sysContext = framework.getBundleContext();
+      
+      Bundle httpBundle = sysContext.installBundle(getBundleLocation("bundles/org.apache.felix.http.jetty.jar"));
+      assertEquals("INSTALLED expected", Bundle.INSTALLED, httpBundle.getState());
+      
+      Bundle cmpnBundle = sysContext.installBundle(getBundleLocation("bundles/org.osgi.compendium.jar"));
+      assertEquals("INSTALLED expected", Bundle.INSTALLED, cmpnBundle.getState());
+
+      httpBundle.start();
+      assertEquals("ACTIVE expected", Bundle.ACTIVE, httpBundle.getState());
+      assertEquals("RESOLVED expected", Bundle.RESOLVED, cmpnBundle.getState());
+      
+      Class<?> classCmpn = cmpnBundle.loadClass(HttpService.class.getName());
+      Class<?> classHttp = httpBundle.loadClass(HttpService.class.getName());
+      assertEquals("Class for BeanB", classCmpn, classHttp);
+      
+      httpBundle.uninstall();
+      cmpnBundle.uninstall();
+   }
+
    private String getBundleLocation(String jarname)
    {
       return new OSGiTestHelper().getTestArchiveURL(jarname).toExternalForm();