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:59:37 UTC
svn commit: r1610645 - in
/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb:
config/ meta/ resource/jdbc/
Author: andygumbrecht
Date: Tue Jul 15 10:59:36 2014
New Revision: 1610645
URL: http://svn.apache.org/r1610645
Log:
Tear downs
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MessageDrivenMetaTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaRunner.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostActivateMetaTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostConstructMetaTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java?rev=1610645&r1=1610644&r2=1610645&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java Tue Jul 15 10:59:36 2014
@@ -164,46 +164,47 @@ public class InjectionTest extends TestC
public static interface RemoteWidget extends Widget {
}
+ @SuppressWarnings("FieldMayBeFinal")
@Stateless
public static class WidgetBean implements Widget, RemoteWidget {
private SessionContext sessionContext;
@Resource
- private final String myString = "1";
+ private String myString = "1";
@Resource
- private final Double myDouble = 1.0D;
+ private Double myDouble = 1.0D;
@Resource
- private final Long myLong = 1L;
+ private Long myLong = 1L;
@Resource
- private final Float myFloat = 1.0F;
+ private Float myFloat = 1.0F;
@Resource
- private final Integer myInteger = 1;
+ private Integer myInteger = 1;
@Resource
- private final Short myShort = (short) 1;
+ private Short myShort = (short) 1;
@Resource
- private final Boolean myBoolean = true;
+ private Boolean myBoolean = true;
@Resource
- private final Byte myByte = (byte) 1;
+ private Byte myByte = (byte) 1;
@Resource
- private final Character myCharacter = '1';
+ private Character myCharacter = '1';
@Resource
- private final Class myClass = Object.class;
+ private Class myClass = Object.class;
@Resource
- private final TimeUnit myTimeUnit = TimeUnit.DAYS;
+ private TimeUnit myTimeUnit = TimeUnit.DAYS;
// injected via DD
- private final boolean injectedBoolean = false;
+ private boolean injectedBoolean = false;
// injected via DD
private EJBContext injectedContext;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MessageDrivenMetaTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MessageDrivenMetaTest.java?rev=1610645&r1=1610644&r2=1610645&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MessageDrivenMetaTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MessageDrivenMetaTest.java Tue Jul 15 10:59:36 2014
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.meta;
+import org.apache.openejb.OpenEJB;
+import org.junit.AfterClass;
import org.junit.runner.RunWith;
import javax.ejb.MessageDriven;
@@ -33,6 +35,11 @@ import java.lang.annotation.Target;
@RunWith(MetaRunner.class)
public class MessageDrivenMetaTest {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@MetaTest(expected = ExpectedBean.class, actual = ActualBean.class)
public void test() {
}
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaRunner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaRunner.java?rev=1610645&r1=1610644&r2=1610645&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaRunner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaRunner.java Tue Jul 15 10:59:36 2014
@@ -76,7 +76,6 @@ public class MetaRunner extends BlockJUn
@Override
protected List<FrameworkMethod> computeTestMethods() {
final TestClass testClass = getTestClass();
- final List<FrameworkMethod> methods = testClass.getAnnotatedMethods(MetaTest.class);
- return methods;
+ return testClass.getAnnotatedMethods(MetaTest.class);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostActivateMetaTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostActivateMetaTest.java?rev=1610645&r1=1610644&r2=1610645&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostActivateMetaTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostActivateMetaTest.java Tue Jul 15 10:59:36 2014
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.meta;
+import org.apache.openejb.OpenEJB;
+import org.junit.AfterClass;
import org.junit.runner.RunWith;
import javax.ejb.PostActivate;
@@ -30,6 +32,11 @@ import java.lang.annotation.Target;
@RunWith(MetaRunner.class)
public class PostActivateMetaTest {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@MetaTest(expected = ExpectedBean.class, actual = ActualBean.class)
public void test() {
}
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostConstructMetaTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostConstructMetaTest.java?rev=1610645&r1=1610644&r2=1610645&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostConstructMetaTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/PostConstructMetaTest.java Tue Jul 15 10:59:36 2014
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.meta;
+import org.apache.openejb.OpenEJB;
+import org.junit.AfterClass;
import org.junit.runner.RunWith;
import javax.annotation.PostConstruct;
@@ -30,6 +32,11 @@ import java.lang.annotation.Target;
@RunWith(MetaRunner.class)
public class PostConstructMetaTest {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@MetaTest(expected = ExpectedBean.class, actual = ActualBean.class)
public void test() {
}
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java?rev=1610645&r1=1610644&r2=1610645&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java Tue Jul 15 10:59:36 2014
@@ -68,7 +68,7 @@ import static org.junit.Assert.assertEqu
public class DynamicDataSourceTest {
@After
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
OpenEJB.destroy();
}