[jboss-cvs] JBossAS SVN: r85000 - in projects/jboss-osgi/trunk: runtime/felix/src/test/java/org/jboss/test/osgi/felix/system and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 2 07:01:54 EST 2009
Author: alesj
Date: 2009-03-02 07:01:54 -0500 (Mon, 02 Mar 2009)
New Revision: 85000
Added:
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTest.java
Removed:
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java
Modified:
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java
Log:
Unify test naming convention.
Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -28,7 +28,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.jboss.osgi.spi.junit.OSGiTest;
import org.jboss.osgi.spi.junit.OSGiTestSetup;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -39,7 +39,7 @@
* @author thomas.diesler at jboss.com
* @since 23-Jan-2009
*/
-public class ConfiguredServiceTestCase extends OSGiTestCase
+public class ConfiguredServiceTestCase extends OSGiTest
{
private static OSGiFramework framework;
Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -29,7 +29,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.jboss.osgi.spi.junit.OSGiTest;
import org.jboss.osgi.spi.junit.OSGiTestSetup;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -40,7 +40,7 @@
* @author thomas.diesler at jboss.com
* @since 23-Jan-2009
*/
-public class ExplicitServiceTestCase extends OSGiTestCase
+public class ExplicitServiceTestCase extends OSGiTest
{
private static OSGiFramework framework;
Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -26,7 +26,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.jboss.osgi.spi.junit.OSGiTest;
import org.osgi.framework.Bundle;
/**
@@ -35,7 +35,7 @@
* @author thomas.diesler at jboss.com
* @since 23-Jan-2009
*/
-public class SystemBundleTestCase extends OSGiTestCase
+public class SystemBundleTestCase extends OSGiTest
{
public void testSystemBundle()
{
Copied: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java (from rev 84993, projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -0,0 +1,100 @@
+/*
+ * 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.spi.junit;
+
+// $Id$
+
+import java.net.URL;
+import javax.management.MBeanServerConnection;
+
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+
+/**
+ * An integration test case
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public abstract class IntegrationTest extends OSGiTest
+{
+ private IntegrationTestHelper delegate;
+ private OSGiBootstrapProvider bootProvider;
+
+ private IntegrationTestHelper getDelegate()
+ {
+ if (delegate == null)
+ {
+ delegate = new IntegrationTestHelper(getBootstrapProvider());
+ }
+ return delegate;
+ }
+
+ public OSGiBootstrapProvider getBootstrapProvider()
+ {
+ return bootProvider;
+ }
+
+ public void setBootstrapProvider(OSGiBootstrapProvider configProvider)
+ {
+ this.bootProvider = configProvider;
+ }
+
+ public boolean isRemoteIntegration()
+ {
+ return IntegrationTestHelper.isRemoteIntegration();
+ }
+
+ public boolean isTargetJBoss50()
+ {
+ return getDelegate().isTargetJBoss50();
+ }
+
+ public void deploy(String archive) throws Exception
+ {
+ getDelegate().deploy(archive);
+ }
+
+ public void deploy(URL archive) throws Exception
+ {
+ getDelegate().deploy(archive);
+ }
+
+ public void undeploy(String archive) throws Exception
+ {
+ getDelegate().undeploy(archive);
+ }
+
+ public void undeploy(URL archive) throws Exception
+ {
+ getDelegate().undeploy(archive);
+ }
+
+ public MBeanServerConnection getServer()
+ {
+ return getDelegate().getServer();
+ }
+
+ public String getServerHost()
+ {
+ return getDelegate().getServerHost();
+ }
+}
Property changes on: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -1,105 +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.spi.junit;
-
-// $Id$
-
-import java.net.URL;
-
-import javax.management.MBeanServerConnection;
-
-import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-
-/**
- * An integration test case
- *
- * @author Thomas.Diesler at jboss.org
- * @since 25-Sep-2008
- */
-public class IntegrationTestCase extends OSGiTestCase
-{
- // Provide logging
- final Logger log = Logger.getLogger(IntegrationTestCase.class);
-
- private IntegrationTestHelper delegate;
- private OSGiBootstrapProvider bootProvider;
-
- private IntegrationTestHelper getDelegate()
- {
- if (delegate == null)
- {
- delegate = new IntegrationTestHelper(getBootstrapProvider());
- }
- return delegate;
- }
-
- public OSGiBootstrapProvider getBootstrapProvider()
- {
- return bootProvider;
- }
-
- public void setBootstrapProvider(OSGiBootstrapProvider configProvider)
- {
- this.bootProvider = configProvider;
- }
-
- public boolean isRemoteIntegration()
- {
- return IntegrationTestHelper.isRemoteIntegration();
- }
-
- public boolean isTargetJBoss50()
- {
- return getDelegate().isTargetJBoss50();
- }
-
- public void deploy(String archive) throws Exception
- {
- getDelegate().deploy(archive);
- }
-
- public void deploy(URL archive) throws Exception
- {
- getDelegate().deploy(archive);
- }
-
- public void undeploy(String archive) throws Exception
- {
- getDelegate().undeploy(archive);
- }
-
- public void undeploy(URL archive) throws Exception
- {
- getDelegate().undeploy(archive);
- }
-
- public MBeanServerConnection getServer()
- {
- return getDelegate().getServer();
- }
-
- public String getServerHost()
- {
- return getDelegate().getServerHost();
- }
-}
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -131,7 +131,7 @@
else
{
NamedInstanceProvider attProvider = (NamedInstanceProvider)configProvider;
- DeployerClient deployer = (MainDeployer)attProvider.getInstance("MainDeployer");
+ DeployerClient deployer = (DeployerClient)attProvider.getInstance("MainDeployer");
return new EmbeddedArchiveDeployer(deployer);
}
}
Copied: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTest.java (from rev 84993, projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTest.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTest.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -0,0 +1,119 @@
+/*
+ * 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.spi.junit;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.framework.OSGiBootstrap;
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.jboss.virtual.VFS;
+
+import junit.framework.TestCase;
+
+/**
+ * An OSGi Test Case
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public abstract class OSGiTest extends TestCase
+{
+ // Provide logging
+ final Logger log = Logger.getLogger(OSGiTest.class);
+
+ private OSGiTestHelper delegate = new OSGiTestHelper();
+ private OSGiBootstrapProvider bootProvider;
+
+ public OSGiTest()
+ {
+ // Prevent unknown protocol: vfsfile
+ VFS.init();
+ }
+
+ public OSGiBootstrapProvider createBootstrapProvider()
+ {
+ return OSGiBootstrap.getBootstrapProvider();
+ }
+
+ public OSGiBootstrapProvider getBootstrapProvider()
+ {
+ if (bootProvider == null)
+ {
+ bootProvider = createBootstrapProvider();
+ }
+ return bootProvider;
+ }
+
+ public void setBootstrapProvider(OSGiBootstrapProvider configProvider)
+ {
+ this.bootProvider = configProvider;
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.debug("### START " + getLongName());
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ log.debug("### END " + getLongName());
+ }
+
+ protected String getShortName()
+ {
+ String shortName = getClass().getName();
+ shortName = shortName.substring(shortName.lastIndexOf(".") + 1);
+ return shortName;
+ }
+
+ protected String getLongName()
+ {
+ return getClass().getName() + "." + getName();
+ }
+
+ protected URL getResourceURL(String resource)
+ {
+ return delegate.getResourceURL(resource);
+ }
+
+ protected File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public File getTestArchiveFile(String archive)
+ {
+ return delegate.getTestArchiveFile(archive);
+ }
+
+ public URL getTestArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getTestArchiveFile(archive).toURI().toURL();
+ }
+}
Property changes on: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -1,119 +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.spi.junit;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.framework.OSGiBootstrap;
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.virtual.VFS;
-
-import junit.framework.TestCase;
-
-/**
- * An OSGi Test Case
- *
- * @author Thomas.Diesler at jboss.org
- * @since 25-Sep-2008
- */
-public class OSGiTestCase extends TestCase
-{
- // Provide logging
- final Logger log = Logger.getLogger(OSGiTestCase.class);
-
- private OSGiTestHelper delegate = new OSGiTestHelper();
- private OSGiBootstrapProvider bootProvider;
-
- public OSGiTestCase()
- {
- // Prevent unknown protocol: vfsfile
- VFS.init();
- }
-
- public OSGiBootstrapProvider createBootstrapProvider()
- {
- return OSGiBootstrap.getBootstrapProvider();
- }
-
- public OSGiBootstrapProvider getBootstrapProvider()
- {
- if (bootProvider == null)
- {
- bootProvider = createBootstrapProvider();
- }
- return bootProvider;
- }
-
- public void setBootstrapProvider(OSGiBootstrapProvider configProvider)
- {
- this.bootProvider = configProvider;
- }
-
- @Override
- protected void setUp() throws Exception
- {
- log.debug("### START " + getLongName());
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- log.debug("### END " + getLongName());
- }
-
- protected String getShortName()
- {
- String shortName = getClass().getName();
- shortName = shortName.substring(shortName.lastIndexOf(".") + 1);
- return shortName;
- }
-
- protected String getLongName()
- {
- return getClass().getName() + "." + getName();
- }
-
- protected URL getResourceURL(String resource)
- {
- return delegate.getResourceURL(resource);
- }
-
- protected File getResourceFile(String resource)
- {
- return delegate.getResourceFile(resource);
- }
-
- public File getTestArchiveFile(String archive)
- {
- return delegate.getTestArchiveFile(archive);
- }
-
- public URL getTestArchiveURL(String archive) throws MalformedURLException
- {
- return delegate.getTestArchiveFile(archive).toURI().toURL();
- }
-}
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -27,7 +27,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.jboss.osgi.spi.junit.OSGiTest;
import org.osgi.framework.Bundle;
/**
@@ -36,7 +36,7 @@
* @author thomas.diesler at jboss.com
* @since 25-Feb-2009
*/
-public class BootstrapTestCase extends OSGiTestCase
+public class BootstrapTestCase extends OSGiTest
{
public void testFrameworkBootstrap() throws Exception
{
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -30,7 +30,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.jmx.MBeanProxy;
import org.jboss.osgi.spi.jmx.MBeanProxyException;
-import org.jboss.osgi.spi.junit.IntegrationTestCase;
+import org.jboss.osgi.spi.junit.IntegrationTest;
import org.jboss.osgi.spi.junit.IntegrationTestSetup;
import org.jboss.test.osgi.jbosgi36.mbean.FooMBean;
@@ -42,7 +42,7 @@
* @author thomas.diesler at jboss.com
* @since 25-Feb-2009
*/
-public class OSGI36TestCase extends IntegrationTestCase
+public class OSGI36TestCase extends IntegrationTest
{
static IntegrationTestSetup setup;
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -29,7 +29,7 @@
import junit.framework.Test;
-import org.jboss.osgi.spi.junit.IntegrationTestCase;
+import org.jboss.osgi.spi.junit.IntegrationTest;
import org.jboss.osgi.spi.junit.IntegrationTestSetup;
/**
@@ -39,7 +39,7 @@
* @author thomas.diesler at jboss.com
* @since 23-Jan-2009
*/
-public class EndpointServiceTestCase extends IntegrationTestCase
+public class EndpointServiceTestCase extends IntegrationTest
{
public static Test suite()
{
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java 2009-03-02 12:00:22 UTC (rev 84999)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java 2009-03-02 12:01:54 UTC (rev 85000)
@@ -26,7 +26,7 @@
import junit.framework.Test;
import org.jboss.osgi.spi.jmx.MBeanProxy;
-import org.jboss.osgi.spi.junit.IntegrationTestCase;
+import org.jboss.osgi.spi.junit.IntegrationTest;
import org.jboss.osgi.spi.junit.IntegrationTestSetup;
import org.jboss.test.osgi.service.microcontainer.FooMBean;
import org.jboss.test.osgi.service.microcontainer.MBeanTestService;
@@ -37,7 +37,7 @@
* @author thomas.diesler at jboss.com
* @since 12-Feb-2009
*/
-public class MicrocontainerServiceTestCase extends IntegrationTestCase
+public class MicrocontainerServiceTestCase extends IntegrationTest
{
public static Test suite()
{
More information about the jboss-cvs-commits
mailing list