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 23:55:19 UTC
svn commit: r1610862 [27/44] - in /tomee/tomee/trunk/itests: ./ failover-ejb/
failover-ejb/src/main/java/org/apache/openejb/itest/failover/ejb/ failover/
failover/src/main/java/org/apache/openejb/itest/failover/
failover/src/main/java/org/apache/openej...
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbMetaDataTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbMetaDataTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbMetaDataTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbMetaDataTests.java Tue Jul 15 21:55:09 2014
@@ -34,7 +34,7 @@ public class Complex2EjbMetaDataTests ex
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
ejbHome = (ComplexCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
ejbMetaData = ejbHome.getEJBMetaData();
}
@@ -44,39 +44,39 @@ public class Complex2EjbMetaDataTests ex
//
public void test01_getEJBHome() {
try {
- EJBHome home = ejbMetaData.getEJBHome();
+ final EJBHome home = ejbMetaData.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test02_getHomeInterfaceClass() {
try {
- Class clazz = ejbMetaData.getHomeInterfaceClass();
+ final Class clazz = ejbMetaData.getHomeInterfaceClass();
assertNotNull("The Home Interface class is null", clazz);
assertEquals(clazz, ComplexCmpHome.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test03_getPrimaryKeyClass() {
try {
- Class clazz = ejbMetaData.getPrimaryKeyClass();
+ final Class clazz = ejbMetaData.getPrimaryKeyClass();
assertNotNull("The EJBMetaData is null", clazz);
assertEquals(clazz, ComplexCmpBeanPk.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test04_getRemoteInterfaceClass() {
try {
- Class clazz = ejbMetaData.getRemoteInterfaceClass();
+ final Class clazz = ejbMetaData.getRemoteInterfaceClass();
assertNotNull("The Remote Interface class is null", clazz);
assertEquals(clazz, ComplexCmpObject.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -84,7 +84,7 @@ public class Complex2EjbMetaDataTests ex
public void test05_isSession() {
try {
assertTrue("EJBMetaData says this is a session bean", !ejbMetaData.isSession());
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -92,7 +92,7 @@ public class Complex2EjbMetaDataTests ex
public void test06_isStatelessSession() {
try {
assertTrue("EJBMetaData says this is a stateless session bean", !ejbMetaData.isStatelessSession());
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbObjectTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbObjectTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbObjectTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2EjbObjectTests.java Tue Jul 15 21:55:09 2014
@@ -34,7 +34,7 @@ public class Complex2EjbObjectTests exte
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
ejbHome = (ComplexCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
ejbObject = ejbHome.createObject("Third Bean");
}
@@ -43,7 +43,7 @@ public class Complex2EjbObjectTests exte
if (ejbObject != null) {// set to null by test05_remove() method
try {
ejbObject.remove();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw e;
}
}
@@ -57,7 +57,7 @@ public class Complex2EjbObjectTests exte
try {
ejbHandle = ejbObject.getHandle();
assertNotNull("The Handle is null", ejbHandle);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -66,7 +66,7 @@ public class Complex2EjbObjectTests exte
try {
ejbPrimaryKey = ejbObject.getPrimaryKey();
assertNotNull("The primary key is null", ejbPrimaryKey);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
@@ -75,22 +75,22 @@ public class Complex2EjbObjectTests exte
public void test03_isIdentical() {
try {
assertTrue("The EJBObjects are not equal", ejbObject.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test04_getEjbHome() {
try {
- EJBHome home = ejbObject.getEJBHome();
+ final EJBHome home = ejbObject.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
- public void test05_remove(){
- try{
+ public void test05_remove() {
+ try {
// remove the ejb
ejbObject.remove();
@@ -98,18 +98,18 @@ public class Complex2EjbObjectTests exte
try {
ejbHome.findByPrimaryKey((ComplexCmpBeanPk) ejbPrimaryKey);
fail("Entity was not actually removed");
- } catch (ObjectNotFoundException e) {
+ } catch (final ObjectNotFoundException e) {
}
// verify the proxy is dead
- try{
+ try {
ejbObject.businessMethod("Should throw an exception");
- assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
- } catch (Exception e){
+ assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
+ } catch (final Exception e) {
}
- } catch (Exception e){
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
- } finally{
+ } catch (final Exception e) {
+ fail("Received Exception " + e.getClass() + " : " + e.getMessage());
+ } finally {
ejbObject = null;
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HandleTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HandleTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HandleTests.java Tue Jul 15 21:55:09 2014
@@ -37,7 +37,7 @@ public class Complex2HandleTests extends
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
ejbHome = (ComplexCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
ejbObject = ejbHome.createObject("Fifth Bean");
ejbHandle = ejbObject.getHandle();
@@ -56,43 +56,43 @@ public class Complex2HandleTests extends
public void test01_getEJBObject() {
try {
- EJBObject object = ejbHandle.getEJBObject();
+ final EJBObject object = ejbHandle.getEJBObject();
assertNotNull("The EJBObject is null", object);
// Wait until isIdentical is working.
//assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest02_copyHandleByMarshalledObject() {
try {
- MarshalledObject obj = new MarshalledObject(ejbHandle);
- Handle copy = (Handle) obj.get();
+ final MarshalledObject obj = new MarshalledObject(ejbHandle);
+ final Handle copy = (Handle) obj.get();
- EJBObject object = copy.getEJBObject();
+ final EJBObject object = copy.getEJBObject();
assertNotNull("The EJBObject is null", object);
assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest03_copyHandleBySerialize() {
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(ejbHandle);
oos.flush();
oos.close();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- Handle copy = (Handle) ois.readObject();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ final ObjectInputStream ois = new ObjectInputStream(bais);
+ final Handle copy = (Handle) ois.readObject();
- EJBObject object = copy.getEJBObject();
+ final EJBObject object = copy.getEJBObject();
assertNotNull("The EJBObject is null", object);
assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -108,10 +108,10 @@ public class Complex2HandleTests extends
try {
ejbObject.businessMethod("Should throw an exception");
assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(true);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
} finally {
ejbObject = null;
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeHandleTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeHandleTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeHandleTests.java Tue Jul 15 21:55:09 2014
@@ -38,7 +38,7 @@ public class Complex2HomeHandleTests ext
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
ejbHome = (ComplexCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
ejbHomeHandle = ejbHome.getHomeHandle();
}
@@ -48,41 +48,41 @@ public class Complex2HomeHandleTests ext
//
public void test01_getEJBHome() {
try {
- EJBHome home = ejbHomeHandle.getEJBHome();
+ final EJBHome home = ejbHomeHandle.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest02_copyHandleByMarshalledObject() {
try {
- MarshalledObject obj = new MarshalledObject(ejbHomeHandle);
- HomeHandle copy = (HomeHandle) obj.get();
+ final MarshalledObject obj = new MarshalledObject(ejbHomeHandle);
+ final HomeHandle copy = (HomeHandle) obj.get();
assertNotNull("The HomeHandle copy is null", copy);
- EJBHome home = copy.getEJBHome();
+ final EJBHome home = copy.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest03_copyHandleBySerialize() {
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(ejbHomeHandle);
oos.flush();
oos.close();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- HomeHandle copy = (HomeHandle) ois.readObject();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ final ObjectInputStream ois = new ObjectInputStream(bais);
+ final HomeHandle copy = (HomeHandle) ois.readObject();
assertNotNull("The HomeHandle copy is null", copy);
- EJBHome home = copy.getEJBHome();
+ final EJBHome home = copy.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeIntfcTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeIntfcTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2HomeIntfcTests.java Tue Jul 15 21:55:09 2014
@@ -38,7 +38,7 @@ public class Complex2HomeIntfcTests exte
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
ejbHome = (ComplexCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
}
@@ -58,7 +58,7 @@ public class Complex2HomeIntfcTests exte
}
public void test03_findByLastName() throws Exception {
- Set<ComplexCmpBeanPk> keys = new HashSet<ComplexCmpBeanPk>();
+ final Set<ComplexCmpBeanPk> keys = new HashSet<ComplexCmpBeanPk>();
try {
ejbObject = ejbHome.createObject("David Blevins");
ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -74,27 +74,27 @@ public class Complex2HomeIntfcTests exte
ejbPrimaryKey = ejbObject.getPrimaryKey();
assertTrue("Expected (ejbPrimaryKey instanceof ComplexCmpBeanPk) but was instanceof " + ejbPrimaryKey.getClass().getName(), ejbPrimaryKey instanceof ComplexCmpBeanPk);
keys.add((ComplexCmpBeanPk) ejbObject.getPrimaryKey());
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received exception while preparing the test: " + e.getClass() + " : " + e.getMessage());
}
try {
- Collection objects = ejbHome.findByLastName("Blevins");
- Set<ComplexCmpBeanPk> foundKeys = new HashSet<ComplexCmpBeanPk>();
+ final Collection objects = ejbHome.findByLastName("Blevins");
+ final Set<ComplexCmpBeanPk> foundKeys = new HashSet<ComplexCmpBeanPk>();
assertNotNull("The Collection is null", objects);
assertEquals("The Collection is not the right size.", keys.size(), objects.size());
- for (Object object : objects) {
+ for (final Object object : objects) {
ejbObject = (ComplexCmpObject) PortableRemoteObject.narrow(object, ComplexCmpObject.class);
// This could be problematic, it assumes the order of the collection.
- ComplexCmpBeanPk foundKey = (ComplexCmpBeanPk) ejbObject.getPrimaryKey();
+ final ComplexCmpBeanPk foundKey = (ComplexCmpBeanPk) ejbObject.getPrimaryKey();
assertTrue("Extra ejb found " + ejbObject.getPrimaryKey(), keys.contains(foundKey));
foundKeys.add(foundKey);
}
keys.removeAll(foundKeys);
assertEquals("Some keys were not found", Collections.EMPTY_SET, keys);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
@@ -102,10 +102,10 @@ public class Complex2HomeIntfcTests exte
public void test04_homeMethod() {
try {
- int expected = 8;
- int actual = ejbHome.sum(5, 3);
+ final int expected = 8;
+ final int actual = ejbHome.sum(5, 3);
assertEquals("home method returned wrong result", expected, actual);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2RemoteIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2RemoteIntfcTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2RemoteIntfcTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Complex2RemoteIntfcTests.java Tue Jul 15 21:55:09 2014
@@ -30,7 +30,7 @@ public class Complex2RemoteIntfcTests ex
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/ComplexCmpHome");
ejbHome = (ComplexCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
ejbObject = ejbHome.createObject("Forth Bean");
}
@@ -40,10 +40,10 @@ public class Complex2RemoteIntfcTests ex
//
public void test01_businessMethod() {
try {
- String expected = "Success";
- String actual = ejbObject.businessMethod("sseccuS");
+ final String expected = "Success";
+ final String actual = ejbObject.businessMethod("sseccuS");
assertEquals(expected, actual);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -55,10 +55,10 @@ public class Complex2RemoteIntfcTests ex
public void test02_throwApplicationException() {
try {
ejbObject.throwApplicationException();
- } catch (org.apache.openejb.test.ApplicationException e) {
+ } catch (final org.apache.openejb.test.ApplicationException e) {
//Good. This is the correct behaviour
return;
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
fail("An ApplicationException should have been thrown.");
@@ -70,10 +70,10 @@ public class Complex2RemoteIntfcTests ex
*/
public void test03_invokeAfterApplicationException() {
try {
- String expected = "Success";
- String actual = ejbObject.businessMethod("sseccuS");
+ final String expected = "Success";
+ final String actual = ejbObject.businessMethod("sseccuS");
assertEquals(expected, actual);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -81,13 +81,13 @@ public class Complex2RemoteIntfcTests ex
public void test04_throwSystemException() {
try {
ejbObject.throwSystemException_NullPointer();
- } catch (java.rmi.RemoteException e) {
+ } catch (final java.rmi.RemoteException e) {
//Good, so far.
- Throwable n = e.detail;
+ final Throwable n = e.detail;
assertNotNull("Nested exception should not be is null", n);
assertTrue("Nested exception should be an instance of NullPointerException, but exception is " + n.getClass().getName(), (n instanceof NullPointerException));
return;
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
fail("A NullPointerException should have been thrown.");
@@ -103,9 +103,9 @@ public class Complex2RemoteIntfcTests ex
try {
ejbObject.businessMethod("This refernce is invalid");
fail("A java.rmi.NoSuchObjectException should have been thrown.");
- } catch (java.rmi.NoSuchObjectException e) {
+ } catch (final java.rmi.NoSuchObjectException e) {
// Good.
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/ComplexCmp2TestClient.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/ComplexCmp2TestClient.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/ComplexCmp2TestClient.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/ComplexCmp2TestClient.java Tue Jul 15 21:55:09 2014
@@ -24,7 +24,7 @@ public abstract class ComplexCmp2TestCli
protected ComplexCmpHome ejbHome;
protected ComplexCmpObject ejbObject;
- public ComplexCmp2TestClient(String name) {
+ public ComplexCmp2TestClient(final String name) {
super(name);
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/EjbqlLocalTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/EjbqlLocalTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/EjbqlLocalTest.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/EjbqlLocalTest.java Tue Jul 15 21:55:09 2014
@@ -42,7 +42,7 @@ public class EjbqlLocalTest extends Cmp2
Object obj = initialContext.lookup("client/tests/entity/ejbql/Query");
queryHome = (QueryHome) PortableRemoteObject.narrow(obj, QueryHome.class);
obj = initialContext.lookup("client/tests/entity/ejbql/QueryData");
- QueryDataHome queryDataHome = (QueryDataHome) PortableRemoteObject.narrow(obj, QueryDataHome.class);
+ final QueryDataHome queryDataHome = (QueryDataHome) PortableRemoteObject.narrow(obj, QueryDataHome.class);
queryDataHome.create(0);
queryDataHome.create(1);
@@ -58,7 +58,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single string field
*/
public void testSelectSingleStringField() throws Exception {
- String result = queryHome.selectSingleStringField("2");
+ final String result = queryHome.selectSingleStringField("2");
assertEquals("2", result);
}
@@ -66,7 +66,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single boolean field
*/
public void testSelectSingleBooleanField() throws Exception {
- boolean result = queryHome.selectSingleBooleanField(true);
+ final boolean result = queryHome.selectSingleBooleanField(true);
assertEquals(true, result);
}
@@ -74,7 +74,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single char field
*/
public void testSelectSingleCharField() throws Exception {
- char result = queryHome.selectSingleCharField('2');
+ final char result = queryHome.selectSingleCharField('2');
assertEquals('2', result);
}
@@ -82,7 +82,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single byte field
*/
public void testSelectSingleByteField() throws Exception {
- byte result = queryHome.selectSingleByteField((byte) 2);
+ final byte result = queryHome.selectSingleByteField((byte) 2);
assertEquals(2, result);
}
@@ -90,7 +90,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single short field
*/
public void testSelectSingleShortField() throws Exception {
- short result = queryHome.selectSingleShortField((short) 2);
+ final short result = queryHome.selectSingleShortField((short) 2);
assertEquals(2, result);
}
@@ -98,7 +98,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single int field
*/
public void testSelectSingleIntField() throws Exception {
- int result = queryHome.selectSingleIntField(2);
+ final int result = queryHome.selectSingleIntField(2);
assertEquals(2, result);
}
@@ -106,7 +106,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single long field
*/
public void testSelectSingleLongField() throws Exception {
- long result = queryHome.selectSingleLongField(2);
+ final long result = queryHome.selectSingleLongField(2);
assertEquals(2, result);
}
@@ -114,7 +114,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single float field
*/
public void testSelectSingleFloatField() throws Exception {
- float result = queryHome.selectSingleFloatField(2);
+ final float result = queryHome.selectSingleFloatField(2);
assertEquals((float) 2.0, result, 1e-15);
}
@@ -122,7 +122,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a single double field
*/
public void testSelectSingleDoubleField() throws Exception {
- double result = queryHome.selectSingleDoubleField(2);
+ final double result = queryHome.selectSingleDoubleField(2);
assertEquals(2.0, result, 1e-15);
}
@@ -130,7 +130,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection string field
*/
public void testSelectCollectionStringField() throws Exception {
- Collection result = queryHome.selectCollectionStringField();
+ final Collection result = queryHome.selectCollectionStringField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, "0", "1", "2", "3");
@@ -140,7 +140,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection boolean field
*/
public void testSelectCollectionBooleanField() throws Exception {
- Collection result = queryHome.selectCollectionBooleanField();
+ final Collection result = queryHome.selectCollectionBooleanField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, true, false);
@@ -150,7 +150,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection char field
*/
public void testSelectCollectionCharField() throws Exception {
- Collection result = queryHome.selectCollectionCharField();
+ final Collection result = queryHome.selectCollectionCharField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, '0', '1', '2', '3');
@@ -160,7 +160,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection byte field
*/
public void testSelectCollectionByteField() throws Exception {
- Collection result = queryHome.selectCollectionByteField();
+ final Collection result = queryHome.selectCollectionByteField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, (byte) 0, (byte) 1, (byte) 2, (byte) 3);
@@ -170,7 +170,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection short field
*/
public void testSelectCollectionShortField() throws Exception {
- Collection result = queryHome.selectCollectionShortField();
+ final Collection result = queryHome.selectCollectionShortField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, (short) 0, (short) 1, (short) 2, (short) 3);
@@ -180,7 +180,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection int field
*/
public void testSelectCollectionIntField() throws Exception {
- Collection result = queryHome.selectCollectionIntField();
+ final Collection result = queryHome.selectCollectionIntField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, 0, 1, 2, 3);
@@ -190,7 +190,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection long field
*/
public void testSelectCollectionLongField() throws Exception {
- Collection result = queryHome.selectCollectionLongField();
+ final Collection result = queryHome.selectCollectionLongField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, (long) 0, (long) 1, (long) 2, (long) 3);
@@ -200,7 +200,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection float field
*/
public void testSelectCollectionFloatField() throws Exception {
- Collection result = queryHome.selectCollectionFloatField();
+ final Collection result = queryHome.selectCollectionFloatField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, (float) 0, (float) 1, (float) 2, (float) 3);
@@ -210,7 +210,7 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection double field
*/
public void testSelectCollectionDoubleField() throws Exception {
- Collection result = queryHome.selectCollectionDoubleField();
+ final Collection result = queryHome.selectCollectionDoubleField();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
assertCollection(result, 0.0, 1.0, 2.0, 3.0);
@@ -220,10 +220,10 @@ public class EjbqlLocalTest extends Cmp2
* Select a single local ejb
*/
public void testSelectSingleLocalEjb() throws Exception {
- Object result = queryHome.selectSingleLocalEjb(2);
+ final Object result = queryHome.selectSingleLocalEjb(2);
assertNotNull("result is null", result);
assertTrue("result should be an instance of QueryDataLocal", result instanceof QueryDataLocal);
- QueryDataLocal queryData = (QueryDataLocal) result;
+ final QueryDataLocal queryData = (QueryDataLocal) result;
assertEquals(2, queryData.getIntField());
}
@@ -231,10 +231,10 @@ public class EjbqlLocalTest extends Cmp2
* Select a single remote ejb
*/
public void testSelectSingleRemoteEjb() throws Exception {
- Object result = queryHome.selectSingleRemoteEjb(2);
+ final Object result = queryHome.selectSingleRemoteEjb(2);
assertNotNull("result is null", result);
assertTrue("result should be an instance of QueryDataRemote", result instanceof QueryDataRemote);
- QueryDataRemote queryData = (QueryDataRemote) result;
+ final QueryDataRemote queryData = (QueryDataRemote) result;
assertEquals(2, queryData.getIntField());
}
@@ -242,14 +242,14 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection local ejb
*/
public void testSelectCollectionLocalEjb() throws Exception {
- Collection result = queryHome.selectCollectionLocalEjb();
+ final Collection result = queryHome.selectCollectionLocalEjb();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
- List<Integer> values = new ArrayList<Integer>();
- for (Object object : result) {
+ final List<Integer> values = new ArrayList<Integer>();
+ for (final Object object : result) {
assertTrue("result item should be an instance of QueryDataLocal but is instance of " + Arrays.toString(object.getClass().getInterfaces()), object instanceof QueryDataLocal);
- QueryDataLocal queryData = (QueryDataLocal) object;
+ final QueryDataLocal queryData = (QueryDataLocal) object;
values.add(queryData.getIntField());
}
assertCollection(values, 0, 1, 2, 3);
@@ -259,21 +259,21 @@ public class EjbqlLocalTest extends Cmp2
* Select a collection remote ejb
*/
public void testSelectCollectionRemoteEjb() throws Exception {
- Collection result = queryHome.selectCollectionRemoteEjb();
+ final Collection result = queryHome.selectCollectionRemoteEjb();
assertNotNull("result is null", result);
assertEquals("result.size()", 4, result.size());
- List<Integer> values = new ArrayList<Integer>();
- for (Object object : result) {
+ final List<Integer> values = new ArrayList<Integer>();
+ for (final Object object : result) {
assertTrue("result item should be an instance of QueryDataRemote", object instanceof QueryDataRemote);
- QueryDataRemote queryData = (QueryDataRemote) object;
+ final QueryDataRemote queryData = (QueryDataRemote) object;
values.add(queryData.getIntField());
}
assertCollection(values, 0, 1, 2, 3);
}
@SuppressWarnings({"unchecked"})
- private static <E> void assertCollection(Collection collection, E... values) {
+ private static <E> void assertCollection(final Collection collection, final E... values) {
assertEquals(new TreeSet(Arrays.asList(values)), new TreeSet(collection));
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbHomeTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbHomeTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbHomeTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbHomeTests.java Tue Jul 15 21:55:09 2014
@@ -33,7 +33,7 @@ public class Unknown2EjbHomeTests extend
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
ejbObject = ejbHome.createObject("Second Bean");
ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -44,9 +44,9 @@ public class Unknown2EjbHomeTests extend
//
public void test01_getEJBMetaData() {
try {
- EJBMetaData ejbMetaData = ejbHome.getEJBMetaData();
+ final EJBMetaData ejbMetaData = ejbHome.getEJBMetaData();
assertNotNull("The EJBMetaData is null", ejbMetaData);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -55,13 +55,13 @@ public class Unknown2EjbHomeTests extend
try {
ejbHomeHandle = ejbHome.getHomeHandle();
assertNotNull("The HomeHandle is null", ejbHomeHandle);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
- public void test03_removeByPrimaryKey(){
- try{
+ public void test03_removeByPrimaryKey() {
+ try {
// remove the ejb
ejbHome.remove(ejbPrimaryKey);
@@ -69,26 +69,26 @@ public class Unknown2EjbHomeTests extend
try {
ejbHome.findByPrimaryKey(ejbPrimaryKey);
fail("Entity was not actually removed");
- } catch (ObjectNotFoundException e) {
+ } catch (final ObjectNotFoundException e) {
}
// verify the proxy is dead
- try{
+ try {
ejbObject.businessMethod("Should throw an exception");
- assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
- } catch (Exception e){
+ assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
+ } catch (final Exception e) {
}
// create a new ejb for the next test
ejbObject = ejbHome.createObject("Second Bean");
ejbPrimaryKey = ejbObject.getPrimaryKey();
- } catch (Exception e){
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ } catch (final Exception e) {
+ fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
- public void test04_removeByPrimaryHandle(){
- try{
+ public void test04_removeByPrimaryHandle() {
+ try {
// remove the ejb
ejbHome.remove(ejbObject.getHandle());
@@ -96,29 +96,29 @@ public class Unknown2EjbHomeTests extend
try {
ejbHome.findByPrimaryKey(ejbPrimaryKey);
fail("Entity was not actually removed");
- } catch (ObjectNotFoundException e) {
+ } catch (final ObjectNotFoundException e) {
}
// verify the proxy is dead
- try{
+ try {
ejbObject.businessMethod("Should throw an exception");
- assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
- } catch (Exception e){
+ assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
+ } catch (final Exception e) {
}
// create a new ejb for the next test
ejbObject = ejbHome.createObject("Second Bean");
ejbPrimaryKey = ejbObject.getPrimaryKey();
- } catch (Exception e){
+ } catch (final Exception e) {
e.printStackTrace();
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+ fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test05_ejbHomeMethod() {
try {
- assertEquals(8+9, ejbHome.sum(8, 9));
- } catch (Throwable e) {
+ assertEquals(8 + 9, ejbHome.sum(8, 9));
+ } catch (final Throwable e) {
e.printStackTrace();
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbMetaDataTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbMetaDataTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbMetaDataTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbMetaDataTests.java Tue Jul 15 21:55:09 2014
@@ -33,7 +33,7 @@ public class Unknown2EjbMetaDataTests ex
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
ejbMetaData = ejbHome.getEJBMetaData();
}
@@ -43,39 +43,39 @@ public class Unknown2EjbMetaDataTests ex
//
public void test01_getEJBHome() {
try {
- EJBHome home = ejbMetaData.getEJBHome();
+ final EJBHome home = ejbMetaData.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test02_getHomeInterfaceClass() {
try {
- Class clazz = ejbMetaData.getHomeInterfaceClass();
+ final Class clazz = ejbMetaData.getHomeInterfaceClass();
assertNotNull("The Home Interface class is null", clazz);
assertEquals(clazz, UnknownCmpHome.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test03_getPrimaryKeyClass() {
try {
- Class clazz = ejbMetaData.getPrimaryKeyClass();
+ final Class clazz = ejbMetaData.getPrimaryKeyClass();
assertNotNull("The EJBMetaData is null", clazz);
assertEquals(clazz, Object.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test04_getRemoteInterfaceClass() {
try {
- Class clazz = ejbMetaData.getRemoteInterfaceClass();
+ final Class clazz = ejbMetaData.getRemoteInterfaceClass();
assertNotNull("The Remote Interface class is null", clazz);
assertEquals(clazz, UnknownCmpObject.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -83,7 +83,7 @@ public class Unknown2EjbMetaDataTests ex
public void test05_isSession() {
try {
assertTrue("EJBMetaData says this is a session bean", !ejbMetaData.isSession());
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -91,7 +91,7 @@ public class Unknown2EjbMetaDataTests ex
public void test06_isStatelessSession() {
try {
assertTrue("EJBMetaData says this is a stateless session bean", !ejbMetaData.isStatelessSession());
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbObjectTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbObjectTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbObjectTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2EjbObjectTests.java Tue Jul 15 21:55:09 2014
@@ -33,7 +33,7 @@ public class Unknown2EjbObjectTests exte
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
ejbObject = ejbHome.createObject("Third Bean");
}
@@ -42,7 +42,7 @@ public class Unknown2EjbObjectTests exte
if (ejbObject != null) {// set to null by test05_remove() method
try {
ejbObject.remove();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw e;
}
}
@@ -56,7 +56,7 @@ public class Unknown2EjbObjectTests exte
try {
ejbHandle = ejbObject.getHandle();
assertNotNull("The Handle is null", ejbHandle);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -65,7 +65,7 @@ public class Unknown2EjbObjectTests exte
try {
ejbPrimaryKey = ejbObject.getPrimaryKey();
assertNotNull("The primary key is null", ejbPrimaryKey);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
@@ -74,22 +74,22 @@ public class Unknown2EjbObjectTests exte
public void test03_isIdentical() {
try {
assertTrue("The EJBObjects are not equal", ejbObject.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void test04_getEjbHome() {
try {
- EJBHome home = ejbObject.getEJBHome();
+ final EJBHome home = ejbObject.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
- public void test05_remove(){
- try{
+ public void test05_remove() {
+ try {
// remove the ejb
ejbObject.remove();
@@ -97,18 +97,18 @@ public class Unknown2EjbObjectTests exte
try {
ejbHome.findByPrimaryKey(ejbPrimaryKey);
fail("Entity was not actually removed");
- } catch (ObjectNotFoundException e) {
+ } catch (final ObjectNotFoundException e) {
}
// verify the proxy is dead
- try{
+ try {
ejbObject.businessMethod("Should throw an exception");
- assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
- } catch (Exception e){
+ assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
+ } catch (final Exception e) {
}
- } catch (Exception e){
- fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
- } finally{
+ } catch (final Exception e) {
+ fail("Received Exception " + e.getClass() + " : " + e.getMessage());
+ } finally {
ejbObject = null;
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HandleTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HandleTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HandleTests.java Tue Jul 15 21:55:09 2014
@@ -37,7 +37,7 @@ public class Unknown2HandleTests extends
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
ejbObject = ejbHome.createObject("Fifth Bean");
ejbHandle = ejbObject.getHandle();
@@ -56,43 +56,43 @@ public class Unknown2HandleTests extends
public void test01_getEJBObject() {
try {
- EJBObject object = ejbHandle.getEJBObject();
+ final EJBObject object = ejbHandle.getEJBObject();
assertNotNull("The EJBObject is null", object);
// Wait until isIdentical is working.
//assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest02_copyHandleByMarshalledObject() {
try {
- MarshalledObject obj = new MarshalledObject(ejbHandle);
- Handle copy = (Handle) obj.get();
+ final MarshalledObject obj = new MarshalledObject(ejbHandle);
+ final Handle copy = (Handle) obj.get();
- EJBObject object = copy.getEJBObject();
+ final EJBObject object = copy.getEJBObject();
assertNotNull("The EJBObject is null", object);
assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest03_copyHandleBySerialize() {
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(ejbHandle);
oos.flush();
oos.close();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- Handle copy = (Handle) ois.readObject();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ final ObjectInputStream ois = new ObjectInputStream(bais);
+ final Handle copy = (Handle) ois.readObject();
- EJBObject object = copy.getEJBObject();
+ final EJBObject object = copy.getEJBObject();
assertNotNull("The EJBObject is null", object);
assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -108,10 +108,10 @@ public class Unknown2HandleTests extends
try {
ejbObject.businessMethod("Should throw an exception");
assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(true);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
} finally {
ejbObject = null;
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeHandleTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeHandleTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeHandleTests.java Tue Jul 15 21:55:09 2014
@@ -38,7 +38,7 @@ public class Unknown2HomeHandleTests ext
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
ejbHomeHandle = ejbHome.getHomeHandle();
}
@@ -48,41 +48,41 @@ public class Unknown2HomeHandleTests ext
//
public void test01_getEJBHome() {
try {
- EJBHome home = ejbHomeHandle.getEJBHome();
+ final EJBHome home = ejbHomeHandle.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest02_copyHandleByMarshalledObject() {
try {
- MarshalledObject obj = new MarshalledObject(ejbHomeHandle);
- HomeHandle copy = (HomeHandle) obj.get();
+ final MarshalledObject obj = new MarshalledObject(ejbHomeHandle);
+ final HomeHandle copy = (HomeHandle) obj.get();
assertNotNull("The HomeHandle copy is null", copy);
- EJBHome home = copy.getEJBHome();
+ final EJBHome home = copy.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
public void Xtest03_copyHandleBySerialize() {
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(ejbHomeHandle);
oos.flush();
oos.close();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- HomeHandle copy = (HomeHandle) ois.readObject();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ final ObjectInputStream ois = new ObjectInputStream(bais);
+ final HomeHandle copy = (HomeHandle) ois.readObject();
assertNotNull("The HomeHandle copy is null", copy);
- EJBHome home = copy.getEJBHome();
+ final EJBHome home = copy.getEJBHome();
assertNotNull("The EJBHome is null", home);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeIntfcTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeIntfcTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2HomeIntfcTests.java Tue Jul 15 21:55:09 2014
@@ -36,7 +36,7 @@ public class Unknown2HomeIntfcTests exte
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
}
@@ -56,7 +56,7 @@ public class Unknown2HomeIntfcTests exte
}
public void test03_findByLastName() throws Exception {
- Set<Object> keys = new HashSet<Object>();
+ final Set<Object> keys = new HashSet<Object>();
try {
ejbObject = ejbHome.createObject("David Blevins");
ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -72,27 +72,27 @@ public class Unknown2HomeIntfcTests exte
ejbPrimaryKey = ejbObject.getPrimaryKey();
assertNotNull("ejbPrimaryKey is null", ejbPrimaryKey);
keys.add(ejbObject.getPrimaryKey());
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received exception while preparing the test: " + e.getClass() + " : " + e.getMessage());
}
try {
- Collection objects = ejbHome.findByLastName("Blevins");
- Set<Object> foundKeys = new HashSet<Object>();
+ final Collection objects = ejbHome.findByLastName("Blevins");
+ final Set<Object> foundKeys = new HashSet<Object>();
assertNotNull("The Collection is null", objects);
assertEquals("The Collection is not the right size.", keys.size(), objects.size());
- for (Object object : objects) {
+ for (final Object object : objects) {
ejbObject = (UnknownCmpObject) PortableRemoteObject.narrow(object, UnknownCmpObject.class);
// This could be problematic, it assumes the order of the collection.
- Object foundKey = ejbObject.getPrimaryKey();
+ final Object foundKey = ejbObject.getPrimaryKey();
assertTrue("Extra ejb found " + ejbObject.getPrimaryKey(), keys.contains(foundKey));
foundKeys.add(foundKey);
}
keys.removeAll(foundKeys);
assertEquals("Some keys were not found", Collections.EMPTY_SET, keys);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
@@ -100,10 +100,10 @@ public class Unknown2HomeIntfcTests exte
public void test04_homeMethod() {
try {
- int expected = 8;
- int actual = ejbHome.sum(5, 3);
+ final int expected = 8;
+ final int actual = ejbHome.sum(5, 3);
assertEquals("home method returned wrong result", expected, actual);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2RemoteIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2RemoteIntfcTests.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2RemoteIntfcTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Unknown2RemoteIntfcTests.java Tue Jul 15 21:55:09 2014
@@ -30,7 +30,7 @@ public class Unknown2RemoteIntfcTests ex
protected void setUp() throws Exception {
super.setUp();
- Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
+ final Object obj = initialContext.lookup("client/tests/entity/cmp2/UnknownCmpHome");
ejbHome = (UnknownCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
ejbObject = ejbHome.createObject("Forth Bean");
}
@@ -40,10 +40,10 @@ public class Unknown2RemoteIntfcTests ex
//
public void test01_businessMethod() {
try {
- String expected = "Success";
- String actual = ejbObject.businessMethod("sseccuS");
+ final String expected = "Success";
+ final String actual = ejbObject.businessMethod("sseccuS");
assertEquals(expected, actual);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -55,10 +55,10 @@ public class Unknown2RemoteIntfcTests ex
public void test02_throwApplicationException() {
try {
ejbObject.throwApplicationException();
- } catch (org.apache.openejb.test.ApplicationException e) {
+ } catch (final org.apache.openejb.test.ApplicationException e) {
//Good. This is the correct behaviour
return;
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
fail("An ApplicationException should have been thrown.");
@@ -70,10 +70,10 @@ public class Unknown2RemoteIntfcTests ex
*/
public void test03_invokeAfterApplicationException() {
try {
- String expected = "Success";
- String actual = ejbObject.businessMethod("sseccuS");
+ final String expected = "Success";
+ final String actual = ejbObject.businessMethod("sseccuS");
assertEquals(expected, actual);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
@@ -81,13 +81,13 @@ public class Unknown2RemoteIntfcTests ex
public void test04_throwSystemException() {
try {
ejbObject.throwSystemException_NullPointer();
- } catch (java.rmi.RemoteException e) {
+ } catch (final java.rmi.RemoteException e) {
//Good, so far.
- Throwable n = e.detail;
+ final Throwable n = e.detail;
assertNotNull("Nested exception should not be is null", n);
assertTrue("Nested exception should be an instance of NullPointerException, but exception is " + n.getClass().getName(), (n instanceof NullPointerException));
return;
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
fail("A NullPointerException should have been thrown.");
@@ -103,9 +103,9 @@ public class Unknown2RemoteIntfcTests ex
try {
ejbObject.businessMethod("This refernce is invalid");
fail("A java.rmi.NoSuchObjectException should have been thrown.");
- } catch (java.rmi.NoSuchObjectException e) {
+ } catch (final java.rmi.NoSuchObjectException e) {
// Good.
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Received Exception " + e.getClass() + " : " + e.getMessage());
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/UnknownCmp2TestClient.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/UnknownCmp2TestClient.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/UnknownCmp2TestClient.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/UnknownCmp2TestClient.java Tue Jul 15 21:55:09 2014
@@ -24,7 +24,7 @@ public abstract class UnknownCmp2TestCli
protected UnknownCmpHome ejbHome;
protected UnknownCmpObject ejbObject;
- public UnknownCmp2TestClient(String name) {
+ public UnknownCmp2TestClient(final String name) {
super(name);
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/AbstractCMRTest.java Tue Jul 15 21:55:09 2014
@@ -44,8 +44,8 @@ public abstract class AbstractCMRTest ex
protected DataSource ds;
protected InitialContext initialContext;
- public AbstractCMRTest(String name){
- super("Entity.CMR."+name);
+ public AbstractCMRTest(final String name) {
+ super("Entity.CMR." + name);
}
protected synchronized void beginTransaction() throws Exception {
@@ -53,7 +53,7 @@ public abstract class AbstractCMRTest ex
}
protected synchronized void completeTransaction() throws SystemException, HeuristicMixedException, HeuristicRollbackException, RollbackException {
- int status = transactionManager.getStatus();
+ final int status = transactionManager.getStatus();
if (status == Status.STATUS_ACTIVE) {
transactionManager.commit();
} else if (status != Status.STATUS_NO_TRANSACTION) {
@@ -70,22 +70,22 @@ public abstract class AbstractCMRTest ex
protected synchronized void setUp() throws Exception {
super.setUp();
- Properties properties = TestManager.getServer().getContextEnvironment();
+ final Properties properties = TestManager.getServer().getContextEnvironment();
//properties.put(Context.SECURITY_PRINCIPAL, "ENTITY_TEST_CLIENT");
//properties.put(Context.SECURITY_CREDENTIALS, "ENTITY_TEST_CLIENT");
initialContext = new InitialContext(properties);
- InitialContext jndiContext = new InitialContext( );
+ final InitialContext jndiContext = new InitialContext();
transactionManager = (TransactionManager) jndiContext.lookup("java:openejb/TransactionManager");
try {
ds = (DataSource) jndiContext.lookup("java:openejb/Resource/My DataSource");
- } catch (NamingException e) {
+ } catch (final NamingException e) {
ds = (DataSource) jndiContext.lookup("java:openejb/Resource/Default JDBC Database");
}
}
- protected static void dumpTable(DataSource ds, String table) throws SQLException {
+ protected static void dumpTable(final DataSource ds, final String table) throws SQLException {
Connection connection = null;
Statement statement = null;
ResultSet resultSet = null;
@@ -93,16 +93,16 @@ public abstract class AbstractCMRTest ex
connection = ds.getConnection();
statement = connection.createStatement();
resultSet = statement.executeQuery("SELECT * FROM " + table);
- ResultSetMetaData setMetaData = resultSet.getMetaData();
- int columnCount = setMetaData.getColumnCount();
- while(resultSet.next()) {
- StringBuilder row = new StringBuilder();
+ final ResultSetMetaData setMetaData = resultSet.getMetaData();
+ final int columnCount = setMetaData.getColumnCount();
+ while (resultSet.next()) {
+ final StringBuilder row = new StringBuilder();
for (int i = 1; i <= columnCount; i++) {
if (i > 1) {
row.append(", ");
}
- String name = setMetaData.getColumnName(i);
- Object value = resultSet.getObject(i);
+ final String name = setMetaData.getColumnName(i);
+ final Object value = resultSet.getObject(i);
row.append(name).append("=").append(value);
}
System.out.println(row);
@@ -114,27 +114,27 @@ public abstract class AbstractCMRTest ex
}
}
- protected static void close(ResultSet resultSet) {
+ protected static void close(final ResultSet resultSet) {
if (resultSet == null) return;
try {
resultSet.close();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
}
}
- protected static void close(Statement statement) {
+ protected static void close(final Statement statement) {
if (statement == null) return;
try {
statement.close();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
}
}
- protected static void close(Connection connection) {
+ protected static void close(final Connection connection) {
if (connection == null) return;
try {
connection.close();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
}
}
}