[jboss-cvs] JBossAS SVN: r87863 - in projects/jboss-osgi/trunk/bundle/blueprint/src/test: resources and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-04-27 09:15:42 -0400 (Mon, 27 Apr 2009)
New Revision: 87863

Modified:
   projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/microcontainer/MicrocontainerTestCase.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
Log:
Simplify MicrocontainerTestCase

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/microcontainer/MicrocontainerTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/microcontainer/MicrocontainerTestCase.java	2009-04-27 13:09:03 UTC (rev 87862)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/microcontainer/MicrocontainerTestCase.java	2009-04-27 13:15:42 UTC (rev 87863)
@@ -29,7 +29,7 @@
 import org.osgi.framework.BundleContext;
 
 /**
- * A test that deployes the jboss-osgi-microcontainer bundle
+ * A test that checks whether the MicrocontainerService can be accessed
  * 
  * @author thomas.diesler at jboss.com
  * @since 12-Feb-2009
@@ -44,10 +44,7 @@
       {
          BundleContext sysContext = framework.getSystemBundleContext();
          
-         Bundle bundle = installBundle(sysContext, "bundles/jboss-osgi-microcontainer.jar", true);
-         assertEquals("Microcontainer bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
-         
-         bundle = installBundle(sysContext, "microcontainer-test.jar", true);
+         Bundle bundle = installBundle(sysContext, "microcontainer-test.jar", true);
          assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
          
       }

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties	2009-04-27 13:09:03 UTC (rev 87862)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties	2009-04-27 13:15:42 UTC (rev 87863)
@@ -26,7 +26,8 @@
 # Bundles that need to be started automatically 
 framework.autoStart=\
 	file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+	file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
 	file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \
-	file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
+	file://${test.archive.directory}/bundles/jboss-osgi-microcontainer.jar \
 	file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar 
 	
\ No newline at end of file