[jboss-cvs] JBossAS SVN: r84868 - in projects/jboss-osgi/trunk: runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 27 06:06:28 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-02-27 06:06:28 -0500 (Fri, 27 Feb 2009)
New Revision: 84868
Added:
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/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
Removed:
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTest.java
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTest.java
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTest.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTest.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTest.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java
Modified:
projects/jboss-osgi/trunk/
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Rename junit tests to *TestCase.java
Property changes on: projects/jboss-osgi/trunk
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
autoinstall.xml
Deleted: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTest.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTest.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTest.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,77 +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.test.osgi.felix.microcontainer;
-
-//$Id$
-
-import junit.framework.Test;
-
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
-import org.jboss.osgi.spi.junit.OSGiTestSetup;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * Test OSGi Framework integration with the Microcontainer
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Jan-2009
- */
-public class ConfiguredServiceTest extends OSGiTestCase
-{
- private static OSGiFramework framework;
-
- public static Test suite()
- {
- Test setup = new OSGiTestSetup(ConfiguredServiceTest.class)
- {
- @Override
- protected void setUp() throws Exception
- {
- OSGiConfigurationProvider provider = OSGiConfiguration.getConfigurationProvider();
- provider.configure(getResourceURL("microcontainer/configured-service-test.xml"));
- framework = provider.getFramework();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- framework = null;
- }
- };
- return setup;
- }
-
- public void testServiceCallsBean()
- {
- BundleContext bundleContext = framework.getSystemBundleContext();
- ServiceReference sref = bundleContext.getServiceReference(ConfiguredService.class.getName());
- ConfiguredService service = (ConfiguredService)bundleContext.getService(sref);
- assertNotNull("ConfiguredService not null", service);
-
- String retStr = service.callBean("kermit");
- assertEquals("kermit", retStr);
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java (from rev 84823, projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTest.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,77 @@
+/*
+ * 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.test.osgi.felix.microcontainer;
+
+//$Id$
+
+import junit.framework.Test;
+
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.jboss.osgi.spi.junit.OSGiTestSetup;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Test OSGi Framework integration with the Microcontainer
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class ConfiguredServiceTestCase extends OSGiTestCase
+{
+ private static OSGiFramework framework;
+
+ public static Test suite()
+ {
+ Test setup = new OSGiTestSetup(ConfiguredServiceTestCase.class)
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ OSGiConfigurationProvider provider = OSGiConfiguration.getConfigurationProvider();
+ provider.configure(getResourceURL("microcontainer/configured-service-test.xml"));
+ framework = provider.getFramework();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ framework = null;
+ }
+ };
+ return setup;
+ }
+
+ public void testServiceCallsBean()
+ {
+ BundleContext bundleContext = framework.getSystemBundleContext();
+ ServiceReference sref = bundleContext.getServiceReference(ConfiguredService.class.getName());
+ ConfiguredService service = (ConfiguredService)bundleContext.getService(sref);
+ assertNotNull("ConfiguredService not null", service);
+
+ String retStr = service.callBean("kermit");
+ assertEquals("kermit", retStr);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ConfiguredServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTest.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTest.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTest.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,106 +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.test.osgi.felix.microcontainer;
-
-//$Id$
-
-import junit.framework.Test;
-
-import org.jboss.osgi.service.MicrocontainerService;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
-import org.jboss.osgi.spi.junit.OSGiTestSetup;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * Test OSGi Framework integration with the Microcontainer
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Jan-2009
- */
-public class ExplicitServiceTest extends OSGiTestCase
-{
- private static OSGiFramework framework;
-
- public static Test suite()
- {
- Test setup = new OSGiTestSetup(ExplicitServiceTest.class)
- {
- @Override
- protected void setUp() throws Exception
- {
- OSGiConfigurationProvider provider = OSGiConfiguration.getConfigurationProvider();
- provider.configure(getResourceURL("microcontainer/explicit-service-test.xml"));
- framework = provider.getFramework();
-
- // Register IntegrationService
- BundleContext context = framework.getSystemBundleContext();
- context.registerService(ExplicitService.class.getName(), new ExplicitService(context), null);
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- framework = null;
- }
- };
- return setup;
- }
-
- public void testBeanCallsService()
- {
- MyBean bean = getBean();
- assertNotNull("MyBean not null", bean);
-
- String retStr = bean.callService("kermit");
- assertEquals("kermit", retStr);
- }
-
- public void testServiceCallsBean()
- {
- ExplicitService service = getService();
- assertNotNull("DynamicService not null", service);
-
- String retStr = service.callBean("kermit");
- assertEquals("kermit", retStr);
- }
-
- private ExplicitService getService()
- {
- BundleContext bundleContext = framework.getSystemBundleContext();
- ServiceReference sref = bundleContext.getServiceReference(ExplicitService.class.getName());
- ExplicitService service = (ExplicitService)bundleContext.getService(sref);
- return service;
- }
-
- private MyBean getBean()
- {
- BundleContext context = framework.getSystemBundleContext();
- ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName());
- MicrocontainerService mcService = (MicrocontainerService)context.getService(sref);
- MyBean bean = (MyBean)mcService.getRegisteredBean("MyBean");
- return bean;
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java (from rev 84823, projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTest.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,106 @@
+/*
+ * 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.test.osgi.felix.microcontainer;
+
+//$Id$
+
+import junit.framework.Test;
+
+import org.jboss.osgi.service.MicrocontainerService;
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.jboss.osgi.spi.junit.OSGiTestSetup;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Test OSGi Framework integration with the Microcontainer
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class ExplicitServiceTestCase extends OSGiTestCase
+{
+ private static OSGiFramework framework;
+
+ public static Test suite()
+ {
+ Test setup = new OSGiTestSetup(ExplicitServiceTestCase.class)
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ OSGiConfigurationProvider provider = OSGiConfiguration.getConfigurationProvider();
+ provider.configure(getResourceURL("microcontainer/explicit-service-test.xml"));
+ framework = provider.getFramework();
+
+ // Register IntegrationService
+ BundleContext context = framework.getSystemBundleContext();
+ context.registerService(ExplicitService.class.getName(), new ExplicitService(context), null);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ framework = null;
+ }
+ };
+ return setup;
+ }
+
+ public void testBeanCallsService()
+ {
+ MyBean bean = getBean();
+ assertNotNull("MyBean not null", bean);
+
+ String retStr = bean.callService("kermit");
+ assertEquals("kermit", retStr);
+ }
+
+ public void testServiceCallsBean()
+ {
+ ExplicitService service = getService();
+ assertNotNull("DynamicService not null", service);
+
+ String retStr = service.callBean("kermit");
+ assertEquals("kermit", retStr);
+ }
+
+ private ExplicitService getService()
+ {
+ BundleContext bundleContext = framework.getSystemBundleContext();
+ ServiceReference sref = bundleContext.getServiceReference(ExplicitService.class.getName());
+ ExplicitService service = (ExplicitService)bundleContext.getService(sref);
+ return service;
+ }
+
+ private MyBean getBean()
+ {
+ BundleContext context = framework.getSystemBundleContext();
+ ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName());
+ MicrocontainerService mcService = (MicrocontainerService)context.getService(sref);
+ MyBean bean = (MyBean)mcService.getRegisteredBean("MyBean");
+ return bean;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/microcontainer/ExplicitServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTest.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTest.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTest.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,47 +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.test.osgi.felix.system;
-
-//$Id$
-
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.OSGiTestCase;
-import org.osgi.framework.Bundle;
-
-/**
- * Test OSGi System bundle access
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Jan-2009
- */
-public class SystemBundleTest extends OSGiTestCase
-{
- public void testSystemBundle()
- {
- OSGiFramework framework = OSGiConfiguration.getFramework();
- Bundle bundle = framework.getSystemBundle();
-
- assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java (from rev 84823, projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTest.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,47 @@
+/*
+ * 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.test.osgi.felix.system;
+
+//$Id$
+
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.OSGiTestCase;
+import org.osgi.framework.Bundle;
+
+/**
+ * Test OSGi System bundle access
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class SystemBundleTestCase extends OSGiTestCase
+{
+ public void testSystemBundle()
+ {
+ OSGiFramework framework = OSGiConfiguration.getFramework();
+ Bundle bundle = framework.getSystemBundle();
+
+ assertEquals("BundleId == 0", 0, bundle.getBundleId());
+ assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-27 11:06:28 UTC (rev 84868)
@@ -111,10 +111,10 @@
<configuration>
<excludes>
<!-- Exclude tests that require remote access -->
- <exclude>org/jboss/test/osgi/service/http/junit/*Test.java</exclude>
- <exclude>org/jboss/test/osgi/service/microcontainer/junit/*Test.java</exclude>
+ <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude>
+ <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
<!-- [JBOSGI-36] Bundle classes leak into system classloader -->
- <exclude>org/jboss/test/osgi/jbosgi36/junit/*Test.java</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi36/junit/*TestCase.java</exclude>
</excludes>
</configuration>
</plugin>
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTest.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTest.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTest.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,52 +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.test.osgi.bootstrap;
-
-//$Id$
-
-import org.jboss.deployers.client.spi.main.MainDeployer;
-import org.jboss.osgi.spi.framework.AttributeProvider;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.junit.IntegrationTestCase;
-
-/**
- * Test the embedded bootstrap of the framework
- *
- * @author thomas.diesler at jboss.com
- * @since 25-Feb-2009
- */
-public class BootstrapTest extends IntegrationTestCase
-{
- static OSGiConfigurationProvider configProvider = OSGiConfiguration.getConfigurationProvider();
-
- public void testFrameworkBootstrap() throws Exception
- {
- OSGiFramework framework = configProvider.getFramework();
- assertNotNull("Framework not null", framework);
-
- AttributeProvider attProvider = (AttributeProvider)configProvider;
- MainDeployer mainDeployer = (MainDeployer)attProvider.getAttribute("MainDeployer");
- assertNotNull("MainDeployer not null", mainDeployer);
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java (from rev 84823, projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTest.java)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,52 @@
+/*
+ * 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.test.osgi.bootstrap;
+
+//$Id$
+
+import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.osgi.spi.framework.AttributeProvider;
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.IntegrationTestCase;
+
+/**
+ * Test the embedded bootstrap of the framework
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 25-Feb-2009
+ */
+public class BootstrapTestCase extends IntegrationTestCase
+{
+ static OSGiConfigurationProvider configProvider = OSGiConfiguration.getConfigurationProvider();
+
+ public void testFrameworkBootstrap() throws Exception
+ {
+ OSGiFramework framework = configProvider.getFramework();
+ assertNotNull("Framework not null", framework);
+
+ AttributeProvider attProvider = (AttributeProvider)configProvider;
+ MainDeployer mainDeployer = (MainDeployer)attProvider.getAttribute("MainDeployer");
+ assertNotNull("MainDeployer not null", mainDeployer);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,115 +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.test.osgi.jbosgi36.junit;
-
-//$Id$
-
-import junit.framework.Test;
-
-import org.jboss.osgi.spi.framework.AttributeProvider;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
-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.IntegrationTestSetup;
-import org.jboss.test.osgi.jbosgi36.mbean.FooMBean;
-
-/**
- * [JBOSGI-36] Bundle classes leak into system classloader
- *
- * https://jira.jboss.org/jira/browse/JBOSGI-36
- *
- * @author thomas.diesler at jboss.com
- * @since 25-Feb-2009
- */
-public class JBOSGI36Test extends IntegrationTestCase
-{
- static IntegrationTestSetup setup;
-
- public static Test suite()
- {
- setup = new IntegrationTestSetup(JBOSGI36Test.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar")
- {
- @Override
- public OSGiConfigurationProvider createConfigurationProvider()
- {
- OSGiConfigurationProvider configProvider = null;
- if (isRemoteIntegration() == false)
- {
- // Bootstrap the embedded framework
- configProvider = OSGiConfiguration.getConfigurationProvider();
- configProvider.getFramework();
- }
- return configProvider;
- }
- };
- return setup;
- }
-
- public void testAccessMBean() throws Exception
- {
- assertEquals("hello", getFooMBean().echo("hello"));
- }
-
- public void testAccessSomeService() throws Exception
- {
- try
- {
- String loaderName = getFooMBean().accessSomeService();
- fail("Unexpected classloader: " + loaderName);
- }
- catch (ClassNotFoundException ex)
- {
- // expected
- }
- }
-
- public void testAccessSomeInternal() throws Exception
- {
- try
- {
- String loaderName = getFooMBean().accessSomeInternal();
- fail("Unexpected classloader: " + loaderName);
- }
- catch (ClassNotFoundException ex)
- {
- // expected
- }
- }
-
- private FooMBean getFooMBean() throws MBeanProxyException
- {
- FooMBean foo;
- if (isRemoteIntegration() == false)
- {
- OSGiConfigurationProvider configProvider = setup.getConfigurationProvider();
- AttributeProvider attProvider = (AttributeProvider)configProvider;
- foo = attProvider.getAttribute("Foo", FooMBean.class);
- }
- else
- {
- foo = (FooMBean)MBeanProxy.get(FooMBean.class, FooMBean.OBJECT_NAME, getServer());
- }
- return foo;
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java (from rev 84825, projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,115 @@
+/*
+ * 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.test.osgi.jbosgi36.junit;
+
+//$Id$
+
+import junit.framework.Test;
+
+import org.jboss.osgi.spi.framework.AttributeProvider;
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
+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.IntegrationTestSetup;
+import org.jboss.test.osgi.jbosgi36.mbean.FooMBean;
+
+/**
+ * [JBOSGI-36] Bundle classes leak into system classloader
+ *
+ * https://jira.jboss.org/jira/browse/OSGI-36
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 25-Feb-2009
+ */
+public class OSGI36TestCase extends IntegrationTestCase
+{
+ static IntegrationTestSetup setup;
+
+ public static Test suite()
+ {
+ setup = new IntegrationTestSetup(OSGI36TestCase.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar")
+ {
+ @Override
+ public OSGiConfigurationProvider createConfigurationProvider()
+ {
+ OSGiConfigurationProvider configProvider = null;
+ if (isRemoteIntegration() == false)
+ {
+ // Bootstrap the embedded framework
+ configProvider = OSGiConfiguration.getConfigurationProvider();
+ configProvider.getFramework();
+ }
+ return configProvider;
+ }
+ };
+ return setup;
+ }
+
+ public void testAccessMBean() throws Exception
+ {
+ assertEquals("hello", getFooMBean().echo("hello"));
+ }
+
+ public void testAccessSomeService() throws Exception
+ {
+ try
+ {
+ String loaderName = getFooMBean().accessSomeService();
+ fail("Unexpected classloader: " + loaderName);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // expected
+ }
+ }
+
+ public void testAccessSomeInternal() throws Exception
+ {
+ try
+ {
+ String loaderName = getFooMBean().accessSomeInternal();
+ fail("Unexpected classloader: " + loaderName);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // expected
+ }
+ }
+
+ private FooMBean getFooMBean() throws MBeanProxyException
+ {
+ FooMBean foo;
+ if (isRemoteIntegration() == false)
+ {
+ OSGiConfigurationProvider configProvider = setup.getConfigurationProvider();
+ AttributeProvider attProvider = (AttributeProvider)configProvider;
+ foo = attProvider.getAttribute("Foo", FooMBean.class);
+ }
+ else
+ {
+ foo = (FooMBean)MBeanProxy.get(FooMBean.class, FooMBean.OBJECT_NAME, getServer());
+ }
+ return foo;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/OSGI36TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTest.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTest.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTest.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,83 +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.test.osgi.service.http.junit;
-
-//$Id$
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import junit.framework.Test;
-
-import org.jboss.osgi.spi.junit.IntegrationTestCase;
-import org.jboss.osgi.spi.junit.IntegrationTestSetup;
-
-/**
- * A test that deployes a bundle that containes a HttpServlet which
- * is registered through the OSGi HttpService
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Jan-2009
- */
-public class EndpointServiceTest extends IntegrationTestCase
-{
- public static Test suite()
- {
- return new IntegrationTestSetup(EndpointServiceTest.class, "http-service.jar");
- }
-
- public void testServletAccess() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=plain");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("Hello from Servlet", br.readLine());
- }
-
- public void testServletInitProps() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=initProp");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("initProp=SomeValue", br.readLine());
- }
-
- public void testServletBundleContext() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=context");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("http-service-test", br.readLine());
- }
-
- public void testServletStartLevel() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=startLevel");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("startLevel=1", br.readLine());
- }
-
- public void testResourceAccess() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/file/message.txt");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("Hello from Resource", br.readLine());
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java (from rev 84823, projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTest.java)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,83 @@
+/*
+ * 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.test.osgi.service.http.junit;
+
+//$Id$
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.osgi.spi.junit.IntegrationTestCase;
+import org.jboss.osgi.spi.junit.IntegrationTestSetup;
+
+/**
+ * A test that deployes a bundle that containes a HttpServlet which
+ * is registered through the OSGi HttpService
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class EndpointServiceTestCase extends IntegrationTestCase
+{
+ public static Test suite()
+ {
+ return new IntegrationTestSetup(EndpointServiceTestCase.class, "http-service.jar");
+ }
+
+ public void testServletAccess() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=plain");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("Hello from Servlet", br.readLine());
+ }
+
+ public void testServletInitProps() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=initProp");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("initProp=SomeValue", br.readLine());
+ }
+
+ public void testServletBundleContext() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=context");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("http-service-test", br.readLine());
+ }
+
+ public void testServletStartLevel() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/servlet?test=startLevel");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("startLevel=1", br.readLine());
+ }
+
+ public void testResourceAccess() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/file/message.txt");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("Hello from Resource", br.readLine());
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java 2009-02-27 10:52:41 UTC (rev 84867)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -1,52 +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.test.osgi.service.microcontainer.junit;
-
-//$Id$
-
-import junit.framework.Test;
-
-import org.jboss.osgi.spi.jmx.MBeanProxy;
-import org.jboss.osgi.spi.junit.IntegrationTestCase;
-import org.jboss.osgi.spi.junit.IntegrationTestSetup;
-import org.jboss.test.osgi.service.microcontainer.FooMBean;
-import org.jboss.test.osgi.service.microcontainer.MBeanTestService;
-
-/**
- * A test that deployes a bundle that registeres an MBean
- *
- * @author thomas.diesler at jboss.com
- * @since 12-Feb-2009
- */
-public class MicrocontainerServiceTest extends IntegrationTestCase
-{
- public static Test suite()
- {
- return new IntegrationTestSetup(MicrocontainerServiceTest.class, "microcontainer-service.jar");
- }
-
- public void testMBeanAccess() throws Exception
- {
- FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getServer());
- assertEquals("hello", foo.echo("hello"));
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java (from rev 84825, projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java 2009-02-27 11:06:28 UTC (rev 84868)
@@ -0,0 +1,52 @@
+/*
+ * 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.test.osgi.service.microcontainer.junit;
+
+//$Id$
+
+import junit.framework.Test;
+
+import org.jboss.osgi.spi.jmx.MBeanProxy;
+import org.jboss.osgi.spi.junit.IntegrationTestCase;
+import org.jboss.osgi.spi.junit.IntegrationTestSetup;
+import org.jboss.test.osgi.service.microcontainer.FooMBean;
+import org.jboss.test.osgi.service.microcontainer.MBeanTestService;
+
+/**
+ * A test that deployes a bundle that registeres an MBean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Feb-2009
+ */
+public class MicrocontainerServiceTestCase extends IntegrationTestCase
+{
+ public static Test suite()
+ {
+ return new IntegrationTestSetup(MicrocontainerServiceTestCase.class, "microcontainer-service.jar");
+ }
+
+ public void testMBeanAccess() throws Exception
+ {
+ FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getServer());
+ assertEquals("hello", foo.echo("hello"));
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
More information about the jboss-cvs-commits
mailing list