Reworks inner test classes to static inner classes
diff --git a/org.eclipse.virgo.web.enterprise.openejb.tomcat.factory/src/test/java/org/eclipse/virgo/web/enterprise/openejb/tomcat/factory/TomcatResourceFactoryTest.java b/org.eclipse.virgo.web.enterprise.openejb.tomcat.factory/src/test/java/org/eclipse/virgo/web/enterprise/openejb/tomcat/factory/TomcatResourceFactoryTest.java
index 01c55e3..d31ef7a 100755
--- a/org.eclipse.virgo.web.enterprise.openejb.tomcat.factory/src/test/java/org/eclipse/virgo/web/enterprise/openejb/tomcat/factory/TomcatResourceFactoryTest.java
+++ b/org.eclipse.virgo.web.enterprise.openejb.tomcat.factory/src/test/java/org/eclipse/virgo/web/enterprise/openejb/tomcat/factory/TomcatResourceFactoryTest.java
@@ -8,6 +8,7 @@
* Contributors:
* SAP AG - initial contribution
*******************************************************************************/
+
package org.eclipse.virgo.web.enterprise.openejb.tomcat.factory;
import java.util.Hashtable;
@@ -22,36 +23,37 @@
import org.junit.Test;
public class TomcatResourceFactoryTest {
-
- private static final String name = "testName";
- private static final String searchName = "comp/env/testName";
- @Test
- public void testCreate() throws Exception {
- NamingContext namingContext = new MyNamingContext(null, null);
- NamingContextListener namingContextListener = new MyNamingContextListener(namingContext);
- StandardContext standardContext = new StandardContext();
- standardContext.setNamingContextListener(namingContextListener);
-
- TomcatResourceFactory.create(name, standardContext);
- }
-
- class MyNamingContextListener extends NamingContextListener {
- public MyNamingContextListener(NamingContext context) {
- namingContext = context;
- }
- }
+ private static final String name = "testName";
- class MyNamingContext extends NamingContext {
+ private static final String searchName = "comp/env/testName";
- public MyNamingContext(Hashtable<String, Object> env, String name)
- throws NamingException {
- super(env, name);
- }
-
- public Object lookup(String name) {
- Assert.assertEquals("Wrong lookup name", searchName, name);
- return null;
- }
- }
+ @Test
+ public void testCreate() throws Exception {
+ NamingContext namingContext = new MyNamingContext(null, null);
+ NamingContextListener namingContextListener = new MyNamingContextListener(namingContext);
+ StandardContext standardContext = new StandardContext();
+ standardContext.setNamingContextListener(namingContextListener);
+
+ TomcatResourceFactory.create(name, standardContext);
+ }
+
+ private static class MyNamingContextListener extends NamingContextListener {
+
+ public MyNamingContextListener(NamingContext context) {
+ namingContext = context;
+ }
+ }
+
+ private static class MyNamingContext extends NamingContext {
+
+ public MyNamingContext(Hashtable<String, Object> env, String name) throws NamingException {
+ super(env, name);
+ }
+
+ public Object lookup(String name) {
+ Assert.assertEquals("Wrong lookup name", searchName, name);
+ return null;
+ }
+ }
}
diff --git a/org.eclipse.virgo.web.enterprise.security/src/test/java/org/eclipse/virgo/web/enterprise/security/StandardSecurityServiceTest.java b/org.eclipse.virgo.web.enterprise.security/src/test/java/org/eclipse/virgo/web/enterprise/security/StandardSecurityServiceTest.java
index 3bb30d2..6e33fa6 100755
--- a/org.eclipse.virgo.web.enterprise.security/src/test/java/org/eclipse/virgo/web/enterprise/security/StandardSecurityServiceTest.java
+++ b/org.eclipse.virgo.web.enterprise.security/src/test/java/org/eclipse/virgo/web/enterprise/security/StandardSecurityServiceTest.java
@@ -76,7 +76,7 @@
Assert.assertFalse("ApplicationThread1 error message: " + errorMessage1 + "; ApplicationThread2 error message: " + errorMessage2, applicationThread1.isError() || applicationThread2.isError());
}
- class ApplicationThread extends Thread {
+ private static class ApplicationThread extends Thread {
private StandardSecurityService service;
private ApplicationThread coworkerThread;
private Wrapper wrapper;
diff --git a/org.eclipse.virgo.web.enterprise.services.accessor/src/test/java/org/eclipse/virgo/web/enterprise/services/accessor/WebAppBundleClassLoaderDelegateHookTest.java b/org.eclipse.virgo.web.enterprise.services.accessor/src/test/java/org/eclipse/virgo/web/enterprise/services/accessor/WebAppBundleClassLoaderDelegateHookTest.java
index 7d74e81..d7fde0f 100755
--- a/org.eclipse.virgo.web.enterprise.services.accessor/src/test/java/org/eclipse/virgo/web/enterprise/services/accessor/WebAppBundleClassLoaderDelegateHookTest.java
+++ b/org.eclipse.virgo.web.enterprise.services.accessor/src/test/java/org/eclipse/virgo/web/enterprise/services/accessor/WebAppBundleClassLoaderDelegateHookTest.java
@@ -191,7 +191,7 @@
}
}
- private final class ClassLoaderExt3 extends ClassLoader {
+ private static final class ClassLoaderExt3 extends ClassLoader {
@Override
public Enumeration<URL> getResources(String name) throws IOException {
