You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by km...@apache.org on 2010/09/02 03:48:22 UTC
svn commit: r991791 -
/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/
Author: kmalhi
Date: Thu Sep 2 01:48:21 2010
New Revision: 991791
URL: http://svn.apache.org/viewvc?rev=991791&view=rev
Log:
Reverse merged changes made to the validation test framework. Also changed KeyType from an enum to an interface to avoid a bug in jdk which causes compilation issues. More information on the bug can be found in this discussion, http://openejb.979440.n4.nabble.com/Nonsense-compilation-error-td2402580.html#a2402696
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidCallbacksTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidInterceptorTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidTimeoutTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckUserTransactionRefsTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeyType.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckDependsOnTest.java Thu Sep 2 01:48:21 2010
@@ -26,8 +26,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckDependsOnTest {
- @Keys( { @Key(value = "dependsOn.circuit", count = 2, type = KeyType.FAILURE),
- @Key(value = "dependsOn.noSuchEjb", count = 2, type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "dependsOn.circuit", count = 2), @Key(value = "dependsOn.noSuchEjb", count = 2) })
public EjbJar dependsOn() throws OpenEJBException {
EjbJar ejbJar = new EjbJar();
SingletonBean one = new SingletonBean(One.class);
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAnnotatedInterfacesTest.java Thu Sep 2 01:48:21 2010
@@ -33,8 +33,7 @@ public class CheckInvalidAnnotatedInterf
System.setProperty("openejb.validation.output.level", "VERBOSE");
}
- @Keys( { @Key(value = "ann.local.noAttributes", type = KeyType.FAILURE),
- @Key(value = "ann.remote.noAttributes", type = KeyType.FAILURE) })
+ @Keys( { @Key("ann.local.noAttributes"), @Key("ann.remote.noAttributes") })
public EjbJar noAttributes() {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooBeanLocal.class));
@@ -42,8 +41,7 @@ public class CheckInvalidAnnotatedInterf
return ejbJar;
}
- @Keys( { @Key(value = "ann.localRemote.ambiguous", type = KeyType.FAILURE),
- @Key(value = "ann.localRemote.conflict", type = KeyType.FAILURE) })
+ @Keys( { @Key("ann.localRemote.ambiguous"), @Key("ann.localRemote.conflict") })
public EjbJar ambiguous() {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidAroundTimeoutTest.java Thu Sep 2 01:48:21 2010
@@ -34,8 +34,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidAroundTimeoutTest extends TestCase {
- @Keys({@Key(value="aroundInvoke.invalidArguments",count=2, type = KeyType.FAILURE),
- @Key(value="aroundInvoke.badReturnType",count=2, type = KeyType.FAILURE)})
+ @Keys({@Key(value="aroundInvoke.invalidArguments",count=2),@Key(value="aroundInvoke.badReturnType",count=2)})
public EjbJar testInvalidAroundTimeoutParameter() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean("TestInvalidAroundTimeoutParameterBean", TestInvalidAroundTimeoutParameterBean.class));
@@ -43,8 +42,7 @@ public class CheckInvalidAroundTimeoutTe
return ejbJar;
}
- @Keys({@Key(value="aroundInvoke.badReturnType",count=2, type = KeyType.FAILURE),
- @Key(value="aroundInvoke.mustThrowException",count=2, type = KeyType.FAILURE)})
+ @Keys({@Key(value="aroundInvoke.badReturnType",count=2),@Key(value="aroundInvoke.mustThrowException",count=2)})
public EjbJar testInvalidAroundTimeoutReturnValue() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean("TestInvalidAroundTimeoutReturnValueBean", TestInvalidAroundTimeoutReturnValueBean.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidCallbacksTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidCallbacksTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidCallbacksTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidCallbacksTest.java Thu Sep 2 01:48:21 2010
@@ -48,14 +48,9 @@ import org.junit.runner.RunWith;
*/
@RunWith(ValidationRunner.class)
public class CheckInvalidCallbacksTest extends TestCase {
- @Keys({ @Key(value = "ignoredAnnotation", count = 10, type = KeyType.WARNING),
- @Key(value = "callback.missing.possibleTypo", type = KeyType.FAILURE),
- @Key(value = "callback.badReturnType", type = KeyType.FAILURE),
- @Key(value = "callback.badModifier", type = KeyType.FAILURE),
- @Key(value = "callback.invalidArguments", type = KeyType.FAILURE),
- @Key(value = "aroundInvoke.missing", type = KeyType.FAILURE),
- @Key(value = "callback.missing", type = KeyType.FAILURE),
- @Key(value = "callback.sessionSynchronization.invalidUse", count = 2, type = KeyType.FAILURE) })
+ @Keys({ @Key(value = "ignoredAnnotation", count = 10, type = KeyType.WARNING), @Key("callback.missing.possibleTypo"), @Key("callback.badReturnType"),
+ @Key("callback.badModifier"), @Key("callback.invalidArguments"), @Key("aroundInvoke.missing"), @Key("callback.missing"),
+ @Key(value = "callback.sessionSynchronization.invalidUse", count = 2) })
public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
StatelessBean testBean = ejbJar.addEnterpriseBean(new StatelessBean("TestStateless", TestBean.class));
@@ -71,7 +66,7 @@ public class CheckInvalidCallbacksTest e
return ejbJar;
}
- @Keys(@Key(value = "aroundInvoke.missing.possibleTypo", type = KeyType.FAILURE))
+ @Keys(@Key("aroundInvoke.missing.possibleTypo"))
public EjbJar test1() {
EjbJar ejbJar = new EjbJar();
StatelessBean testBean = ejbJar.addEnterpriseBean(new StatelessBean(MoonBean.class));
@@ -79,7 +74,7 @@ public class CheckInvalidCallbacksTest e
return ejbJar;
}
- @Keys(@Key(value = "callback.sessionbean.invalidusage", count = 6, type = KeyType.FAILURE))
+ @Keys(@Key(value = "callback.sessionbean.invalidusage", count = 6))
public EjbJar test2() {
System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidConcurrencyAttributeTest.java Thu Sep 2 01:48:21 2010
@@ -29,8 +29,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidConcurrencyAttributeTest extends TestCase {
- @Keys( { @Key(value = "ann.invalidConcurrencyAttribute", type = KeyType.WARNING),
- @Key(value = "aroundInvoke.invalidArguments", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "ann.invalidConcurrencyAttribute", type = KeyType.WARNING), @Key(value = "aroundInvoke.invalidArguments") })
public EjbJar test() throws Exception {
System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidContainerTransactionTest.java Thu Sep 2 01:48:21 2010
@@ -24,8 +24,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidContainerTransactionTest {
- @Keys( { @Key(value = "containerTransaction.ejbNameRequired", type = KeyType.FAILURE),
- @Key(value = "containerTransaction.noSuchEjbName", type = KeyType.FAILURE) })
+ @Keys( { @Key("containerTransaction.ejbNameRequired"), @Key("containerTransaction.noSuchEjbName") })
public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
ContainerTransaction tx = new ContainerTransaction(TransAttribute.REQUIRED, new Method((String) null, (String) null));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidInterceptorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidInterceptorTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidInterceptorTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidInterceptorTest.java Thu Sep 2 01:48:21 2010
@@ -37,15 +37,10 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidInterceptorTest extends TestCase {
- @Keys( { @Key(value = "interceptor.callback.badReturnType", count = 2, type = KeyType.FAILURE),
- @Key(value = "interceptor.callback.invalidArguments", count = 2, type = KeyType.FAILURE),
- @Key(value = "aroundInvoke.badReturnType", count = 2, type = KeyType.FAILURE),
- @Key(value = "aroundInvoke.invalidArguments", count = 2, type = KeyType.FAILURE),
- @Key(value = "interceptor.callback.missing", type = KeyType.FAILURE),
- @Key(value = "aroundInvoke.missing", type = KeyType.FAILURE),
- @Key(value = "interceptorBinding.noSuchEjbName", type = KeyType.FAILURE),
- @Key(value = "interceptorBinding.ejbNameRequiredWithMethod", type = KeyType.FAILURE),
- @Key(value = "interceptor.callback.missing.possibleTypo", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "interceptor.callback.badReturnType", count = 2), @Key(value = "interceptor.callback.invalidArguments", count = 2),
+ @Key(value = "aroundInvoke.badReturnType", count = 2), @Key(value = "aroundInvoke.invalidArguments", count = 2), @Key("interceptor.callback.missing"),
+ @Key("aroundInvoke.missing"), @Key("interceptorBinding.noSuchEjbName"), @Key("interceptorBinding.ejbNameRequiredWithMethod"),
+ @Key("interceptor.callback.missing.possibleTypo") })
public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooBean.class));
@@ -62,8 +57,7 @@ public class CheckInvalidInterceptorTest
interceptorBindings.add(binding1);
return ejbJar;
}
- @Keys({@Key(value="interceptor.unused",count=2,type=KeyType.WARNING),
- @Key(value = "aroundInvoke.invalidArguments", type = KeyType.FAILURE)})
+ @Keys({@Key(value="interceptor.unused",count=2,type=KeyType.WARNING),@Key("aroundInvoke.invalidArguments")})
public EjbJar test1() {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(BarBean.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidMethodPermissionsTest.java Thu Sep 2 01:48:21 2010
@@ -23,8 +23,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidMethodPermissionsTest {
- @Keys( { @Key(value = "methodPermission.ejbNameRequired", type = KeyType.FAILURE),
- @Key(value = "methodPermission.noSuchEjbName", type = KeyType.FAILURE) })
+ @Keys( { @Key("methodPermission.ejbNameRequired"), @Key("methodPermission.noSuchEjbName") })
public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
MethodPermission permission = new MethodPermission(new Method((String) null, (String) null));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidSecurityAnnotationsTest.java Thu Sep 2 01:48:21 2010
@@ -26,8 +26,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidSecurityAnnotationsTest {
- @Keys( { @Key(value = "conflictingSecurityAnnotations", type = KeyType.FAILURE),
- @Key(value = "permitAllAndRolesAllowedOnClass", type = KeyType.FAILURE) })
+ @Keys( { @Key("conflictingSecurityAnnotations"),@Key("permitAllAndRolesAllowedOnClass") })
public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooBean.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidTimeoutTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidTimeoutTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidTimeoutTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckInvalidTimeoutTest.java Thu Sep 2 01:48:21 2010
@@ -27,10 +27,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckInvalidTimeoutTest extends TestCase {
- @Keys( { @Key(value = "timeout.badReturnType", type = KeyType.FAILURE),
- @Key(value = "timeout.invalidArguments", type = KeyType.FAILURE),
- @Key(value = "timeout.tooManyMethods", type = KeyType.FAILURE) ,
- @Key(value = "timeout.missing.possibleTypo", type = KeyType.FAILURE)})
+ @Keys( { @Key(value = "timeout.badReturnType"), @Key("timeout.invalidArguments"), @Key("timeout.tooManyMethods") , @Key("timeout.missing.possibleTypo")})
public EjbJar test() throws Exception {
System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckMissingClassTest.java Thu Sep 2 01:48:21 2010
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckMissingClassTest {
- @Keys(@Key(value = "missing.class", count = 16, type = KeyType.FAILURE))
+ @Keys(@Key(value = "missing.class", count = 16))
public EjbJar wrongClassType() throws OpenEJBException {
System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoBusinessMethodTest.java Thu Sep 2 01:48:21 2010
@@ -35,9 +35,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckNoBusinessMethodTest {
- @Keys( { @Key(value = "no.busines.method.case", count = 4, type = KeyType.FAILURE),
- @Key(value = "no.busines.method.args", count = 4, type = KeyType.FAILURE),
- @Key(value = "no.busines.method", count = 4, type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "no.busines.method.case", count = 4), @Key(value = "no.busines.method.args", count = 4), @Key(value = "no.busines.method", count = 4) })
public EjbJar noBusinessMethod() throws OpenEJBException {
// System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckNoCreateMethodsTest.java Thu Sep 2 01:48:21 2010
@@ -40,11 +40,8 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckNoCreateMethodsTest {
- @Keys( { @Key(value = "no.home.create", count = 4, type = KeyType.FAILURE),
- @Key(value = "unused.ejb.create", count = 2, type = KeyType.WARNING),
- @Key(value = "unused.ejbPostCreate", type = KeyType.WARNING),
- @Key(value = "entity.no.ejb.create", type = KeyType.FAILURE),
- @Key(value="session.no.ejb.create",count=2, type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "no.home.create", count = 4), @Key(value = "unused.ejb.create", count = 2, type = KeyType.WARNING),
+ @Key(value = "unused.ejbPostCreate", type = KeyType.WARNING),@Key("entity.no.ejb.create"),@Key(value="session.no.ejb.create",count=2) })
public EjbJar noCreateMethod() throws OpenEJBException {
System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceContextUsageTest.java Thu Sep 2 01:48:21 2010
@@ -32,19 +32,16 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckPersistenceContextUsageTest {
- @Keys( { @Key(value = "persistenceContextExtented.nonStateful", type = KeyType.FAILURE),
- @Key(value = "persistenceContextRef.noPersistenceUnits", count = 3, type = KeyType.FAILURE),
- @Key(value = "persistenceContextAnnotation.onClassWithNoName", type = KeyType.FAILURE),
- @Key(value = "persistenceContextAnnotation.onEntityManagerFactory", type = KeyType.FAILURE),
- @Key(value = "persistenceContextAnnotation.onNonEntityManager", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "persistenceContextExtented.nonStateful"), @Key(value = "persistenceContextRef.noPersistenceUnits", count = 3),
+ @Key(value = "persistenceContextAnnotation.onClassWithNoName"), @Key(value = "persistenceContextAnnotation.onEntityManagerFactory"),
+ @Key(value = "persistenceContextAnnotation.onNonEntityManager") })
public EjbJar wrongUsage() throws OpenEJBException {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
return ejbJar;
}
- @Keys( { @Key(value = "persistenceContextRef.noUnitName", type = KeyType.FAILURE),
- @Key(value = "persistenceContextRef.noMatches", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "persistenceContextRef.noUnitName"),@Key(value = "persistenceContextRef.noMatches") })
public AppModule noUnitName() {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessOne.class));
@@ -60,7 +57,7 @@ public class CheckPersistenceContextUsag
return appModule;
}
- @Keys( { @Key(value = "persistenceContextRef.vagueMatches", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "persistenceContextRef.vagueMatches") })
public AppModule vagueMatches() {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessTwo.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java Thu Sep 2 01:48:21 2010
@@ -30,18 +30,15 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckPersistenceUnitUsageTest {
- @Keys( { @Key(value = "persistenceUnitRef.noPersistenceUnits", count = 3, type = KeyType.FAILURE),
- @Key(value ="persistenceUnitAnnotation.onClassWithNoName", type = KeyType.FAILURE),
- @Key(value = "persistenceUnitAnnotation.onEntityManager", type = KeyType.FAILURE),
- @Key(value = "persistenceUnitAnnotation.onNonEntityManagerFactory", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "persistenceUnitRef.noPersistenceUnits", count = 3), @Key("persistenceUnitAnnotation.onClassWithNoName"),
+ @Key("persistenceUnitAnnotation.onEntityManager"), @Key("persistenceUnitAnnotation.onNonEntityManagerFactory") })
public EjbJar wrongUsage() throws OpenEJBException {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
return ejbJar;
}
- @Keys( { @Key(value = "persistenceUnitRef.noMatches", type = KeyType.FAILURE),
- @Key(value = "persistenceUnitRef.noUnitName", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "persistenceUnitRef.noMatches"), @Key(value = "persistenceUnitRef.noUnitName") })
public AppModule noUnitName() {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessOne.class));
@@ -57,7 +54,7 @@ public class CheckPersistenceUnitUsageTe
return appModule;
}
- @Keys( { @Key(value = "persistenceUnitRef.vagueMatches", type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "persistenceUnitRef.vagueMatches") })
public AppModule vagueMatches() {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStatelessTwo.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckUserTransactionRefsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckUserTransactionRefsTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckUserTransactionRefsTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckUserTransactionRefsTest.java Thu Sep 2 01:48:21 2010
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckUserTransactionRefsTest {
- @Keys(@Key(value = "userTransactionRef.forbiddenForCmtdBeans", type = KeyType.FAILURE))
+ @Keys(@Key("userTransactionRef.forbiddenForCmtdBeans"))
public EjbJar testSLSBwithUserTransaction() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(TestBean.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckWrongClassTypeTest.java Thu Sep 2 01:48:21 2010
@@ -24,8 +24,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class CheckWrongClassTypeTest {
- @Keys( { @Key(value = "wrong.class.type", type = KeyType.FAILURE),
- @Key(value = "noInterfaceDeclared.entity", type = KeyType.FAILURE) })
+ @Keys( { @Key("wrong.class.type"), @Key("noInterfaceDeclared.entity") })
public EjbJar wrongClassType() throws OpenEJBException {
System.setProperty("openejb.validation.output.level", "VERBOSE");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java Thu Sep 2 01:48:21 2010
@@ -37,8 +37,7 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class InvalidEjbRefTest extends TestCase {
// @Keys({@Key("ann.ejb.ejbObject"),@Key("ann.ejb.ejbLocalObject"),@Key("ann.ejb.beanClass"),@Key("ann.ejb.notInterface")})
- @Keys({@Key(value = "ann.ejb.ejbObject", type = KeyType.FAILURE),
- @Key(value = "ann.ejb.ejbLocalObject", type = KeyType.FAILURE)})
+ @Keys({@Key("ann.ejb.ejbObject"),@Key("ann.ejb.ejbLocalObject")})
public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
@@ -60,8 +59,7 @@ public class InvalidEjbRefTest extends T
return ejbJar;
}
- @Keys( { @Key(value = "ejbAnnotation.onClassWithNoBeanInterface", type = KeyType.FAILURE),
- @Key(value = "ejbAnnotation.onClassWithNoName", type = KeyType.FAILURE) })
+ @Keys( { @Key("ejbAnnotation.onClassWithNoBeanInterface"), @Key("ejbAnnotation.onClassWithNoName") })
public EjbJar test1() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(MyBean.class));
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java Thu Sep 2 01:48:21 2010
@@ -49,99 +49,59 @@ public class InvalidInterfacesTest {
return ejbJar;
}
- @Keys( { @Key(value = "xml.remote.businessLocal", type = KeyType.FAILURE),
- @Key(value = "xml.home.businessLocal", type = KeyType.FAILURE),
- @Key(value = "xml.local.businessLocal", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.businessLocal", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.businessLocal"), @Key("xml.home.businessLocal"), @Key("xml.local.businessLocal"), @Key("xml.localHome.businessLocal") })
public EjbJar testBusinessLocal() throws Exception {
return validate(FooLocal.class);
}
- @Keys( { @Key(value = "xml.remote.businessRemote", type = KeyType.FAILURE),
- @Key(value = "xml.home.businessRemote", type = KeyType.FAILURE),
- @Key(value = "xml.local.businessRemote", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.businessRemote", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.businessRemote"), @Key("xml.home.businessRemote"), @Key("xml.local.businessRemote"), @Key("xml.localHome.businessRemote") })
public EjbJar testBusinessRemote() throws Exception {
return validate(FooRemote.class);
}
- @Keys( { @Key(value = "xml.home.ejbObject", type = KeyType.FAILURE),
- @Key(value = "xml.local.ejbObject", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.ejbObject", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.ejbObject", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.ejbObject", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.home.ejbObject"), @Key("xml.local.ejbObject"), @Key("xml.localHome.ejbObject"), @Key("xml.businessLocal.ejbObject"), @Key("xml.businessRemote.ejbObject") })
public EjbJar testEJBObject() throws Exception {
return validate(FooEJBObject.class);
}
- @Keys( { @Key(value = "xml.remote.ejbHome", type = KeyType.FAILURE),
- @Key(value = "xml.local.ejbHome", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.ejbHome", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.ejbHome", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.ejbHome", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.ejbHome"), @Key("xml.local.ejbHome"), @Key("xml.localHome.ejbHome"), @Key("xml.businessLocal.ejbHome"), @Key("xml.businessRemote.ejbHome") })
public EjbJar testEJBHome() throws Exception {
return validate(FooEJBHome.class);
}
- @Keys( { @Key(value = "xml.remote.ejbLocalHome", type = KeyType.FAILURE),
- @Key(value = "xml.home.ejbLocalHome", type = KeyType.FAILURE),
- @Key(value = "xml.local.ejbLocalHome", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.ejbLocalHome", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.ejbLocalHome", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.ejbLocalHome"), @Key("xml.home.ejbLocalHome"), @Key("xml.local.ejbLocalHome"), @Key("xml.businessLocal.ejbLocalHome"),
+ @Key("xml.businessRemote.ejbLocalHome") })
public EjbJar testEJBLocalHome() throws Exception {
return validate(FooEJBLocalHome.class);
}
- @Keys( { @Key(value = "xml.remote.ejbLocalObject", type = KeyType.FAILURE),
- @Key(value = "xml.home.ejbLocalObject", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.ejbLocalObject", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.ejbLocalObject", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.ejbLocalObject", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.ejbLocalObject"), @Key("xml.home.ejbLocalObject"), @Key("xml.localHome.ejbLocalObject"), @Key("xml.businessLocal.ejbLocalObject"),
+ @Key("xml.businessRemote.ejbLocalObject") })
public EjbJar testEJBLocalObject() throws Exception {
return validate(FooEJBLocalObject.class);
}
- @Keys( { @Key(value = "xml.remote.unknown", type = KeyType.FAILURE),
- @Key(value = "xml.home.unknown", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.unknown", type = KeyType.FAILURE),
- @Key(value = "xml.local.unknown", type = KeyType.FAILURE),
- @Key(value = "xml.localRemote.conflict", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.unknown"), @Key("xml.home.unknown"), @Key("xml.localHome.unknown"), @Key("xml.local.unknown"), @Key("xml.localRemote.conflict") })
public EjbJar testUnkown() throws Exception {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
return validate(FooUnknown.class);
}
- @Keys( { @Key(value = "xml.remote.beanClass", type = KeyType.FAILURE),
- @Key(value = "xml.home.beanClass", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.beanClass", type = KeyType.FAILURE),
- @Key(value = "xml.local.beanClass", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.beanClass", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.beanClass", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.beanClass"), @Key("xml.home.beanClass"), @Key("xml.localHome.beanClass"), @Key("xml.local.beanClass"), @Key("xml.businessRemote.beanClass"),
+ @Key("xml.businessLocal.beanClass") })
public EjbJar testBeanClass() throws Exception {
return validate(FooBean.class);
}
- @Keys( { @Key(value = "xml.remote.notInterface", type = KeyType.FAILURE),
- @Key(value = "xml.home.notInterface", type = KeyType.FAILURE),
- @Key(value = "xml.localHome.notInterface", type = KeyType.FAILURE),
- @Key(value = "xml.local.notInterface", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.notInterface", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.notInterface", type = KeyType.FAILURE) })
+ @Keys( { @Key("xml.remote.notInterface"), @Key("xml.home.notInterface"), @Key("xml.localHome.notInterface"), @Key("xml.local.notInterface"),
+ @Key("xml.businessRemote.notInterface"), @Key("xml.businessLocal.notInterface") })
public EjbJar testNotInterface() throws Exception {
return validate(FooClass.class);
}
- @Keys( { @Key(value = "ann.notAnInterface", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.notInterface", type = KeyType.FAILURE),
- @Key(value = "ann.localRemote.conflict", type = KeyType.FAILURE),
- @Key(value = "ann.remoteOrLocal.ejbHome", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.ejbHome", type = KeyType.FAILURE),
- @Key(value = "ann.remoteOrLocal.ejbObject", type = KeyType.FAILURE),
- @Key(value = "xml.businessRemote.ejbObject", type = KeyType.FAILURE),
- @Key(value = "ann.remoteOrLocal.ejbLocalHome", type = KeyType.FAILURE),
- @Key(value = "ann.remoteOrLocal.ejbLocalObject", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.ejbLocalHome", type = KeyType.FAILURE),
- @Key(value = "xml.businessLocal.ejbLocalObject", type = KeyType.FAILURE) })
+ @Keys( { @Key("ann.notAnInterface"), @Key("xml.businessLocal.notInterface"), @Key("ann.localRemote.conflict"), @Key("ann.remoteOrLocal.ejbHome"),
+ @Key("xml.businessRemote.ejbHome"), @Key("ann.remoteOrLocal.ejbObject"), @Key("xml.businessRemote.ejbObject"), @Key(value = "ann.remoteOrLocal.ejbLocalHome"),
+ @Key(value = "ann.remoteOrLocal.ejbLocalObject"), @Key("xml.businessLocal.ejbLocalHome"), @Key("xml.businessLocal.ejbLocalObject") })
public EjbJar test() throws OpenEJBException {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
@@ -150,9 +110,7 @@ public class InvalidInterfacesTest {
StatelessBean mybean1 = ejbJar.addEnterpriseBean(new StatelessBean("MyBean1", MyBean.class));
return ejbJar;
}
- @Keys({@Key(value="interface.beanOnlyAnnotation",type=KeyType.WARNING),
- @Key(value="interfaceMethod.beanOnlyAnnotation",type=KeyType.WARNING),
- @Key(value="aroundInvoke.invalidArguments", type = KeyType.FAILURE)})
+ @Keys({@Key(value="interface.beanOnlyAnnotation",type=KeyType.WARNING),@Key(value="interfaceMethod.beanOnlyAnnotation",type=KeyType.WARNING),@Key("aroundInvoke.invalidArguments")})
public EjbJar test1(){
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
@@ -160,7 +118,7 @@ public class InvalidInterfacesTest {
return ejbJar;
}
- @Keys({@Key(value="ann.remoteOrLocal.converse.parent",count=2, type = KeyType.FAILURE)})
+ @Keys({@Key(value="ann.remoteOrLocal.converse.parent",count=2)})
public EjbJar test2(){
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java Thu Sep 2 01:48:21 2010
@@ -66,7 +66,7 @@ public class InvokeMethod extends Statem
@Override
public void evaluate() throws Throwable {
- Map<KeyType, List<String>> expectedKeys = validateKeys();
+ Map<Integer, List<String>> expectedKeys = validateKeys();
setUp();
Object obj = testMethod.invokeExplosively(target);
try {
@@ -122,7 +122,7 @@ public class InvokeMethod extends Statem
* @return
* @throws Exception
*/
- private Map<KeyType, List<String>> validateKeys() throws Exception {
+ private Map<Integer, List<String>> validateKeys() throws Exception {
Keys annotation = testMethod.getAnnotation(Keys.class);
Key[] keys = annotation.value();
ArrayList<String> wrongKeys = new ArrayList<String>();
@@ -134,20 +134,20 @@ public class InvokeMethod extends Statem
}
}
if (wrongKeys.isEmpty()) {
- Map<KeyType, List<String>> validKeys = new HashMap<KeyType, List<String>>();
+ Map<Integer, List<String>> validKeys = new HashMap<Integer, List<String>>();
ArrayList<String> failureKeys = new ArrayList<String>();
ArrayList<String> warningKeys = new ArrayList<String>();
ArrayList<String> errorKeys = new ArrayList<String>();
for (Key key : keys) {
for (int i = 0; i < key.count(); i++) {
switch (key.type()) {
- case FAILURE:
+ case KeyType.FAILURE:
failureKeys.add(key.value());
break;
- case WARNING:
+ case KeyType.WARNING:
warningKeys.add(key.value());
break;
- case ERROR:
+ case KeyType.ERROR:
errorKeys.add(key.value());
break;
}
@@ -165,10 +165,10 @@ public class InvokeMethod extends Statem
}
}
- private boolean isEmpty(Map<KeyType, List<String>> expectedKeys) {
+ private boolean isEmpty(Map<Integer, List<String>> expectedKeys) {
boolean empty = true;
- Set<Entry<KeyType, List<String>>> entrySet = expectedKeys.entrySet();
- for (Entry<KeyType, List<String>> entry : entrySet) {
+ Set<Entry<Integer, List<String>>> entrySet = expectedKeys.entrySet();
+ for (Entry<Integer, List<String>> entry : entrySet) {
empty = entry.getValue().size() == 0;
if (!empty)
return empty;
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/Key.java Thu Sep 2 01:48:21 2010
@@ -27,5 +27,5 @@ public @interface Key {
String value();
int count() default 1;
- KeyType type();
+ int type() default KeyType.FAILURE;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeyType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeyType.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeyType.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeyType.java Thu Sep 2 01:48:21 2010
@@ -1,5 +1,7 @@
package org.apache.openejb.config.rules;
-public enum KeyType {
- FAILURE,WARNING,ERROR
+public interface KeyType {
+ int FAILURE=0;
+ int WARNING=1;
+ int ERROR=2;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java?rev=991791&r1=991790&r2=991791&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/MistakenResourceRefUsageTest.java Thu Sep 2 01:48:21 2010
@@ -28,10 +28,8 @@ import org.junit.runner.RunWith;
@RunWith(ValidationRunner.class)
public class MistakenResourceRefUsageTest {
- @Keys( { @Key(value = "resourceRef.onEntityManagerFactory", count = 2, type = KeyType.FAILURE),
- @Key(value = "resourceRef.onEntityManager", count = 2, type = KeyType.FAILURE),
- @Key(value = "resourceAnnotation.onClassWithNoName", count = 2, type = KeyType.FAILURE),
- @Key(value = "resourceAnnotation.onClassWithNoType", count = 2, type = KeyType.FAILURE) })
+ @Keys( { @Key(value = "resourceRef.onEntityManagerFactory", count = 2), @Key(value = "resourceRef.onEntityManager", count = 2),
+ @Key(value = "resourceAnnotation.onClassWithNoName", count = 2), @Key(value = "resourceAnnotation.onClassWithNoType", count = 2) })
public EjbJar wrongUsage() throws OpenEJBException {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));