[jboss-cvs] JBossAS SVN: r102343 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/metadata and 45 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 12 04:23:59 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-12 04:23:57 -0500 (Fri, 12 Mar 2010)
New Revision: 102343
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/nativecode/NativeCodeTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/InterceptorTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jbossxb/XMLBindingTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGi112TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java
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/jbosgi161/OSGi161TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGi214TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGi37TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java
Log:
Seperate abstract runtime testing from OSGiTest
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 09:23:57 UTC (rev 102343)
@@ -173,11 +173,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
@@ -297,130 +292,4 @@
</plugins>
</build>
- <profiles>
- <!--
- Name: embedded-testing
- Descr: Setup for embedded integration testing
- -->
- <profile>
- <id>embedded-testing</id>
- <activation>
- <property>
- <name>!target.container</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs30</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: runtime-testing
- Descr: Setup for runtime integration testing
- -->
- <profile>
- <id>runtime-testing</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>runtime</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs30</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: jboss501
- Descr: Setup for jboss501 integration testing
- -->
- <profile>
- <id>jboss501</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss501</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs21</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: jboss510
- Descr: Setup for jboss510 integration testing
- -->
- <profile>
- <id>jboss510</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss510</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs21</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: jboss600
- Descr: Setup for jboss600 integration testing
- -->
- <profile>
- <id>jboss600</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss600</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs21</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: jboss601
- Descr: Setup for jboss601 integration testing
- -->
- <profile>
- <id>jboss601</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss601</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs30</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -26,7 +26,7 @@
import java.net.URL;
import java.util.jar.Manifest;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.jboss.test.BaseTestCase;
/**
@@ -65,7 +65,7 @@
protected InputStream getManifestInputStream(String name) throws IOException
{
- URL url = new OSGiTestHelper().getResourceURL(name);
+ URL url = new OSGiRuntimeHelper().getResourceURL(name);
if (url == null)
fail(name + " not found");
return url.openStream();
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -26,7 +26,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.jboss.test.osgi.classloader.support.a.A;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -39,7 +39,7 @@
* @author Thomas.Diesler at jboss.com
* @since 07-Oct-2009
*/
-public class BundleClassPathTest extends OSGiTest
+public class BundleClassPathTest extends OSGiRuntimeTest
{
@Test
public void testBundleClassPath() throws Exception
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -29,7 +29,7 @@
import org.jboss.osgi.spi.util.ServiceLoader;
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.jboss.test.osgi.integration.simple.bundleA.SimpleService;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -54,7 +54,7 @@
Framework framework = factory.newFramework(null);
framework.start();
- OSGiTestHelper helper = new OSGiTestHelper();
+ OSGiRuntimeHelper helper = new OSGiRuntimeHelper();
BundleContext sysContext = framework.getBundleContext();
Bundle bundle = sysContext.installBundle(helper.getTestArchivePath("simple-bundle.jar"));
@@ -85,7 +85,7 @@
public void testBundleInstallRuntimeAPI() throws Exception
{
// Uses the JBossOSGi SPI provided runtime abstraction
- OSGiRuntime runtime = new OSGiTestHelper().getEmbeddedRuntime();
+ OSGiRuntime runtime = new OSGiRuntimeHelper().getEmbeddedRuntime();
OSGiBundle bundle = runtime.installBundle("simple-bundle.jar");
assertEquals("simple-bundle", bundle.getSymbolicName());
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -30,7 +30,7 @@
import static org.junit.Assume.assumeTrue;
import org.jboss.osgi.spi.util.ServiceLoader;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -45,7 +45,7 @@
* @author thomas.diesler at jboss.com
* @since 18-Aug-2009
*/
-public class SimpleLogServiceTest extends OSGiTest
+public class SimpleLogServiceTest extends OSGiRuntimeTest
{
@Before
public void setUp()
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/nativecode/NativeCodeTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/nativecode/NativeCodeTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/nativecode/NativeCodeTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -25,7 +25,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,7 +39,7 @@
* @author thomas.diesler at jboss.com
* @since 21-Jan-2010
*/
-public class NativeCodeTestCase extends OSGiTest
+public class NativeCodeTestCase extends OSGiRuntimeTest
{
private static Framework framework;
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -34,7 +34,7 @@
import org.jboss.osgi.framework.resolver.Resolver;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -49,7 +49,7 @@
* @author thomas.diesler at jboss.com
* @since 09-Nov-2009
*/
-public abstract class AbstractResolverTest extends OSGiTest
+public abstract class AbstractResolverTest extends OSGiRuntimeTest
{
protected static OSGiFramework framework;
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -36,7 +36,7 @@
import org.jboss.osgi.framework.resolver.ResolverBundle;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -48,7 +48,7 @@
* @author thomas.diesler at jboss.com
* @since 27-Jul-2009
*/
-public class ResolverSmokeTest extends OSGiTest
+public class ResolverSmokeTest extends OSGiRuntimeTest
{
@Test
public void testRandomBundleResolution() throws BundleException
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 09:23:57 UTC (rev 102343)
@@ -46,16 +46,6 @@
<artifactId>jboss-classloading</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading-vfs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client</artifactId>
</dependency>
@@ -86,30 +76,6 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-jmx</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -36,7 +36,7 @@
import org.jboss.osgi.jmx.JMXCapability;
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.jboss.test.osgi.example.blueprint.bundle.BeanA;
import org.jboss.test.osgi.example.blueprint.bundle.ServiceA;
import org.jboss.test.osgi.example.blueprint.bundle.ServiceB;
@@ -65,7 +65,7 @@
{
if (context == null)
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new HuskyCapability());
runtime.addCapability(new JMXCapability());
runtime.addCapability(new BlueprintCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -34,8 +34,8 @@
import org.jboss.osgi.jmx.MBeanProxy;
import org.jboss.osgi.jmx.ObjectNameFactory;
import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTest;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -47,7 +47,7 @@
* @author thomas.diesler at jboss.com
* @since 15-Feb-2010
*/
-public class JMXEnterpriseTestCase extends OSGiTest
+public class JMXEnterpriseTestCase extends OSGiRuntimeTest
{
private static OSGiRuntime runtime;
@@ -56,7 +56,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- OSGiTestHelper helper = new OSGiTestHelper();
+ OSGiRuntimeHelper helper = new OSGiRuntimeHelper();
runtime = helper.getDefaultRuntime();
runtime.addCapability(new JMXCapability());
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/event/EventAdminTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -37,7 +37,7 @@
import org.jboss.osgi.spi.capability.EventAdminCapability;
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.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -55,7 +55,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Dec-2009
*/
-public class EventAdminTestCase extends OSGiTest
+public class EventAdminTestCase extends OSGiRuntimeTest
{
static String TOPIC = "org/jboss/test/osgi/example/event";
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -33,7 +33,7 @@
import org.jboss.osgi.spi.capability.HttpServiceCapability;
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.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -52,7 +52,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new HttpServiceCapability());
// Allow 10s for the HttpService to become available
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/InterceptorTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/InterceptorTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/InterceptorTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -33,7 +33,7 @@
import org.jboss.osgi.spi.capability.HttpServiceCapability;
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.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -56,7 +56,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new HttpServiceCapability());
// Allow 10s for the HttpService to become available
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -31,7 +31,7 @@
import org.jboss.osgi.jndi.JNDICapability;
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.jboss.test.osgi.example.jmx.bundle.FooMBean;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -50,7 +50,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new JNDICapability());
runtime.addCapability(new JMXCapability());
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -32,7 +32,7 @@
import org.jboss.osgi.jndi.JNDICapability;
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;
@@ -50,7 +50,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new JNDICapability());
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -40,7 +40,7 @@
import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.jta.TransactionCapability;
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;
@@ -65,7 +65,7 @@
{
if (context == null)
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new JMXCapability());
runtime.addCapability(new HuskyCapability());
runtime.addCapability(new TransactionCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -30,7 +30,7 @@
import org.jboss.osgi.jmx.MBeanProxy;
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.jboss.test.osgi.example.microcontainer.bundleA.SomeBeanMBean;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -50,7 +50,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new JMXCapability());
bundleA = runtime.installBundle("example-mcservice-bundleA.jar");
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -33,7 +33,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.test.osgi.example.serviceloader.service.AccountService;
import org.jboss.test.osgi.example.serviceloader.service.internal.AccountServiceImpl;
import org.junit.Test;
@@ -45,7 +45,7 @@
* @author thomas.diesler at jboss.com
* @since 26-Jan-2010
*/
-public class ServiceLoaderTestCase extends OSGiTest
+public class ServiceLoaderTestCase extends OSGiRuntimeTest
{
@Test
public void testTraditionalServiceLoaderAPI() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -32,7 +32,7 @@
import org.jboss.osgi.husky.RuntimeContext;
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.test.osgi.example.simple.bundle.SimpleService;
import org.junit.After;
import org.junit.Before;
@@ -49,7 +49,7 @@
* @author thomas.diesler at jboss.com
* @since 12-Feb-2009
*/
-public class SimpleHuskyTestCase extends OSGiTest
+public class SimpleHuskyTestCase extends OSGiRuntimeTest
{
@RuntimeContext
public BundleContext context;
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -25,7 +25,7 @@
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.junit.Test;
import org.osgi.framework.Bundle;
@@ -35,7 +35,7 @@
* @author thomas.diesler at jboss.com
* @since 12-Feb-2009
*/
-public class SimpleTestCase extends OSGiTest
+public class SimpleTestCase extends OSGiRuntimeTest
{
@Test
public void testSimpleBundle() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,7 +28,7 @@
import java.io.InputStreamReader;
import java.net.URL;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
/**
* Abstract base class for webapp example.
@@ -36,7 +36,7 @@
* @author thomas.diesler at jboss.com
* @since 06-Oct-2009
*/
-public abstract class AbstractWebAppTestCase extends OSGiTest
+public abstract class AbstractWebAppTestCase extends OSGiRuntimeTest
{
protected String getHttpResponse(String reqPath) throws Exception
{
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -27,7 +27,7 @@
import org.jboss.osgi.spi.capability.HttpServiceCapability;
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;
@@ -49,7 +49,7 @@
@BeforeClass
public static void beforeClass() throws Exception
{
- OSGiTestHelper osgiTestHelper = new OSGiTestHelper();
+ OSGiRuntimeHelper osgiTestHelper = new OSGiRuntimeHelper();
runtime = osgiTestHelper.getDefaultRuntime();
runtime.addCapability(new HttpServiceCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -27,7 +27,7 @@
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.jboss.osgi.webapp.WebAppCapability;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -46,7 +46,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- OSGiTestHelper osgiTestHelper = new OSGiTestHelper();
+ OSGiRuntimeHelper osgiTestHelper = new OSGiRuntimeHelper();
runtime = osgiTestHelper.getDefaultRuntime();
runtime.addCapability(new WebAppCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -29,7 +29,7 @@
import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
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.jboss.osgi.webapp.WebAppCapability;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -50,7 +50,7 @@
@BeforeClass
public static void setUpClass() throws Exception
{
- OSGiTestHelper osgiTestHelper = new OSGiTestHelper();
+ OSGiRuntimeHelper osgiTestHelper = new OSGiRuntimeHelper();
runtime = osgiTestHelper.getDefaultRuntime();
runtime.addCapability(new WebAppCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -41,7 +41,7 @@
import org.jboss.osgi.jaxb.JAXBService;
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;
@@ -68,7 +68,7 @@
// Only do this if we are not within the OSGi Runtime
if (context == null)
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new JAXBCapability());
runtime.addCapability(new HuskyCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jbossxb/XMLBindingTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jbossxb/XMLBindingTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jbossxb/XMLBindingTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -35,7 +35,7 @@
import org.jboss.osgi.jbossxb.XMLBindingCapability;
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.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +50,7 @@
* @author thomas.diesler at jboss.com
* @since 26-Nov-2009
*/
-public class XMLBindingTestCase extends OSGiTest
+public class XMLBindingTestCase extends OSGiRuntimeTest
{
@RuntimeContext
public BundleContext context;
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DOMParserTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -38,7 +38,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.jboss.osgi.xml.XMLParserCapability;
import org.junit.After;
import org.junit.Before;
@@ -70,7 +70,7 @@
// Only do this if we are not within the OSGi Runtime
if (context == null)
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new XMLParserCapability());
runtime.addCapability(new HuskyCapability());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -37,7 +37,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.jboss.osgi.xml.XMLParserCapability;
import org.junit.After;
import org.junit.Before;
@@ -68,7 +68,7 @@
// Only do this if we are not within the OSGi Runtime
if (context == null)
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new XMLParserCapability());
runtime.addCapability(new HuskyCapability());
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -29,7 +29,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.Test;
import org.osgi.framework.launch.Framework;
@@ -39,7 +39,7 @@
* @author thomas.diesler at jboss.com
* @since 25-Feb-2009
*/
-public class BootstrapTestCase extends OSGiTest
+public class BootstrapTestCase extends OSGiRuntimeTest
{
@Test
public void testFrameworkBootstrap() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -44,7 +44,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.xml.XMLParserCapability;
import org.junit.Test;
@@ -54,7 +54,7 @@
* @author thomas.diesler at jboss.com
* @since 23-Jan-2009
*/
-public class CapabilityTestCase extends OSGiTest
+public class CapabilityTestCase extends OSGiRuntimeTest
{
@Test
public void testXMLParserCapability() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -35,7 +35,7 @@
import org.jboss.osgi.spi.capability.LogServiceCapability;
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.test.osgi.fragments.fragA.FragBeanA;
import org.jboss.test.osgi.fragments.subA.SubBeanA;
import org.junit.After;
@@ -50,7 +50,7 @@
* @author thomas.diesler at jboss.com
* @since 07-Jan-2010
*/
-public class FragmentTestCase extends OSGiTest
+public class FragmentTestCase extends OSGiRuntimeTest
{
private OSGiRuntime runtime;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -34,7 +34,7 @@
import org.jboss.osgi.spi.capability.LogServiceCapability;
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.jboss.test.osgi.jbosgi108.bundleA.SomeBeanMBean;
import org.junit.AfterClass;
import org.junit.Before;
@@ -56,7 +56,7 @@
@BeforeClass
public static void beforeClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new LogServiceCapability());
runtime.addCapability(new JMXCapability());
}
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGi112TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGi112TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi112/OSGi112TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -25,8 +25,8 @@
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTest;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,14 +42,14 @@
* @author thomas.diesler at jboss.com
* @since 19-Jun-2009
*/
-public class OSGi112TestCase extends OSGiTest
+public class OSGi112TestCase extends OSGiRuntimeTest
{
private static OSGiRuntime runtime;
@BeforeClass
public static void beforeClass() throws BundleException
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
}
@AfterClass
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -26,7 +26,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.jboss.test.osgi.jbosgi142.bundleA.BeanA;
import org.jboss.test.osgi.jbosgi142.bundleB.BeanB;
import org.jboss.test.osgi.jbosgi142.bundleX.BeanX;
@@ -49,7 +49,7 @@
* @author thomas.diesler at jboss.com
* @since 28-Aug-2009
*/
-public class OSGi142TestCase extends OSGiTest
+public class OSGi142TestCase extends OSGiRuntimeTest
{
@Test
public void testLoadClass() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,7 +28,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.jboss.test.osgi.jbosgi143.bundleA.BeanA;
import org.jboss.test.osgi.jbosgi143.bundleX.BeanX;
import org.junit.Test;
@@ -49,7 +49,7 @@
* @author thomas.diesler at jboss.com
* @since 28-Aug-2009
*/
-public class OSGi143TestCase extends OSGiTest
+public class OSGi143TestCase extends OSGiRuntimeTest
{
@Test
public void testLoadClass() throws Exception
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 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -25,7 +25,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.jboss.test.osgi.jbosgi151.bundleA.BeanA;
import org.jboss.test.osgi.jbosgi151.bundleB.BeanB;
import org.junit.After;
@@ -60,7 +60,7 @@
* @author thomas.diesler at jboss.com
* @since 07-Sep-2009
*/
-public class OSGi151TestCase extends OSGiTest
+public class OSGi151TestCase extends OSGiRuntimeTest
{
private Framework framework;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -26,7 +26,7 @@
import org.jboss.osgi.spi.capability.LogServiceCapability;
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.test.osgi.jbosgi161.bundle.LoggingDelegate;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -39,7 +39,7 @@
* @author thomas.diesler at jboss.com
* @since 07-Oct-2009
*/
-public class OSGi161TestCase extends OSGiTest
+public class OSGi161TestCase extends OSGiRuntimeTest
{
@Test
public void testClientLogging() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGi214TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGi214TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGi214TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -30,7 +30,7 @@
import java.util.Map;
import org.jboss.osgi.spi.util.ServiceLoader;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -48,7 +48,7 @@
* @author thomas.diesler at jboss.com
* @since 03-Dec-2009
*/
-public class OSGi214TestCase extends OSGiTest
+public class OSGi214TestCase extends OSGiRuntimeTest
{
@Test
public void testFirstRun() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,7 +28,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -43,7 +43,7 @@
* @author thomas.diesler at jboss.com
* @since 01-Feb-2010
*/
-public class OSGi284TestCase extends OSGiTest
+public class OSGi284TestCase extends OSGiRuntimeTest
{
@Test
public void testVersionParser() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi286/OSGi286TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -26,7 +26,7 @@
import org.jboss.osgi.jaxb.JAXBCapability;
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.junit.Test;
import org.osgi.framework.Bundle;
@@ -38,7 +38,7 @@
* @author thomas.diesler at jboss.com
* @since 01-Feb-2010
*/
-public class OSGi286TestCase extends OSGiTest
+public class OSGi286TestCase extends OSGiRuntimeTest
{
@Test
public void testJAXBContextWiring() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,7 +28,7 @@
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.test.osgi.jbosgi287.bundleA.OSGi287BeanA;
import org.jboss.test.osgi.jbosgi287.bundleB.OSGi287BeanB;
import org.junit.Test;
@@ -42,7 +42,7 @@
* @author thomas.diesler at jboss.com
* @since 01-Feb-2010
*/
-public class OSGi287TestCase extends OSGiTest
+public class OSGi287TestCase extends OSGiRuntimeTest
{
@Test
public void testUnresolvedOptionalImport() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -33,7 +33,7 @@
import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.spi.capability.CompendiumCapability;
import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -51,7 +51,7 @@
* @since 05-Mar-2010
*/
@Ignore
-public class OSGi298TestCase extends OSGiTest
+public class OSGi298TestCase extends OSGiRuntimeTest
{
private OSGiRuntime runtime;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGi37TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGi37TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGi37TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -31,7 +31,7 @@
import org.jboss.osgi.spi.capability.CompendiumCapability;
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.junit.Test;
import org.osgi.framework.Bundle;
@@ -43,7 +43,7 @@
* @author thomas.diesler at jboss.com
* @since 09-Apr-2009
*/
-public class OSGi37TestCase extends OSGiTest
+public class OSGi37TestCase extends OSGiRuntimeTest
{
@Test
public void testNestedBundle() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,7 +28,7 @@
import org.jboss.osgi.spi.capability.CompendiumCapability;
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.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
@@ -48,7 +48,7 @@
* @author thomas.diesler at jboss.com
* @since 02-Mar-2009
*/
-public class OSGi38TestCase extends OSGiTest
+public class OSGi38TestCase extends OSGiRuntimeTest
{
@Test
public void testInstallStartX() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -30,7 +30,7 @@
import org.jboss.osgi.spi.capability.LogServiceCapability;
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.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +49,7 @@
* @author thomas.diesler at jboss.com
* @since 04-Mar-2009
*/
-public class OSGi39TestCase extends OSGiTest
+public class OSGi39TestCase extends OSGiRuntimeTest
{
private OSGiRuntime runtime;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -34,7 +34,7 @@
import org.jboss.osgi.spi.capability.ConfigAdminCapability;
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.junit.Test;
import org.osgi.framework.Bundle;
@@ -46,7 +46,7 @@
* @author thomas.diesler at jboss.com
* @since 05-Mar-2009
*/
-public class OSGi41TestCase extends OSGiTest
+public class OSGi41TestCase extends OSGiRuntimeTest
{
@Test
public void testFirstRun() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -32,8 +32,8 @@
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.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -48,14 +48,14 @@
* @author thomas.diesler at jboss.com
* @since 21-Jul-2009
*/
-public class OSGi92TestCase extends OSGiTest
+public class OSGi92TestCase extends OSGiRuntimeTest
{
private static OSGiRuntime runtime;
@BeforeClass
public static void beforeClass() throws Exception
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
runtime.addCapability(new CompendiumCapability());
}
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -35,8 +35,8 @@
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTest;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -51,7 +51,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2009
*/
-public class OSGi99TestCase extends OSGiTest
+public class OSGi99TestCase extends OSGiRuntimeTest
{
// Provide logging
private static final Logger log = Logger.getLogger(OSGi99TestCase.class);
@@ -61,7 +61,7 @@
@BeforeClass
public static void beforeClass()
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
}
@AfterClass
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,8 +28,8 @@
import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.jmx.MBeanProxy;
-import org.jboss.osgi.testing.OSGiTest;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.jboss.osgi.testing.internal.RemoteRuntime;
import org.jboss.test.osgi.jbossas.jbosgi36.mbean.FooMBean;
import org.junit.AfterClass;
@@ -44,14 +44,14 @@
* @author thomas.diesler at jboss.com
* @since 25-Feb-2009
*/
-public class OSGi36TestCase extends OSGiTest
+public class OSGi36TestCase extends OSGiRuntimeTest
{
private static RemoteRuntime runtime;
@BeforeClass
public static void setUpClass() throws Exception
{
- runtime = (RemoteRuntime)new OSGiTestHelper().getRemoteRuntime();
+ runtime = (RemoteRuntime)new OSGiRuntimeHelper().getRemoteRuntime();
runtime.addCapability(new JMXCapability());
runtime.installBundle("jbosgi36-bundle.jar");
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -28,7 +28,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.jboss.osgi.testing.internal.RemoteRuntime;
import org.jboss.test.osgi.jbossas.jbosgi58.ejb.StatelessBean;
import org.junit.Ignore;
@@ -43,7 +43,7 @@
* @since 07-Dec-2009
*/
@Ignore
-public class OSGi58TestCase extends OSGiTest
+public class OSGi58TestCase extends OSGiRuntimeTest
{
@Test
public void testEJB() throws Exception
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/localization/LocalizationTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -30,8 +30,8 @@
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTest;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiRuntimeTest;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,14 +44,14 @@
* @author thomas.diesler at jboss.com
* @since 25-Jan-2010
*/
-public class LocalizationTestCase extends OSGiTest
+public class LocalizationTestCase extends OSGiRuntimeTest
{
private static OSGiRuntime runtime;
@BeforeClass
public static void beforeClass()
{
- runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime = new OSGiRuntimeHelper().getDefaultRuntime();
}
@AfterClass
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/performance/blueprint/BlueprintStressTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -29,7 +29,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.test.osgi.performance.blueprint.bundle.ServiceA;
import org.jboss.test.osgi.performance.blueprint.bundle.ServiceB;
import org.junit.Test;
@@ -46,7 +46,7 @@
@Test
public void testBlueprintBundleInstall() throws Exception
{
- OSGiRuntime runtime = new OSGiTestHelper().getDefaultRuntime();
+ OSGiRuntime runtime = new OSGiRuntimeHelper().getDefaultRuntime();
BlueprintCapability blueprintCapability = new BlueprintCapability();
try
{
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2010-03-12 09:20:24 UTC (rev 102342)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2010-03-12 09:23:57 UTC (rev 102343)
@@ -26,7 +26,7 @@
import org.jboss.osgi.spi.capability.CompendiumCapability;
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.junit.Test;
import org.osgi.framework.Bundle;
@@ -36,7 +36,7 @@
* @author thomas.diesler at jboss.com
* @since 04-Mar-2009
*/
-public class StartLevelTestCase extends OSGiTest
+public class StartLevelTestCase extends OSGiRuntimeTest
{
@Test
public void testStartLevel() throws Exception
More information about the jboss-cvs-commits
mailing list