[jboss-osgi-commits] JBoss-OSGI SVN: r103407 - projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader.

Author: thomas.diesler(a)jboss.com Date: 2010-04-01 06:33:33 -0400 (Thu, 01 Apr 2010) New Revision: 103407 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java Log: [JBCL-131] More test coverage Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java 2010-04-01 09:22:25 UTC (rev 103406) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/DynamicImportPackageTestCase.java 2010-04-01 10:33:33 UTC (rev 103407) @@ -45,10 +45,15 @@ */ public class DynamicImportPackageTestCase extends OSGiFrameworkTest { - private static JavaArchive archiveC; + @Before + public void setUp() throws Exception + { + super.setUp(); + getPackageAdmin().refreshPackages(null); + } - @BeforeClass - public static void beforeTestCase() + @Test + public void testAllPackagesWildcardWired() throws Exception { // Bundle-SymbolicName: dynamic-log-service // DynamicImport-Package: org.osgi.service.log @@ -66,14 +71,6 @@ }); } - @Before - @Override - public void setUp() throws Exception - { - super.setUp(); - getPackageAdmin().refreshPackages(null); - } - @Test public void testAllPackagesWildcard() throws Exception { @@ -244,12 +241,12 @@ } @Test - public void testPackagesWildcardNotThere() throws Exception + public void testPackageWildcardWired() throws Exception { // Bundle-SymbolicName: dynamic-wildcard-a // Export-Package: org.jboss.test.osgi.classloader.support.a // Import-Package: org.jboss.test.osgi.classloader.support.b - // DynamicImport-Package: foo.* + // DynamicImport-Package: org.jboss.test.osgi.classloader.* final JavaArchive archiveA = Archives.create("dynamic-wildcard-a", JavaArchive.class); archiveA.addClass(A.class); archiveA.setManifest(new Asset() @@ -261,7 +258,7 @@ builder.addBundleSymbolicName(archiveA.getName()); builder.addExportPackages(A.class.getPackage().getName()); builder.addImportPackages(B.class.getPackage().getName()); - builder.addDynamicImportPackages("foo.*"); + builder.addDynamicImportPackages("org.jboss.test.osgi.classloader.*"); return builder.openStream(); } }); @@ -294,7 +291,8 @@ assertLoadClass(bundleA, A.class.getName(), bundleA); assertLoadClass(bundleA, B.class.getName(), bundleB); - assertLoadClassFail(bundleA, C.class.getName()); + System.out.println("FIXME [JBCL-131] Add a notion of on demand resolution"); + //assertLoadClass(bundleA, C.class.getName(), bundleB); assertBundleState(Bundle.RESOLVED, bundleA.getState()); assertBundleState(Bundle.RESOLVED, bundleB.getState()); @@ -311,6 +309,107 @@ } @Test + public void testPackageWildcardNotWired() throws Exception + { + // Bundle-SymbolicName: dynamic-wildcard-a + // Export-Package: org.jboss.test.osgi.classloader.support.a + // DynamicImport-Package: org.jboss.test.osgi.classloader.* + final JavaArchive archiveA = Archives.create("dynamic-wildcard-a", JavaArchive.class); + archiveA.addClass(A.class); + archiveA.setManifest(new Asset() + { + public InputStream openStream() + { + OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance(); + builder.addBundleManifestVersion(2); + builder.addBundleSymbolicName(archiveA.getName()); + builder.addExportPackages(A.class.getPackage().getName()); + builder.addDynamicImportPackages("org.jboss.test.osgi.classloader.*"); + return builder.openStream(); + } + }); + + // Bundle-SymbolicName: dynamic-wildcard-c + // Export-Package: org.jboss.test.osgi.classloader.support.c + final JavaArchive archiveC = Archives.create("dynamic-wildcard-c", JavaArchive.class); + archiveC.addClasses(C.class); + archiveC.setManifest(new Asset() + { + public InputStream openStream() + { + OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance(); + builder.addBundleManifestVersion(2); + builder.addBundleSymbolicName(archiveC.getName()); + builder.addExportPackages(C.class.getPackage().getName()); + return builder.openStream(); + } + }); + + Bundle bundleA = installBundle(archiveA); + assertBundleState(Bundle.INSTALLED, bundleA.getState()); + try + { + Bundle bundleC = installBundle(archiveC); + assertBundleState(Bundle.INSTALLED, bundleC.getState()); + try + { + assertLoadClass(bundleA, A.class.getName(), bundleA); + + System.out.println("FIXME [JBCL-131] Add a notion of on demand resolution"); + //assertLoadClass(bundleA, C.class.getName(), bundleC); + + assertBundleState(Bundle.RESOLVED, bundleA.getState()); + //assertBundleState(Bundle.RESOLVED, bundleC.getState()); + } + finally + { + bundleC.uninstall(); + } + } + finally + { + bundleA.uninstall(); + } + } + + @Test + public void testPackageWildcardNotThere() throws Exception + { + // Bundle-SymbolicName: dynamic-wildcard-a + // Export-Package: org.jboss.test.osgi.classloader.support.a + // DynamicImport-Package: org.jboss.test.osgi.classloader.* + final JavaArchive archiveA = Archives.create("dynamic-wildcard-a", JavaArchive.class); + archiveA.addClass(A.class); + archiveA.setManifest(new Asset() + { + public InputStream openStream() + { + OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance(); + builder.addBundleManifestVersion(2); + builder.addBundleSymbolicName(archiveA.getName()); + builder.addExportPackages(A.class.getPackage().getName()); + builder.addDynamicImportPackages("*"); + return builder.openStream(); + } + }); + + Bundle bundleA = installBundle(archiveA); + assertBundleState(Bundle.INSTALLED, bundleA.getState()); + try + { + assertLoadClass(bundleA, A.class.getName(), bundleA); + + assertLoadClassFail(bundleA, C.class.getName()); + + assertBundleState(Bundle.RESOLVED, bundleA.getState()); + } + finally + { + bundleA.uninstall(); + } + } + + @Test public void testLogServiceAvailableOnInstall() throws Exception { Bundle cmpd = installBundle("bundles/org.osgi.compendium.jar"); @@ -362,4 +461,25 @@ bundleC.uninstall(); } } + + @BeforeClass + public static void beforeTestCase() + { + // Bundle-SymbolicName: dynamic-log-service + // DynamicImport-Package: org.osgi.service.log + archiveC = Archives.create("dynamic-log-service", JavaArchive.class); + archiveC.setManifest(new Asset() + { + public InputStream openStream() + { + OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance(); + builder.addBundleManifestVersion(2); + builder.addBundleSymbolicName(archiveC.getName()); + builder.addDynamicImportPackages("org.osgi.service.log"); + return builder.openStream(); + } + }); + } + + private static JavaArchive archiveC; }