Author: thomas.diesler(a)jboss.com
Date: 2009-06-29 09:42:18 -0400 (Mon, 29 Jun 2009)
New Revision: 90670
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java
projects/jboss-osgi/trunk/testsuite/trailblazer/.classpath
Log:
comment dead code
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 2009-06-29
05:57:45 UTC (rev 90669)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-06-29
13:42:18 UTC (rev 90670)
@@ -23,7 +23,6 @@
//$Id: OSGI39TestCase.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $
-
import static org.junit.Assert.assertEquals;
import java.util.List;
@@ -73,12 +72,12 @@
OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
packageAdmin.refreshPackages(null);
}
-
+
@Test
public void testRedeploySingle() throws Exception
{
OSGiBundle bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
-
+
bundleA.start();
SomeBeanMBean someBean = MBeanProxy.get(SomeBeanMBean.class,
SomeBeanMBean.MBEAN_NAME, runtime.getMBeanServer());
@@ -86,25 +85,25 @@
assertEquals("Start messages", 1, messages.size());
bundleA.uninstall();
-
+
// Reinstall bundleA
bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
bundleA.start();
- // The static in bundleA.SomeBean is expected to be recreated
-
+ // The static in bundleA.SomeBean is expected to be recreated
+
messages = report(someBean.getMessages());
assertEquals("Start messages", 1, messages.size());
-
+
bundleA.uninstall();
}
-
+
@Test
public void testRedeployWithReference() throws Exception
{
OSGiBundle bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
OSGiBundle bundleB = runtime.installBundle("jbosgi108-bundleB.jar");
-
+
bundleA.start();
bundleB.start();
@@ -113,28 +112,29 @@
assertEquals("Start messages", 2, messages.size());
bundleA.uninstall();
-
- // After uninstall bundleA, bundleB still holds a reference on bundleA.SomeBean
+ // After uninstall bundleA, bundleB still holds a reference on
+ // bundleA.SomeBean
+
// Reinstall bundleA
bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
bundleA.start();
// The static in bundleA.SomeBean is expected to be reused
-
+
messages = report(someBean.getMessages());
assertEquals("Start messages", 4, messages.size());
-
+
bundleB.uninstall();
bundleA.uninstall();
}
-
+
@Test
public void testRedeployWithReferenceAndRefresh() throws Exception
{
OSGiBundle bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
OSGiBundle bundleB = runtime.installBundle("jbosgi108-bundleB.jar");
-
+
bundleA.start();
bundleB.start();
@@ -143,37 +143,36 @@
assertEquals("Start messages", 2, messages.size());
bundleA.uninstall();
-
- // After uninstall bundleA, bundleB still holds a reference on bundleA.SomeBean
+ // After uninstall bundleA, bundleB still holds a reference on
+ // bundleA.SomeBean
+
// Refresh all packages
OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
packageAdmin.refreshPackages(null);
-
+
// Reinstall bundleA
bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
bundleA.start();
- // The static in bundleA.SomeBean is expected to be recreated
-
+ // The static in bundleA.SomeBean is expected to be recreated
+
messages = report(someBean.getMessages());
assertEquals("Start messages", 1, messages.size());
-
+
bundleB.uninstall();
bundleA.uninstall();
}
-
+
private List<String> report(List<String> messages)
{
- if (false)
+ System.out.println(">>>>>>>>>>>>");
+ for (String aux : messages)
{
-
System.out.println(">>>>>>>>>>>>");
- for (String aux : messages)
- {
- System.out.println(aux);
- }
- System.out.println("<<<<<<<<<<<");
+ System.out.println(aux);
}
+ System.out.println("<<<<<<<<<<<");
+
return messages;
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/.classpath
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/.classpath 2009-06-29 05:57:45 UTC
(rev 90669)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/.classpath 2009-06-29 13:42:18 UTC
(rev 90670)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
<classpathentry excluding="**" kind="src"
output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Show replies by date