Modified: tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java?rev=1511624&r1=1511623&r2=1511624&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java (original) +++ tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/StaticFailoverTest.java Thu Aug 8 08:57:43 2013 @@ -127,7 +127,9 @@ public class StaticFailoverTest extends protected void tearDown() throws Exception { super.tearDown(); - for (ServiceDaemon daemon : daemons) daemon.stop(); + for (ServiceDaemon daemon : daemons) { + daemon.stop(); + } OpenEJB.destroy(); } @@ -143,10 +145,10 @@ public class StaticFailoverTest extends return daemon; } - public static ThreadLocal<URI> host = new ThreadLocal<URI>(); public static class ServiceIdentifier extends ServerServiceFilter { + private final URI me; public ServiceIdentifier(ServerService service, URI me) { @@ -156,7 +158,7 @@ public class StaticFailoverTest extends @Override public void service(InputStream in, OutputStream out) throws ServiceException, IOException { - synchronized (hits){ + synchronized (hits) { hits.add(me); } host.set(me); @@ -171,13 +173,14 @@ public class StaticFailoverTest extends public static Object lock = new Object[]{}; private static void comment(String x) { -// synchronized(lock){ -// System.out.println(x); -// System.out.flush(); -// } + // synchronized(lock){ + // System.out.println(x); + // System.out.flush(); + // } } public static interface Counter { + int count(); URI hit();
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java?rev=1511624&r1=1511623&r2=1511624&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java (original) +++ tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java Thu Aug 8 08:57:43 2013 @@ -18,27 +18,28 @@ package org.apache.openejb.server.ejbd; import junit.framework.TestCase; import org.apache.openejb.BeanContext; -import org.apache.openejb.config.ConfigurationFactory; +import org.apache.openejb.OpenEJB; import org.apache.openejb.assembler.classic.Assembler; import org.apache.openejb.assembler.classic.EjbJarInfo; import org.apache.openejb.assembler.classic.EnterpriseBeanInfo; +import org.apache.openejb.config.ConfigurationFactory; +import org.apache.openejb.core.ServerFederation; import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.StatelessBean; -import org.apache.openejb.spi.ContainerSystem; import org.apache.openejb.loader.SystemInstance; -import org.apache.openejb.OpenEJB; -import org.apache.openejb.server.ServicePool; import org.apache.openejb.server.ServiceDaemon; -import org.apache.openejb.core.ServerFederation; +import org.apache.openejb.server.ServicePool; +import org.apache.openejb.spi.ContainerSystem; -import javax.naming.InitialContext; -import javax.naming.Context; import javax.ejb.Local; import javax.ejb.Remote; import javax.jws.WebService; -import static java.util.Arrays.asList; -import java.util.Properties; +import javax.naming.Context; +import javax.naming.InitialContext; import java.io.Serializable; +import java.util.Properties; + +import static java.util.Arrays.asList; /** * @version $Rev$ $Date$ @@ -109,21 +110,23 @@ public class UberInterfaceTest extends T } } - @Local @Remote @WebService public static interface Everything { + public Object echo(Object o); } public static class SuperBean implements Everything { + public Object echo(Object o) { return o; } } public static class Reference implements Serializable { + private final String value; public Reference(String value) { @@ -132,12 +135,18 @@ public class UberInterfaceTest extends T @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Reference value1 = (Reference) o; - if (!value.equals(value1.value)) return false; + if (!value.equals(value1.value)) { + return false; + } return true; } Modified: tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java?rev=1511624&r1=1511623&r2=1511624&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java (original) +++ tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ZEjbdTest.java Thu Aug 8 08:57:43 2013 @@ -44,6 +44,7 @@ import static org.junit.Assert.assertTru @EnableServices("ejbd") @RunWith(ApplicationComposer.class) public class ZEjbdTest { + @Configuration public Properties configuration() { final Properties configuration = new Properties(); @@ -61,7 +62,9 @@ public class ZEjbdTest { int checked = 0; for (final ServerService daemon : SimpleServiceManager.class.cast(ServiceManager.get()).getDaemons()) { if (ServiceDaemon.class.isInstance(daemon) && daemon.getName().equals("ejbd")) { - assertTrue(EjbDaemon.class.cast(Reflections.get(Reflections.get(Reflections.get(Reflections.get(Reflections.get(Reflections.get(Reflections.get(daemon, "next"), "service"), "service"), "service"), "service"), "service"), "server")).isGzip()); + assertTrue(EjbDaemon.class.cast(Reflections.get(Reflections.get(Reflections.get(Reflections.get(Reflections.get(Reflections.get(Reflections.get(daemon, "next"), + "service"), "service"), "service"), + "service"), "service"), "server")).isGzip()); checked++; } }
