Author: kmalhi
Date: Thu Jul 15 14:01:46 2010
New Revision: 964437
URL: http://svn.apache.org/viewvc?rev=964437&view=rev
Log:
Converted existing tests to new Validation Framework
Modified:
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
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=964437&r1=964436&r2=964437&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 Jul 15 14:01:46 2010
@@ -17,91 +17,44 @@
package org.apache.openejb.config.rules;
-import static
org.apache.openejb.config.rules.ValidationAssertions.assertFailures;
-import static
org.apache.openejb.config.rules.ValidationAssertions.assertWarnings;
-
-import java.util.ArrayList;
-import java.util.List;
-
import javax.interceptor.AroundTimeout;
import javax.interceptor.InvocationContext;
import junit.framework.TestCase;
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
-import org.apache.openejb.assembler.classic.SecurityServiceInfo;
-import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.config.ValidationFailedException;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.Interceptor;
import org.apache.openejb.jee.StatefulBean;
import org.apache.openejb.jee.StatelessBean;
-import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* @version $Rev$ $Date$
*/
+...@runwith(ValidationRunner.class)
public class CheckInvalidAroundTimeoutTest extends TestCase {
- @Test
- public void testInvalidAroundTimeoutParameter() throws Exception {
- Assembler assembler = new Assembler();
- ConfigurationFactory config = new ConfigurationFactory();
+ @Keys(@Key(value="aroundInvoke.invalidArguments",count=2))
+ public EjbJar testInvalidAroundTimeoutParameter() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new
StatelessBean("TestInvalidAroundTimeoutParameterBean",
TestInvalidAroundTimeoutParameterBean.class));
ejbJar.addInterceptor(new
Interceptor(TestInvalidAroundTimeoutParameterInterceptor.class));
-
- List<String> expectedFailureKeys = new ArrayList<String>();
- expectedFailureKeys.add("aroundInvoke.invalidArguments");
- expectedFailureKeys.add("aroundInvoke.invalidArguments");
- try {
- config.configureApplication(ejbJar);
- } catch (ValidationFailedException e) {
- assertFailures(expectedFailureKeys, e);
- }
+ return ejbJar;
}
- @Test
- public void testInvalidAroundTimeoutReturnValue() throws Exception {
- Assembler assembler = new Assembler();
- ConfigurationFactory config = new ConfigurationFactory();
+
@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));
ejbJar.addInterceptor(new
Interceptor(TestInvalidAroundTimeoutReturnValueInterceptor.class));
-
- List<String> expectedFailureKeys = new ArrayList<String>();
- //For Bean Class
- expectedFailureKeys.add("aroundInvoke.badReturnType");
- expectedFailureKeys.add("aroundInvoke.mustThrowException");
- //For Interceptor
- expectedFailureKeys.add("aroundInvoke.badReturnType");
- expectedFailureKeys.add("aroundInvoke.mustThrowException");
- try {
- config.configureApplication(ejbJar);
- } catch (ValidationFailedException e) {
- assertFailures(expectedFailureKeys, e);
- }
+ return ejbJar;
}
- @Test
- public void testIgnoredAroundTimeout() throws Exception {
- ConfigurationFactory config = new ConfigurationFactory();
- Assembler assembler = new Assembler();
-
assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
-
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
-
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+ @Keys(@Key(value="ignoredAnnotation",type=KeyType.WARNING))
+ public EjbJar testIgnoredAroundTimeout() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatefulBean("TestAroundTimeout",
TestAroundTimeout.class));
- List<String> expectedWarningKeys = new ArrayList<String>();
- expectedWarningKeys.add("ignoredAnnotation");
- try {
- config.configureApplication(ejbJar);
- } catch (ValidationFailedException e) {
- assertWarnings(expectedWarningKeys, e);
-
- }
+ return ejbJar;
}
public static class TestInvalidAroundTimeoutParameterBean {
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=964437&r1=964436&r2=964437&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 Jul 15 14:01:46 2010
@@ -16,11 +16,6 @@
*/
package org.apache.openejb.config.rules;
-import static
org.apache.openejb.config.rules.ValidationAssertions.assertWarnings;
-import static
org.apache.openejb.config.rules.ValidationAssertions.assertFailures;
-
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.Callable;
import javax.annotation.PostConstruct;
@@ -34,54 +29,23 @@ import javax.interceptor.AroundInvoke;
import junit.framework.TestCase;
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.config.ValidationFailedException;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.StatelessBean;
-import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* @version $Rev$ $Date$
*/
+...@runwith(ValidationRunner.class)
public class CheckInvalidCallbacksTest extends TestCase {
- @Test
- public void test() throws Exception {
- Assembler assemler = new Assembler();
- ConfigurationFactory config = new ConfigurationFactory();
-
+
@Keys({...@key(value="ignoredAnnotation",count=10,type=KeyType.WARNING),@Key(value="aroundInvoke.invalidArguments",count=2,type=KeyType.FAILURE)})
+ public EjbJar test() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean("TestStateless",
TestBean.class));
ejbJar.addEnterpriseBean(new SingletonBean("TestSingleton",
TestBean.class));
-
- List<String> expectedWarningKeys = new ArrayList<String>();
- //For StatelessBean
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- //For SingletionBean
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
- expectedWarningKeys.add("ignoredAnnotation");
-
- List<String> expectedFailureKeys = new ArrayList<String>();
- //For StatelessBean
- expectedFailureKeys.add("aroundInvoke.invalidArguments");
- //For SingletionBean
- expectedFailureKeys.add("aroundInvoke.invalidArguments");
-
- try {
- config.configureApplication(ejbJar);
- } catch (ValidationFailedException e) {
- assertWarnings(expectedWarningKeys, e);
- assertFailures(expectedFailureKeys,e);
- }
+ return ejbJar;
}
public static class TestBean implements Callable {
