You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/15 12:41:20 UTC
svn commit: r1610637 - in /tomee/tomee/branches/tomee-1.7.x/container:
openejb-core/src/test/java/org/apache/openejb/config/
openejb-core/src/test/java/org/apache/openejb/core/stateful/
openejb-core/src/test/java/org/apache/openejb/core/stateless/ open...
Author: andygumbrecht
Date: Tue Jul 15 10:41:20 2014
New Revision: 1610637
URL: http://svn.apache.org/r1610637
Log:
Fix StatelessInterceptorTest setup
StringBuilder
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTestObject.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/wls/JaxbWlsTest.java
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java Tue Jul 15 10:41:20 2014
@@ -158,7 +158,7 @@ public class SunCmpConversionTest extend
private String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java Tue Jul 15 10:41:20 2014
@@ -100,7 +100,7 @@ public class StatefulInternalRemoveTest
}
private static String join(final String delimeter, final List items) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
sb.append(item.toString()).append(delimeter);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTestObject.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTestObject.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTestObject.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTestObject.java Tue Jul 15 10:41:20 2014
@@ -132,7 +132,7 @@ public class CrossClassLoaderProxyTestOb
// }
private static String join(final String delimeter, final List items) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
sb.append(item.toString()).append(delimeter);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java Tue Jul 15 10:41:20 2014
@@ -213,7 +213,7 @@ public class JaxRpcInvocationTest extend
private static String join(final String delimeter, final List items) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
sb.append(item.toString()).append(delimeter);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java Tue Jul 15 10:41:20 2014
@@ -117,7 +117,7 @@ public class StatelessContainerTest exte
}
private static String join(final String delimeter, final List items) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
sb.append(item.toString()).append(delimeter);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java Tue Jul 15 10:41:20 2014
@@ -26,7 +26,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.core.ivm.naming.InitContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.AssemblyDescriptor;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.EnterpriseBean;
@@ -34,7 +34,6 @@ import org.apache.openejb.jee.Intercepto
import org.apache.openejb.jee.InterceptorBinding;
import org.apache.openejb.jee.NamedMethod;
import org.apache.openejb.jee.StatelessBean;
-import org.junit.Test;
import javax.annotation.PostConstruct;
import javax.ejb.EJBException;
@@ -58,14 +57,9 @@ import java.util.Properties;
public class StatelessInterceptorTest extends TestCase {
private static InitialContext ctx;
- private static boolean init = false;
public void setUp() throws Exception {
- if (init) {
- return;
- }
- init = true;
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
@@ -82,7 +76,7 @@ public class StatelessInterceptorTest ex
assembler.createApplication(ejbJar);
final Properties properties = new Properties(System.getProperties());
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
ctx = new InitialContext(properties);
}
@@ -177,7 +171,6 @@ public class StatelessInterceptorTest ex
calls.clear();
}
- @Test
public void testExcludeClassAndDefaultInterceptors() throws Exception {
// 1. Look up the bean it's to be tested against
@@ -383,6 +376,7 @@ public class StatelessInterceptorTest ex
public static class SysException extends RuntimeException {
public SysException() {
+ super("This is a test exception");
}
}
@@ -464,7 +458,7 @@ public class StatelessInterceptorTest ex
private static String join(final String delimeter, final List items) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
sb.append(item.toString()).append(delimeter);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java Tue Jul 15 10:41:20 2014
@@ -120,7 +120,7 @@ public class StatelessMetaAnnotationTest
}
private static String join(final String delimeter, final List items) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
sb.append(item.toString()).append(delimeter);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java Tue Jul 15 10:41:20 2014
@@ -58,7 +58,7 @@ public class JaxbTest extends TestCase {
}
private String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java Tue Jul 15 10:41:20 2014
@@ -95,7 +95,7 @@ public class PersistenceXmlTest extends
}
private java.lang.String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java Tue Jul 15 10:41:20 2014
@@ -107,7 +107,7 @@ public class ConversionTest extends Test
}
private String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java Tue Jul 15 10:41:20 2014
@@ -102,7 +102,7 @@ public class OpenejbJarTest extends Test
}
private String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java Tue Jul 15 10:41:20 2014
@@ -72,7 +72,7 @@ public class OpenejbJarTest extends Test
}
private java.lang.String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/wls/JaxbWlsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/wls/JaxbWlsTest.java?rev=1610637&r1=1610636&r2=1610637&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/wls/JaxbWlsTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/test/java/org/apache/openejb/jee/wls/JaxbWlsTest.java Tue Jul 15 10:41:20 2014
@@ -65,7 +65,7 @@ public class JaxbWlsTest extends TestCas
}
private String readContent(InputStream in) throws IOException {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
in = new BufferedInputStream(in);
int i = in.read();
while (i != -1) {