[jboss-osgi-commits] JBoss-OSGI SVN: r102342 - in projects/jboss-osgi/projects: testing/trunk/src/main/java/org/jboss/osgi/testing and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-12 04:20:24 -0500 (Fri, 12 Mar 2010) New Revision: 102342 Added: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeHelper.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeTest.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java Removed: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleTestCase.java Log: Seperate abstract runtime testing from OSGiTest Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -31,7 +31,7 @@ import org.jboss.osgi.husky.RuntimeContext; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -57,7 +57,7 @@ { if (context == null) { - runtime = new OSGiTestHelper().getDefaultRuntime(); + runtime = new OSGiRuntimeHelper().getDefaultRuntime(); runtime.addCapability(new HuskyCapability()); OSGiBundle bundle = runtime.installBundle("context-basic.jar"); Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -31,7 +31,7 @@ import org.jboss.osgi.husky.RuntimeContext; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -57,7 +57,7 @@ { if (context == null) { - runtime = new OSGiTestHelper().getDefaultRuntime(); + runtime = new OSGiRuntimeHelper().getDefaultRuntime(); runtime.addCapability(new HuskyCapability()); OSGiBundle bundle = runtime.installBundle("context-basic.jar"); Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -31,7 +31,7 @@ import org.jboss.osgi.husky.RuntimeContext; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -57,7 +57,7 @@ { if (context == null) { - runtime = new OSGiTestHelper().getDefaultRuntime(); + runtime = new OSGiRuntimeHelper().getDefaultRuntime(); runtime.addCapability(new HuskyCapability()); OSGiBundle bundle = runtime.installBundle("context-basic.jar"); Copied: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeHelper.java (from rev 102228, projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java) =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeHelper.java (rev 0) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeHelper.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.testing; + +import org.jboss.osgi.spi.framework.OSGiBootstrap; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.testing.internal.EmbeddedRuntime; +import org.jboss.osgi.testing.internal.RemoteRuntime; + +/** + * A helper for the OSGi runtime abstraction. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public class OSGiRuntimeHelper extends OSGiTestHelper +{ + // The OSGiBootstrapProvider is a lazy property of the helper + private OSGiBootstrapProvider bootProvider; + private boolean skipBootstrap; + + public OSGiBootstrapProvider getBootstrapProvider() + { + if (bootProvider == null && skipBootstrap == false) + { + try + { + bootProvider = OSGiBootstrap.getBootstrapProvider(); + } + catch (RuntimeException rte) + { + skipBootstrap = true; + throw rte; + } + } + return bootProvider; + } + + public void ungetBootstrapProvider() + { + bootProvider = null; + } + + public OSGiRuntime getDefaultRuntime() + { + OSGiRuntime runtime; + + String target = System.getProperty("target.container"); + if (target == null) + { + runtime = getEmbeddedRuntime(); + } + else + { + runtime = getRemoteRuntime(); + } + return runtime; + } + + public OSGiRuntime getEmbeddedRuntime() + { + return new EmbeddedRuntime(this); + } + + public OSGiRuntime getRemoteRuntime() + { + return new RemoteRuntime(this); + } +} Copied: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeTest.java (from rev 102228, projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java) =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeTest.java (rev 0) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntimeTest.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.testing; + +/** + * An abstract OSGi runtime test. + * + * A convenience wrapper for the functionality provided by {@link OSGiRuntimeHelper}. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public abstract class OSGiRuntimeTest extends OSGiTest +{ + private OSGiRuntimeHelper helper; + + /** + * Get the test helper used by this test + * + * Overwrite if you need to supply another helper + * i.e. one that you have statically setup + */ + protected OSGiRuntimeHelper getRuntimeHelper() + { + if (helper == null) + helper = new OSGiRuntimeHelper(); + + return helper; + } + + /** + * Delegates to {@link OSGiRuntimeHelper#getDefaultRuntime()} + */ + protected OSGiRuntime getDefaultRuntime() + { + return getRuntimeHelper().getDefaultRuntime(); + } + + /** + * Delegates to {@link OSGiRuntimeHelper#getEmbeddedRuntime()} + */ + protected OSGiRuntime getEmbeddedRuntime() + { + return getRuntimeHelper().getEmbeddedRuntime(); + } + + /** + * Delegates to {@link OSGiRuntimeHelper#getRemoteRuntime()} + */ + public OSGiRuntime getRemoteRuntime() + { + return getRuntimeHelper().getRemoteRuntime(); + } +} Deleted: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -1,240 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.testing; - -import java.io.File; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.logging.Logger; -import org.jboss.osgi.vfs.VirtualFile; -import org.junit.After; -import org.junit.Before; -import org.osgi.framework.Bundle; - -/** - * An abstract OSGi Test. - * - * A convenience wrapper for the functionality provided by {@link OSGiTestHelper}. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public abstract class OSGiTest -{ - // Provide logging - private static final Logger log = Logger.getLogger(OSGiTest.class); - - private OSGiTestHelper helper; - - protected OSGiTest() - { - } - - /** - * Get the test helper used by this test - * - * Overwrite if you need to supply another helper - * i.e. one that you have statically setup - */ - protected OSGiTestHelper getTestHelper() - { - if (helper == null) - helper = new OSGiTestHelper(); - - return helper; - } - - /** - * Writes a a debug start messge - */ - @Before - public void setUp() throws Exception - { - log.debug("### START " + getLongName()); - } - - /** - * Writes a a debug stop messge - */ - @After - public void tearDown() throws Exception - { - log.debug("### END " + getLongName()); - } - - /** - * Get the last token in the FQN of this test class. - */ - protected String getShortName() - { - String shortName = getClass().getName(); - shortName = shortName.substring(shortName.lastIndexOf(".") + 1); - return shortName; - } - - /** - * Get the the FQN of this test class. - */ - protected String getLongName() - { - return getClass().getName(); - } - - /** - * Delegates to {@link OSGiTestHelper#getDefaultRuntime()} - */ - protected OSGiRuntime getDefaultRuntime() - { - return getTestHelper().getDefaultRuntime(); - } - - /** - * Delegates to {@link OSGiTestHelper#getEmbeddedRuntime()} - */ - protected OSGiRuntime getEmbeddedRuntime() - { - return getTestHelper().getEmbeddedRuntime(); - } - - /** - * Delegates to {@link OSGiTestHelper#getRemoteRuntime()} - */ - public OSGiRuntime getRemoteRuntime() - { - return getTestHelper().getRemoteRuntime(); - } - - /** - * Delegates to {@link OSGiTestHelper#getResourceURL(String)} - */ - protected URL getResourceURL(String resource) - { - return getTestHelper().getResourceURL(resource); - } - - /** - * Delegates to {@link OSGiTestHelper#getResourceFile(String)} - */ - protected File getResourceFile(String resource) - { - return getTestHelper().getResourceFile(resource); - } - - /** - * Delegates to {@link OSGiTestHelper#getTestArchiveURL(String)} - */ - protected URL getTestArchiveURL(String archive) - { - return getTestHelper().getTestArchiveURL(archive); - } - - /** - * Delegates to {@link OSGiTestHelper#getTestArchivePath(String)} - */ - protected String getTestArchivePath(String archive) - { - return getTestHelper().getTestArchivePath(archive); - } - - /** - * Delegates to {@link OSGiTestHelper#getTestArchiveFile(String)} - */ - protected File getTestArchiveFile(String archive) - { - return getTestHelper().getTestArchiveFile(archive); - } - - /** - * Delegates to {@link OSGiTestHelper#getInitialContext()} - */ - public InitialContext getInitialContext() throws NamingException - { - return getTestHelper().getInitialContext(); - } - - /** - * Delegates to {@link OSGiTestHelper#getServerHost()} - */ - public String getServerHost() - { - return getTestHelper().getServerHost(); - } - - /** - * Delegates to {@link OSGiTestHelper#getTargetContainer()} - */ - public String getTargetContainer() - { - return getTestHelper().getTargetContainer(); - } - - /** - * Delegates to {@link OSGiTestHelper#getFrameworkName()} - */ - public String getFrameworkName() - { - return getTestHelper().getFrameworkName(); - } - - /** - * Delegates to {@link OSGiTestHelper#assembleArchive(String, String, Class...)} - */ - public VirtualFile assembleArchive(String name, String resource, Class<?>... packages) throws Exception - { - return getTestHelper().assembleArchive(name, resource, packages); - } - - /** - * Delegates to {@link OSGiTestHelper#assembleArchive(String, String[], Class...)} - */ - public VirtualFile assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception - { - return getTestHelper().assembleArchive(name, resources, packages); - } - - /** - * Delegates to {@link OSGiTestHelper#assertBundleState(int, int)} - */ - public void assertBundleState(int expState, int wasState) - { - getTestHelper().assertBundleState(expState, wasState); - } - - /** - * Delegates to {@link OSGiTestHelper#assertLoadClass(Bundle, String)} - */ - public Class<?> assertLoadClass(Bundle bundle, String className) - { - return getTestHelper().assertLoadClass(bundle, className); - } - - /** - * Delegates to {@link OSGiTestHelper#assertLoadClassFail(Bundle, String)} - */ - public void assertLoadClassFail(Bundle bundle, String className) - { - getTestHelper().assertLoadClassFail(bundle, className); - } -} Copied: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java (from rev 102228, projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java) =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java (rev 0) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -0,0 +1,212 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.testing; + +import java.io.File; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.logging.Logger; +import org.jboss.osgi.vfs.VirtualFile; +import org.junit.After; +import org.junit.Before; +import org.osgi.framework.Bundle; + +/** + * An abstract OSGi Test. + * + * A convenience wrapper for the functionality provided by {@link OSGiTestHelper}. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public abstract class OSGiTest +{ + // Provide logging + private static final Logger log = Logger.getLogger(OSGiTest.class); + + private OSGiTestHelper helper; + + /** + * Get the test helper used by this test + * + * Overwrite if you need to supply another helper + * i.e. one that you have statically setup + */ + protected OSGiTestHelper getTestHelper() + { + if (helper == null) + helper = new OSGiTestHelper(); + + return helper; + } + + /** + * Writes a a debug start messge + */ + @Before + public void setUp() throws Exception + { + log.debug("### START " + getLongName()); + } + + /** + * Writes a a debug stop messge + */ + @After + public void tearDown() throws Exception + { + log.debug("### END " + getLongName()); + } + + /** + * Get the last token in the FQN of this test class. + */ + protected String getShortName() + { + String shortName = getClass().getName(); + shortName = shortName.substring(shortName.lastIndexOf(".") + 1); + return shortName; + } + + /** + * Get the the FQN of this test class. + */ + protected String getLongName() + { + return getClass().getName(); + } + + /** + * Delegates to {@link OSGiTestHelper#getResourceURL(String)} + */ + protected URL getResourceURL(String resource) + { + return getTestHelper().getResourceURL(resource); + } + + /** + * Delegates to {@link OSGiTestHelper#getResourceFile(String)} + */ + protected File getResourceFile(String resource) + { + return getTestHelper().getResourceFile(resource); + } + + /** + * Delegates to {@link OSGiTestHelper#getTestArchiveURL(String)} + */ + protected URL getTestArchiveURL(String archive) + { + return getTestHelper().getTestArchiveURL(archive); + } + + /** + * Delegates to {@link OSGiTestHelper#getTestArchivePath(String)} + */ + protected String getTestArchivePath(String archive) + { + return getTestHelper().getTestArchivePath(archive); + } + + /** + * Delegates to {@link OSGiTestHelper#getTestArchiveFile(String)} + */ + protected File getTestArchiveFile(String archive) + { + return getTestHelper().getTestArchiveFile(archive); + } + + /** + * Delegates to {@link OSGiTestHelper#getInitialContext()} + */ + public InitialContext getInitialContext() throws NamingException + { + return getTestHelper().getInitialContext(); + } + + /** + * Delegates to {@link OSGiTestHelper#getServerHost()} + */ + public String getServerHost() + { + return getTestHelper().getServerHost(); + } + + /** + * Delegates to {@link OSGiTestHelper#getTargetContainer()} + */ + public String getTargetContainer() + { + return getTestHelper().getTargetContainer(); + } + + /** + * Delegates to {@link OSGiTestHelper#getFrameworkName()} + */ + public String getFrameworkName() + { + return getTestHelper().getFrameworkName(); + } + + /** + * Delegates to {@link OSGiTestHelper#assembleArchive(String, String, Class...)} + */ + public VirtualFile assembleArchive(String name, String resource, Class<?>... packages) throws Exception + { + return getTestHelper().assembleArchive(name, resource, packages); + } + + /** + * Delegates to {@link OSGiTestHelper#assembleArchive(String, String[], Class...)} + */ + public VirtualFile assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception + { + return getTestHelper().assembleArchive(name, resources, packages); + } + + /** + * Delegates to {@link OSGiTestHelper#assertBundleState(int, int)} + */ + public void assertBundleState(int expState, int wasState) + { + getTestHelper().assertBundleState(expState, wasState); + } + + /** + * Delegates to {@link OSGiTestHelper#assertLoadClass(Bundle, String)} + */ + public Class<?> assertLoadClass(Bundle bundle, String className) + { + return getTestHelper().assertLoadClass(bundle, className); + } + + /** + * Delegates to {@link OSGiTestHelper#assertLoadClassFail(Bundle, String)} + */ + public void assertLoadClassFail(Bundle bundle, String className) + { + getTestHelper().assertLoadClassFail(bundle, className); + } +} Deleted: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -1,338 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.testing; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Hashtable; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.osgi.spi.framework.OSGiBootstrap; -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.util.ConstantsHelper; -import org.jboss.osgi.testing.internal.EmbeddedRuntime; -import org.jboss.osgi.testing.internal.RemoteRuntime; -import org.jboss.osgi.vfs.AbstractVFS; -import org.jboss.osgi.vfs.VirtualFile; -import org.jboss.shrinkwrap.api.Archives; -import org.jboss.shrinkwrap.api.Asset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.osgi.framework.Bundle; - -/** - * An OSGi Test Helper - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public class OSGiTestHelper -{ - private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; - private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; - - // The OSGiBootstrapProvider is a lazy property of the helper - private OSGiBootstrapProvider bootProvider; - private boolean skipCreateBootstrapProvider; - - private static String testResourcesDir; - private static String testArchiveDir; - - public OSGiTestHelper() - { - testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-classes"); - testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs"); - } - - public OSGiBootstrapProvider getBootstrapProvider() - { - if (bootProvider == null && skipCreateBootstrapProvider == false) - { - try - { - bootProvider = OSGiBootstrap.getBootstrapProvider(); - } - catch (RuntimeException rte) - { - skipCreateBootstrapProvider = true; - throw rte; - } - } - return bootProvider; - } - - public void ungetBootstrapProvider() - { - bootProvider = null; - } - - public OSGiRuntime getDefaultRuntime() - { - OSGiRuntime runtime; - - String target = System.getProperty("target.container"); - if (target == null) - { - runtime = getEmbeddedRuntime(); - } - else - { - runtime = getRemoteRuntime(); - } - return runtime; - } - - public OSGiRuntime getEmbeddedRuntime() - { - return new EmbeddedRuntime(this); - } - - public OSGiRuntime getRemoteRuntime() - { - return new RemoteRuntime(this); - } - - /** Try to discover the URL for the test resource */ - public URL getResourceURL(String resource) - { - URL resURL = null; - try - { - File resourceFile = getResourceFile(resource); - resURL = resourceFile.toURI().toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - return resURL; - } - - /** Try to discover the File for the test resource */ - public File getResourceFile(String resource) - { - File file = new File(resource); - if (file.exists()) - return file; - - file = new File(testResourcesDir + "/" + resource); - if (file.exists()) - return file; - - throw new IllegalArgumentException("Cannot obtain '" + testResourcesDir + "/" + resource + "'"); - } - - /** Try to discover the URL for the deployment archive */ - public URL getTestArchiveURL(String archive) - { - try - { - return getTestArchiveFile(archive).toURI().toURL(); - } - catch (MalformedURLException ex) - { - throw new IllegalStateException(ex); - } - } - - /** Try to discover the absolute path for the deployment archive */ - public String getTestArchivePath(String archive) - { - return getTestArchiveFile(archive).getAbsolutePath(); - } - - /** Try to discover the File for the deployment archive */ - public File getTestArchiveFile(String archive) - { - File file = new File(archive); - if (file.exists()) - return file; - - file = new File(testArchiveDir + "/" + archive); - if (file.exists()) - return file; - - throw new IllegalArgumentException("Cannot obtain '" + testArchiveDir + "/" + archive + "'."); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public InitialContext getInitialContext() throws NamingException - { - String port = System.getProperty("jndi.server.port", "1099"); - Integer jndiPort = new Integer(port); - - Hashtable env = new Hashtable(); - env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); - env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); - env.put("java.naming.provider.url", "jnp://" + getServerHost() + ":" + jndiPort); - return new InitialContext(env); - } - - public String getServerHost() - { - String bindAddress = System.getProperty("jboss.bind.address", "localhost"); - return bindAddress; - } - - public String getTargetContainer() - { - String targetContainer = System.getProperty("target.container"); - return targetContainer; - } - - public String getFrameworkName() - { - String framework = System.getProperty("framework"); - if (framework == null || framework.length() == 0 || framework.equals("${framework}")) - framework = "jbossmc"; - - return framework; - } - - public VirtualFile assembleArchive(String name, String resource, Class<?>... packages) throws Exception - { - return assembleArchive(name, new String[] { resource }, packages); - } - - public VirtualFile assembleArchive(String name, String[] resources, Class<?>... packages) throws IOException - { - JavaArchive archive = Archives.create(name + ".jar", JavaArchive.class); - if (resources != null) - { - for (String res : resources) - { - URL url = getClass().getResource(res); - if (url == null) - throw new IllegalArgumentException("Cannot load resource: " + res); - - final VirtualFile file = AbstractVFS.getRoot(url); - if (file.isDirectory()) - { - addResources(archive, file, file); - } - else - { - addResource(archive, res, file); - } - } - } - if (packages != null) - { - for (Class<?> clazz : packages) - { - URL url = clazz.getResource("/"); - VirtualFile base = AbstractVFS.getRoot(url); - - String path = clazz.getName().replace('.', '/'); - path = path.substring(0, path.lastIndexOf("/")); - - VirtualFile classes = base.getChild(path); - addResources(archive, base, classes); - } - } - - // Convert archive to file URL - ZipExporter exporter = archive.as(ZipExporter.class); - File target = File.createTempFile("archive_", ".jar"); - exporter.exportZip(target, true); - target.deleteOnExit(); - - return AbstractVFS.getRoot(target.toURI().toURL()); - } - - private void addResources(JavaArchive archive, VirtualFile basedir, VirtualFile resdir) throws IOException - { - String basepath = basedir.getPathName(); - for (final VirtualFile child : resdir.getChildrenRecursively()) - { - if (child.isDirectory()) - continue; - - String path = child.getPathName(); - path = path.substring(basepath.length()); - - addResource(archive, path, child); - } - } - - private void addResource(JavaArchive archive, String path, final VirtualFile file) - { - Asset asset = new Asset() - { - public InputStream openStream() - { - try - { - return file.openStream(); - } - catch (IOException ex) - { - throw new IllegalStateException("Cannot open stream for: " + file, ex); - } - } - }; - archive.add(asset, path); - } - - public void assertBundleState(int expState, int wasState) - { - String expstr = ConstantsHelper.bundleState(expState); - String wasstr = ConstantsHelper.bundleState(wasState); - assertEquals("Bundle " + expstr, expstr, wasstr); - } - - public Class<?> assertLoadClass(Bundle bundle, String className) - { - try - { - return bundle.loadClass(className); - } - catch (ClassNotFoundException ex) - { - String message = bundle.getSymbolicName() + " loads " + className; - fail("Unexpected ClassNotFoundException for: " + message); - return null; - } - } - - public void assertLoadClassFail(Bundle bundle, String className) - { - try - { - Class<?> clazz = bundle.loadClass(className); - String message = bundle.getSymbolicName() + " loads " + className; - fail("ClassNotFoundException expected for: " + message + "\nLoaded from " + clazz.getClassLoader()); - } - catch (ClassNotFoundException ex) - { - // expected - } - } -} Copied: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java (from rev 102228, projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java) =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java (rev 0) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -0,0 +1,282 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.testing; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Hashtable; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.osgi.spi.util.ConstantsHelper; +import org.jboss.osgi.vfs.AbstractVFS; +import org.jboss.osgi.vfs.VirtualFile; +import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.Asset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.osgi.framework.Bundle; + +/** + * An OSGi Test Helper + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public class OSGiTestHelper +{ + private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; + private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; + + private static String testResourcesDir; + private static String testArchiveDir; + + public OSGiTestHelper() + { + testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-classes"); + testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs"); + } + + /** Try to discover the URL for the test resource */ + public URL getResourceURL(String resource) + { + URL resURL = null; + try + { + File resourceFile = getResourceFile(resource); + resURL = resourceFile.toURI().toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + return resURL; + } + + /** Try to discover the File for the test resource */ + public File getResourceFile(String resource) + { + File file = new File(resource); + if (file.exists()) + return file; + + file = new File(testResourcesDir + "/" + resource); + if (file.exists()) + return file; + + throw new IllegalArgumentException("Cannot obtain '" + testResourcesDir + "/" + resource + "'"); + } + + /** Try to discover the URL for the deployment archive */ + public URL getTestArchiveURL(String archive) + { + try + { + return getTestArchiveFile(archive).toURI().toURL(); + } + catch (MalformedURLException ex) + { + throw new IllegalStateException(ex); + } + } + + /** Try to discover the absolute path for the deployment archive */ + public String getTestArchivePath(String archive) + { + return getTestArchiveFile(archive).getAbsolutePath(); + } + + /** Try to discover the File for the deployment archive */ + public File getTestArchiveFile(String archive) + { + File file = new File(archive); + if (file.exists()) + return file; + + file = new File(testArchiveDir + "/" + archive); + if (file.exists()) + return file; + + throw new IllegalArgumentException("Cannot obtain '" + testArchiveDir + "/" + archive + "'."); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + public InitialContext getInitialContext() throws NamingException + { + String port = System.getProperty("jndi.server.port", "1099"); + Integer jndiPort = new Integer(port); + + Hashtable env = new Hashtable(); + env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); + env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); + env.put("java.naming.provider.url", "jnp://" + getServerHost() + ":" + jndiPort); + return new InitialContext(env); + } + + public String getServerHost() + { + String bindAddress = System.getProperty("jboss.bind.address", "localhost"); + return bindAddress; + } + + public String getTargetContainer() + { + String targetContainer = System.getProperty("target.container"); + return targetContainer; + } + + public String getFrameworkName() + { + String framework = System.getProperty("framework"); + if (framework == null || framework.length() == 0 || framework.equals("${framework}")) + framework = "jbossmc"; + + return framework; + } + + public VirtualFile assembleArchive(String name, String resource, Class<?>... packages) throws Exception + { + return assembleArchive(name, new String[] { resource }, packages); + } + + public VirtualFile assembleArchive(String name, String[] resources, Class<?>... packages) throws IOException + { + JavaArchive archive = Archives.create(name + ".jar", JavaArchive.class); + if (resources != null) + { + for (String res : resources) + { + URL url = getClass().getResource(res); + if (url == null) + throw new IllegalArgumentException("Cannot load resource: " + res); + + final VirtualFile file = AbstractVFS.getRoot(url); + if (file.isDirectory()) + { + addResources(archive, file, file); + } + else + { + addResource(archive, res, file); + } + } + } + if (packages != null) + { + for (Class<?> clazz : packages) + { + URL url = clazz.getResource("/"); + VirtualFile base = AbstractVFS.getRoot(url); + + String path = clazz.getName().replace('.', '/'); + path = path.substring(0, path.lastIndexOf("/")); + + VirtualFile classes = base.getChild(path); + addResources(archive, base, classes); + } + } + + // Convert archive to file URL + ZipExporter exporter = archive.as(ZipExporter.class); + File target = File.createTempFile("archive_", ".jar"); + exporter.exportZip(target, true); + target.deleteOnExit(); + + return AbstractVFS.getRoot(target.toURI().toURL()); + } + + private void addResources(JavaArchive archive, VirtualFile basedir, VirtualFile resdir) throws IOException + { + String basepath = basedir.getPathName(); + for (final VirtualFile child : resdir.getChildrenRecursively()) + { + if (child.isDirectory()) + continue; + + String path = child.getPathName(); + path = path.substring(basepath.length()); + + addResource(archive, path, child); + } + } + + private void addResource(JavaArchive archive, String path, final VirtualFile file) + { + Asset asset = new Asset() + { + public InputStream openStream() + { + try + { + return file.openStream(); + } + catch (IOException ex) + { + throw new IllegalStateException("Cannot open stream for: " + file, ex); + } + } + }; + archive.add(asset, path); + } + + public void assertBundleState(int expState, int wasState) + { + String expstr = ConstantsHelper.bundleState(expState); + String wasstr = ConstantsHelper.bundleState(wasState); + assertEquals("Bundle " + expstr, expstr, wasstr); + } + + public Class<?> assertLoadClass(Bundle bundle, String className) + { + try + { + return bundle.loadClass(className); + } + catch (ClassNotFoundException ex) + { + String message = bundle.getSymbolicName() + " loads " + className; + fail("Unexpected ClassNotFoundException for: " + message); + return null; + } + } + + public void assertLoadClassFail(Bundle bundle, String className) + { + try + { + Class<?> clazz = bundle.loadClass(className); + String message = bundle.getSymbolicName() + " loads " + className; + fail("ClassNotFoundException expected for: " + message + "\nLoaded from " + clazz.getClassLoader()); + } + catch (ClassNotFoundException ex) + { + // expected + } + } +} Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -40,7 +40,7 @@ import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.vfs.VirtualFile; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -62,7 +62,7 @@ private MBeanServer server; - public EmbeddedRuntime(OSGiTestHelper helper) + public EmbeddedRuntime(OSGiRuntimeHelper helper) { super(helper); } Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -53,7 +53,7 @@ import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.jboss.osgi.vfs.AbstractVFS; import org.jboss.osgi.vfs.VirtualFile; import org.jboss.shrinkwrap.api.Archive; @@ -77,7 +77,7 @@ // Provide logging private static final Logger log = Logger.getLogger(OSGiRuntimeImpl.class); - private OSGiTestHelper helper; + private OSGiRuntimeHelper helper; private Map<String, OSGiBundle> bundles = new LinkedHashMap<String, OSGiBundle>(); private List<Capability> capabilities = new ArrayList<Capability>(); @@ -86,12 +86,12 @@ private ServiceStateMBean serviceState; private PackageStateMBean packageState; - public OSGiRuntimeImpl(OSGiTestHelper helper) + public OSGiRuntimeImpl(OSGiRuntimeHelper helper) { this.helper = helper; } - public OSGiTestHelper getTestHelper() + public OSGiRuntimeHelper getTestHelper() { return helper; } Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -47,7 +47,7 @@ import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiRuntimeHelper; import org.osgi.framework.BundleException; import org.osgi.jmx.framework.BundleStateMBean; import org.osgi.jmx.framework.ServiceStateMBean; @@ -65,7 +65,7 @@ private MBeanServerConnection mbeanServer; - public RemoteRuntime(OSGiTestHelper helper) + public RemoteRuntime(OSGiRuntimeHelper helper) { super(helper); } Modified: projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -26,7 +26,7 @@ import org.jboss.osgi.testing.ManifestBuilder; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; -import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.osgi.vfs.VirtualFile; import org.jboss.shrinkwrap.api.Archives; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -40,7 +40,7 @@ * @author thomas.diesler(a)jboss.com * @since 12-Feb-2009 */ -public class SimpleAssemblyTestCase extends OSGiTest +public class SimpleAssemblyTestCase extends OSGiRuntimeTest { @Test public void testAssembleArchive() throws Exception Modified: projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleTestCase.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleTestCase.java 2010-03-12 08:08:53 UTC (rev 102341) +++ projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleTestCase.java 2010-03-12 09:20:24 UTC (rev 102342) @@ -31,7 +31,7 @@ import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiServiceReference; -import org.jboss.osgi.testing.OSGiTest; +import org.jboss.osgi.testing.OSGiRuntimeTest; import org.jboss.osgi.vfs.AbstractVFS; import org.jboss.osgi.vfs.VirtualFile; import org.jboss.test.osgi.testing.bundle.SimpleService; @@ -45,7 +45,7 @@ * @author thomas.diesler(a)jboss.com * @since 12-Feb-2009 */ -public class SimpleTestCase extends OSGiTest +public class SimpleTestCase extends OSGiRuntimeTest { @Ignore public void testSimpleBundle() throws Exception