[jboss-osgi-commits] JBoss-OSGI SVN: r87336 - in projects/jboss-osgi/trunk/testsuite: src/test/java/org/jboss/test/osgi/service and 3 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-04-15 07:31:26 -0400 (Wed, 15 Apr 2009)
New Revision: 87336

Added:
   projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/service-startlevel.bnd
Removed:
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/
   projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/startlevel-service.bnd
Modified:
   projects/jboss-osgi/trunk/testsuite/scripts/antrun-test-jars.xml
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelRemoteTestCase.java
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java
Log:
Refine startlevel service test

Modified: projects/jboss-osgi/trunk/testsuite/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/scripts/antrun-test-jars.xml	2009-04-15 11:10:12 UTC (rev 87335)
+++ projects/jboss-osgi/trunk/testsuite/scripts/antrun-test-jars.xml	2009-04-15 11:31:26 UTC (rev 87336)
@@ -23,6 +23,8 @@
     <property name="tests.output.dir" value="${basedir}/../target" />
 
     <mkdir dir="${tests.output.dir}/test-libs/example" />
+    <mkdir dir="${tests.output.dir}/test-libs/service" />
+    
     <property name="tests.classes.dir" value="${tests.output.dir}/test-classes" />
     <property name="tests.resources.dir" value="${tests.output.dir}/test-classes" />
 
@@ -77,7 +79,7 @@
     <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi41-bundleA.jar" files="${tests.resources.dir}/jbosgi41/jbosgi41-bundleA.bnd" />
   	
     <!-- startlevel-service -->
-    <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/startlevel-service.jar" files="${tests.resources.dir}/service/startlevel/startlevel-service.bnd" />
+    <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/service-startlevel.jar" files="${tests.resources.dir}/service/startlevel/service-startlevel.bnd" />
 
     <!-- Please add alphabetically -->
 

Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelRemoteTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelRemoteTestCase.java	2009-04-15 11:10:12 UTC (rev 87335)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelRemoteTestCase.java	2009-04-15 11:31:26 UTC (rev 87336)
@@ -37,10 +37,10 @@
 {
    public void testStartLevel() throws Exception
    {
-      RemoteBundle bundle = deployBundle("startlevel-service.jar");
+      RemoteBundle bundle = deployBundle("service/service-startlevel.jar");
       
       assertEquals("Bundle active", Bundle.ACTIVE, bundle.getState());
       
-      undeployBundle("startlevel-service.jar");
+      undeployBundle("service/service-startlevel.jar");
    }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java	2009-04-15 11:10:12 UTC (rev 87335)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java	2009-04-15 11:31:26 UTC (rev 87336)
@@ -23,8 +23,10 @@
 
 //$Id$
 
+import org.jboss.osgi.common.log.LogServiceTracker;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
 import org.osgi.service.startlevel.StartLevel;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -36,20 +38,19 @@
  */
 public class ServiceActivator implements BundleActivator
 {
-   /*
-    * Implements BundleActivator.start(). 
-    */
    public void start(BundleContext context)
    {
+      LogService log = new LogServiceTracker(context);
+      
       ServiceTracker tracker = new ServiceTracker(context, StartLevel.class.getName(), null);
       tracker.open();
       
       StartLevel service = (StartLevel)tracker.getService();
       if (service == null)
-         System.err.println("Cannot get StartLevel. Loaded with: " + StartLevel.class.getClassLoader());
+         log.log(LogService.LOG_ERROR, "Cannot get StartLevel. Loaded with: " + StartLevel.class.getClassLoader());
       
       int level = service.getStartLevel();
-      System.out.println("StartLevel: " + level);
+      log.log(LogService.LOG_INFO, "StartLevel: " + level);
    }
 
    /*

Copied: projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/service-startlevel.bnd (from rev 87324, projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/startlevel-service.bnd)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/service-startlevel.bnd	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/service-startlevel.bnd	2009-04-15 11:31:26 UTC (rev 87336)
@@ -0,0 +1,5 @@
+# bnd build -classpath target/test-classes -output target/test-libs/service/service-startlevel.jar src/test/resources/service/startlevel/service-startlevel.bnd
+
+Bundle-SymbolicName: service-startlevel
+Bundle-Activator: org.jboss.test.osgi.service.startlevel.bundle.ServiceActivator
+Export-Package: org.jboss.test.osgi.service.startlevel.bundle

Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/startlevel-service.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/startlevel-service.bnd	2009-04-15 11:10:12 UTC (rev 87335)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/service/startlevel/startlevel-service.bnd	2009-04-15 11:31:26 UTC (rev 87336)
@@ -1,5 +0,0 @@
-# bnd build -classpath target/test-classes -output target/test-libs/startlevel-service.jar src/test/resources/service/startlevel/startlevel-service.bnd
-
-Bundle-SymbolicName: startlevel-service
-Bundle-Activator: org.jboss.test.osgi.service.startlevel.bundle.ServiceActivator
-Export-Package: org.jboss.test.osgi.service.startlevel.bundle