You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/10/04 23:56:59 UTC
svn commit: r1178974 [1/4] - in
/openejb/trunk/arquillian-tomee/arquillian-tomee-tests: ./
src/test/java/org/apache/openejb/arquillian/tests/
src/test/java/org/apache/openejb/arquillian/tests/cdiinject/
src/test/java/org/apache/openejb/arquillian/tests...
Author: jgallimore
Date: Tue Oct 4 21:56:55 2011
New Revision: 1178974
URL: http://svn.apache.org/viewvc?rev=1178974&view=rev
Log:
OPENEJB-1687 lots of test refactoring.
Current results:
Embedded: Tests run: 82, Failures: 6, Errors: 2, Skipped: 0
Remote: Tests run: 82, Failures: 8, Errors: 5, Skipped: 0
Added:
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestRun.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/Car.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/PojoServlet.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/ServletCdiInjectionTest.java
- copied, changed from r1178525, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletCdiInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/Code.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/Car.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/PojoServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java
- copied, changed from r1178525, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterCdiInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Car.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Code.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Company.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/CompanyLocal.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/SuperMarket.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/Company.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/CompanyLocal.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/PojoServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbLocalInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/SuperMarket.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/Address.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/PersistenceServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterPersistenceInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/CompanyRemote.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/RemoteServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbRemoteInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Car.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Code.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Company.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/CompanyLocal.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ContextAttributeName.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletToCheckListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/SuperMarket.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Car.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Code.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Company.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/CompanyLocal.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ContextAttributeName.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbLocalInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletToCheckListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/SuperMarket.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/Address.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ContextAttributeName.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletContextListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletSessionListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerPersistenceInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletToCheckListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/CompanyRemote.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ContextAttributeName.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/RemoteServletContextListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/RemoteServletSessionListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbRemoteTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletToCheckListener.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/Company.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/CompanyLocal.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/OtherCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/PojoServlet.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEjbLocalInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/SuperMarket.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/modulename/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/modulename/Environment.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/modulename/Green.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/modulename/ModuleNameInjectionTest.java
- copied, changed from r1178525, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ModuleNameInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/modulename/Orange.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/modulename/PojoServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/Address.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/PersistenceServlet.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletPersistenceInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/CompanyRemote.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/DefaultCompany.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/RemoteServlet.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEjbRemoteTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Blue.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Green.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Orange.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Purple.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/Red.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/resenventry/ServletResourceEnvEntryInjectionTest.java
- copied, changed from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletResourceEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/Environment.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/Green.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/Orange.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/PojoServletFilter.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/SharedEnvironmentTest.java
- copied, changed from r1178525, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/SharedEnvironmentTest.java
Removed:
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ModuleNameInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletCdiInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEjbLocalInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEjbRemoteTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterCdiInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbLocalInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbRemoteInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterPersistenceInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbLocalInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbRemoteTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerPersistenceInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletPersistenceInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletResourceEnvEntryInjectionTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/SharedEnvironmentTest.java
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/pom.xml
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/resources/persistence.xml
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/pom.xml?rev=1178974&r1=1178973&r2=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/pom.xml Tue Oct 4 21:56:55 2011
@@ -1,23 +1,16 @@
<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>arquillian-tomee</artifactId>
@@ -76,7 +69,7 @@
<version>${version.cdi-api}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
@@ -92,39 +85,70 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>copy-test-libs</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>
+ ${project.build.directory}/test-libs
+ </outputDirectory>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
- <profile>
- <id>arquillian-tomee-embedded</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>arquillian-tomee-embedded</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>arquillian-tomee-remote</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </profile>
+ <profile>
+ <id>arquillian-tomee-embedded</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-embedded</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arquillian-tomee-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestRun.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestRun.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestRun.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestRun.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,40 @@
+package org.apache.openejb.arquillian.tests;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class TestRun {
+
+ public static void run(ServletRequest req, ServletResponse resp, Object obj) throws IOException {
+ final Class<?> clazz = obj.getClass();
+ final Method[] methods = clazz.getMethods();
+
+ resp.setContentType("text/plain");
+ final PrintWriter writer = resp.getWriter();
+
+ for (Method method : methods) {
+ if (method.getName().startsWith("test")) {
+
+ writer.print(method.getName());
+
+ writer.print("=");
+
+ try {
+ method.invoke(obj);
+ writer.println("true");
+ } catch (Throwable e) {
+ writer.println("false");
+ writer.println("");
+ writer.println("STACKTRACE");
+ writer.println("");
+ e.printStackTrace(writer);
+ }
+ }
+ }
+ }
+
+}
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java?rev=1178974&r1=1178973&r2=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java Tue Oct 4 21:56:55 2011
@@ -28,6 +28,7 @@ import org.junit.Assert;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -56,7 +57,9 @@ public abstract class TestSetup {
WebArchive archive = ShrinkWrap.create(WebArchive.class, getTestContextName() + ".war")
.setWebXML(new StringAsset(descriptor.exportAsString()))
+ .addAsLibraries(new File("target/test-libs/junit.jar"))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
+
if (archiveClasses != null) {
for (Class c: archiveClasses) {
archive.addClass(c);
@@ -101,32 +104,4 @@ public abstract class TestSetup {
assertTrue("Output should contain: " + expectedOutput + "\n" + output, output.contains(expectedOutput));
}
- public static void run(ServletRequest req, ServletResponse resp, Object obj) throws IOException {
- final Class<?> clazz = obj.getClass();
- final Method[] methods = clazz.getMethods();
-
- resp.setContentType("text/plain");
- final PrintWriter writer = resp.getWriter();
-
- for (Method method : methods) {
- if (method.getName().startsWith("test")) {
-
- writer.print(method.getName());
-
- writer.print("=");
-
- try {
- method.invoke(obj);
- writer.println("true");
- } catch (Throwable e) {
- writer.println("false");
- writer.println("");
- writer.println("STACKTRACE");
- writer.println("");
- e.printStackTrace(writer);
- }
- }
- }
- }
-
}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/Car.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/Car.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/Car.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/Car.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,10 @@
+package org.apache.openejb.arquillian.tests.cdiinject;
+
+public class Car {
+ private final String make = "Lexus", model = "IS 350";
+ private final int year = 2011;
+
+ public String drive(String name) {
+ return name + " is on the wheel of a " + year + " " + make + " " + model;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/PojoServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/PojoServlet.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/PojoServlet.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/PojoServlet.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,44 @@
+package org.apache.openejb.arquillian.tests.cdiinject;
+
+import java.io.IOException;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServlet extends HttpServlet {
+
+ @Resource
+ private BeanManager beanManager;
+
+ @Inject
+ private Car car;
+
+ @PostConstruct
+ public void construct() {
+ System.out.println("construct");
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ String name = req.getParameter("name");
+ if (StringUtils.isEmpty(name)) {
+ name = "OpenEJB";
+ }
+
+ if (car != null) {
+ resp.getOutputStream().println(car.drive(name));
+ }
+
+ if (beanManager != null) {
+ resp.getOutputStream().println("beanManager");
+ }
+ }
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/ServletCdiInjectionTest.java (from r1178525, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletCdiInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/ServletCdiInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/ServletCdiInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletCdiInjectionTest.java&r1=1178525&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletCdiInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdiinject/ServletCdiInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.cdiinject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.openejb.arquillian.tests.TestRun;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -31,18 +31,10 @@ import org.jboss.shrinkwrap.descriptor.s
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.ejb.Local;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -78,7 +70,8 @@ public class ServletCdiInjectionTest {
.servlet(PojoServlet.class, "/" + TEST_NAME);
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
- .addClass(PojoServlet.class)
+ .addClass(TestRun.class)
+ .addClass(PojoServlet.class)
.addClass(Car.class)
.setWebXML(new StringAsset(descriptor.exportAsString()))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
@@ -88,47 +81,8 @@ public class ServletCdiInjectionTest {
return archive;
}
- public static class PojoServlet extends HttpServlet {
-
- @Resource
- private BeanManager beanManager;
-
- @Inject
- private Car car;
-
- @PostConstruct
- public void construct() {
- System.out.println("construct");
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String name = req.getParameter("name");
- if (StringUtils.isEmpty(name)) {
- name = "OpenEJB";
- }
-
- if (car != null) {
- resp.getOutputStream().println(car.drive(name));
- }
-
- if (beanManager != null) {
- resp.getOutputStream().println("beanManager");
- }
- }
- }
-
- public static class Car {
- private final String make = "Lexus", model = "IS 350";
- private final int year = 2011;
-
- public String drive(String name) {
- return name + " is on the wheel of a " + year + " " + make + " " + model;
- }
- }
-
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:8080/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead = -1;
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/Code.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/Code.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/Code.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/Code.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,6 @@
+package org.apache.openejb.arquillian.tests.enventry;
+
+public enum Code {
+ OK,
+ ERROR;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,85 @@
+package org.apache.openejb.arquillian.tests.enventry;
+
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServlet extends HttpServlet {
+
+ @Resource(name = "returnEmail")
+ private String returnEmail;
+
+ @Resource(name = "connectionPool")
+ private Integer connectionPool;
+
+ @Resource(name = "startCount")
+ private Long startCount;
+
+ @Resource(name = "initSize")
+ private Short initSize;
+
+ @Resource(name = "totalQuantity")
+ private Byte totalQuantity;
+
+ @Resource(name = "enableEmail")
+ private Boolean enableEmail;
+
+ @Resource(name = "optionDefault")
+ private Character optionDefault;
+
+ @Resource(name = "defaultCode")
+ private Code defaultCode;
+
+ @Resource(name = "auditWriter")
+ @SuppressWarnings("unchecked")
+ private Class auditWriter;
+
+ @Resource(name = "name")
+ private String name;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ String name = req.getParameter("name");
+ if (StringUtils.isEmpty(name)) {
+ name = "OpenEJB";
+ }
+
+ if (connectionPool != null) {
+ resp.getOutputStream().println("Connection Pool: " + connectionPool);
+ }
+ if (startCount != null) {
+ resp.getOutputStream().println("Start Count: " + startCount);
+ }
+ if (initSize != null) {
+ resp.getOutputStream().println("Init Size: " + initSize);
+ }
+ if (totalQuantity != null) {
+ resp.getOutputStream().println("Total Quantity: " + totalQuantity);
+ }
+ if (enableEmail != null) {
+ resp.getOutputStream().println("Enable Email: " + enableEmail);
+ }
+ if (optionDefault != null) {
+ resp.getOutputStream().println("Option Default: " + optionDefault);
+ }
+ if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
+ resp.getOutputStream().println(returnEmail);
+ }
+ if (auditWriter != null) {
+ resp.getOutputStream().println(auditWriter.getName());
+ }
+ if (defaultCode != null) {
+ resp.getOutputStream().println("DefaultCode: " + defaultCode);
+ }
+
+ if (this.name != null) {
+ resp.getOutputStream().println("Name: " + this.name);
+ }
+ }
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEnvEntryInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEnvEntryInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletEnvEntryInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.enventry;
-import org.apache.commons.lang.StringUtils;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -31,16 +30,11 @@ import org.jboss.shrinkwrap.descriptor.s
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.ejb.Local;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -145,6 +139,7 @@ public class ServletEnvEntryInjectionTes
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(PojoServlet.class)
+ .addClass(Code.class)
.setWebXML(new StringAsset(descriptor.exportAsString()));
System.err.println(descriptor.exportAsString());
@@ -152,85 +147,6 @@ public class ServletEnvEntryInjectionTes
return archive;
}
- public static enum Code {
- OK,
- ERROR;
- }
-
- public static class PojoServlet extends HttpServlet {
-
- @Resource(name = "returnEmail")
- private String returnEmail;
-
- @Resource(name = "connectionPool")
- private Integer connectionPool;
-
- @Resource(name = "startCount")
- private Long startCount;
-
- @Resource(name = "initSize")
- private Short initSize;
-
- @Resource(name = "totalQuantity")
- private Byte totalQuantity;
-
- @Resource(name = "enableEmail")
- private Boolean enableEmail;
-
- @Resource(name = "optionDefault")
- private Character optionDefault;
-
- @Resource(name = "defaultCode")
- private Code defaultCode;
-
- @Resource(name = "auditWriter")
- @SuppressWarnings("unchecked")
- private Class auditWriter;
-
- @Resource(name = "name")
- private String name;
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String name = req.getParameter("name");
- if (StringUtils.isEmpty(name)) {
- name = "OpenEJB";
- }
-
- if (connectionPool != null) {
- resp.getOutputStream().println("Connection Pool: " + connectionPool);
- }
- if (startCount != null) {
- resp.getOutputStream().println("Start Count: " + startCount);
- }
- if (initSize != null) {
- resp.getOutputStream().println("Init Size: " + initSize);
- }
- if (totalQuantity != null) {
- resp.getOutputStream().println("Total Quantity: " + totalQuantity);
- }
- if (enableEmail != null) {
- resp.getOutputStream().println("Enable Email: " + enableEmail);
- }
- if (optionDefault != null) {
- resp.getOutputStream().println("Option Default: " + optionDefault);
- }
- if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
- resp.getOutputStream().println(returnEmail);
- }
- if (auditWriter != null) {
- resp.getOutputStream().println(auditWriter.getName());
- }
- if (defaultCode != null) {
- resp.getOutputStream().println("DefaultCode: " + defaultCode);
- }
-
- if (this.name != null) {
- resp.getOutputStream().println("Name: " + this.name);
- }
- }
- }
-
private static void addEnvEntry(WebAppDescriptor descriptor, String name, String type, String value) {
Node rootNode = ((NodeProvider) descriptor).getRootNode();
Node appNode = rootNode.get("/web-app").iterator().next();
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/Car.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/Car.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/Car.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/Car.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,10 @@
+package org.apache.openejb.arquillian.tests.filtercdiinject;
+
+public class Car {
+ private final String make = "Lexus", model = "IS 350";
+ private final int year = 2011;
+
+ public String drive(String name) {
+ return name + " is on the wheel of a " + year + " " + make + " " + model;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/PojoServletFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/PojoServletFilter.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/PojoServletFilter.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/PojoServletFilter.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,36 @@
+package org.apache.openejb.arquillian.tests.filtercdiinject;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.junit.Assert;
+
+public class PojoServletFilter implements Filter {
+
+ @Inject
+ private Car car;
+
+ public void init(FilterConfig config) {
+ }
+
+ public void destroy() {
+ }
+
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
+ TestRun.run(req, resp, this);
+ }
+
+ public void testCdi() {
+ Assert.assertNotNull(car);
+ car.drive("test");
+ }
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java (from r1178525, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterCdiInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterCdiInjectionTest.java&r1=1178525&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterCdiInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,19 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.filtercdiinject;
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.apache.openejb.arquillian.tests.TestSetup;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
import javax.servlet.*;
-import java.io.IOException;
@RunWith(Arquillian.class)
public class ServletFilterCdiInjectionTest extends TestSetup {
@@ -41,44 +40,13 @@ public class ServletFilterCdiInjectionTe
@Deployment(testable = false)
public static WebArchive getArchive() {
- return new ServletFilterCdiInjectionTest().createDeployment(PojoServletFilter.class, Car.class);
+ return new ServletFilterCdiInjectionTest().createDeployment(TestRun.class, PojoServletFilter.class, Car.class);
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
descriptor.filter(PojoServletFilter.class, "/" + getTestContextName());
}
- public static class PojoServletFilter implements Filter {
-
- @Inject
- private Car car;
-
- public void init(FilterConfig config) {
- }
-
- public void destroy() {
- }
-
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
- run(req, resp, this);
- }
-
- public void testCdi() {
- Assert.assertNotNull(car);
- car.drive("test");
- }
- }
-
- public static class Car {
- private final String make = "Lexus", model = "IS 350";
- private final int year = 2011;
-
- public String drive(String name) {
- return name + " is on the wheel of a " + year + " " + make + " " + model;
- }
- }
-
}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Car.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Car.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Car.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Car.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,10 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+public class Car {
+ private final String make = "Lexus", model = "IS 350";
+ private final int year = 2011;
+
+ public String drive(String name) {
+ return name + " is on the wheel of a " + year + " " + make + " " + model;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Code.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Code.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Code.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Code.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,6 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+public enum Code {
+ OK,
+ ERROR;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Company.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Company.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Company.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/Company.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,5 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+public interface Company {
+ public String employ(String employeeName);
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/CompanyLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/CompanyLocal.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/CompanyLocal.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/CompanyLocal.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,7 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+import javax.ejb.Local;
+
+@Local
+public interface CompanyLocal extends Company {
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/DefaultCompany.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/DefaultCompany.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/DefaultCompany.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/DefaultCompany.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,14 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class DefaultCompany implements CompanyLocal {
+
+ private final String name = "TomEE Software Inc.";
+
+ public String employ(String employeeName) {
+ return employeeName + " is employed at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,116 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.inject.Inject;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServletFilter implements Filter {
+
+ @Inject
+ private Car car;
+
+ @EJB
+ private CompanyLocal localCompany;
+
+ @EJB
+ private SuperMarket market;
+
+ @Resource(name = "returnEmail")
+ private String returnEmail;
+
+ @Resource(name = "connectionPool")
+ private Integer connectionPool;
+
+ @Resource(name = "startCount")
+ private Long startCount;
+
+ @Resource(name = "initSize")
+ private Short initSize;
+
+ @Resource(name = "totalQuantity")
+ private Byte totalQuantity;
+
+ @Resource(name = "enableEmail")
+ private Boolean enableEmail;
+
+ @Resource(name = "optionDefault")
+ private Character optionDefault;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ */
+ private Code defaultCode;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ @SuppressWarnings("unchecked")
+ */
+ private Class auditWriter;
+
+
+ private FilterConfig config;
+
+ public void init(FilterConfig config) {
+ this.config = config;
+ }
+
+ public void destroy() {
+ }
+
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
+ String name = req.getParameter("name");
+ if (StringUtils.isEmpty(name)) {
+ name = "OpenEJB";
+ }
+
+ if (car != null) {
+ resp.getOutputStream().println(car.drive(name));
+ }
+ if (localCompany != null) {
+ resp.getOutputStream().println("Local: " + localCompany.employ(name));
+ }
+ if (market != null) {
+ resp.getOutputStream().println(market.shop(name));
+ }
+ if (connectionPool != null) {
+ resp.getOutputStream().println("Connection Pool: " + connectionPool);
+ }
+ if (startCount != null) {
+ resp.getOutputStream().println("Start Count: " + startCount);
+ }
+ if (initSize != null) {
+ resp.getOutputStream().println("Init Size: " + initSize);
+ }
+ if (totalQuantity != null) {
+ resp.getOutputStream().println("Total Quantity: " + totalQuantity);
+ }
+ if (enableEmail != null) {
+ resp.getOutputStream().println("Enable Email: " + enableEmail);
+ }
+ if (optionDefault != null) {
+ resp.getOutputStream().println("Option Default: " + optionDefault);
+ }
+ if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
+ resp.getOutputStream().println(returnEmail);
+ }
+ if (auditWriter != null) {
+ resp.getOutputStream().println(auditWriter.getClass().getName());
+ }
+ if (defaultCode != null) {
+ resp.getOutputStream().println("DefaultCode: " + defaultCode);
+ }
+ }
+
+
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEnvEntryInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEnvEntryInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEnvEntryInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.filterenventry;
-import org.apache.commons.lang.StringUtils;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -31,12 +30,6 @@ import org.jboss.shrinkwrap.descriptor.s
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
import javax.servlet.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -137,10 +130,11 @@ public class ServletFilterEnvEntryInject
addEnvEntry(descriptor, "totalQuantity", "java.lang.Byte", "5");
addEnvEntry(descriptor, "optionDefault", "java.lang.Character", "X");
addEnvEntry(descriptor, "auditWriter", "java.lang.Class", "java.lang.String");
- addEnvEntry(descriptor, "defaultCode", "java.lang.Enum", "org.apache.openejb.arquillian.ServletFilterPojoInjectionTest$Code.OK");
+// addEnvEntry(descriptor, "defaultCode", "java.lang.Enum", "Code.OK");
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
- .addClass(PojoServletFilter.class)
+ .addClass(Code.class)
+ .addClass(PojoServletFilter.class)
.addClass(Car.class)
.addClass(CompanyLocal.class)
.addClass(Company.class)
@@ -154,153 +148,6 @@ public class ServletFilterEnvEntryInject
return archive;
}
- public static enum Code {
- OK,
- ERROR;
- }
-
- public static class PojoServletFilter implements Filter {
-
- @Inject
- private Car car;
-
- @EJB
- private CompanyLocal localCompany;
-
- @EJB
- private SuperMarket market;
-
- @Resource(name = "returnEmail")
- private String returnEmail;
-
- @Resource(name = "connectionPool")
- private Integer connectionPool;
-
- @Resource(name = "startCount")
- private Long startCount;
-
- @Resource(name = "initSize")
- private Short initSize;
-
- @Resource(name = "totalQuantity")
- private Byte totalQuantity;
-
- @Resource(name = "enableEmail")
- private Boolean enableEmail;
-
- @Resource(name = "optionDefault")
- private Character optionDefault;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- */
- private Code defaultCode;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- @SuppressWarnings("unchecked")
- */
- private Class auditWriter;
-
-
- private FilterConfig config;
-
- public void init(FilterConfig config) {
- this.config = config;
- }
-
- public void destroy() {
- }
-
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
- String name = req.getParameter("name");
- if (StringUtils.isEmpty(name)) {
- name = "OpenEJB";
- }
-
- if (car != null) {
- resp.getOutputStream().println(car.drive(name));
- }
- if (localCompany != null) {
- resp.getOutputStream().println("Local: " + localCompany.employ(name));
- }
- if (market != null) {
- resp.getOutputStream().println(market.shop(name));
- }
- if (connectionPool != null) {
- resp.getOutputStream().println("Connection Pool: " + connectionPool);
- }
- if (startCount != null) {
- resp.getOutputStream().println("Start Count: " + startCount);
- }
- if (initSize != null) {
- resp.getOutputStream().println("Init Size: " + initSize);
- }
- if (totalQuantity != null) {
- resp.getOutputStream().println("Total Quantity: " + totalQuantity);
- }
- if (enableEmail != null) {
- resp.getOutputStream().println("Enable Email: " + enableEmail);
- }
- if (optionDefault != null) {
- resp.getOutputStream().println("Option Default: " + optionDefault);
- }
- if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
- resp.getOutputStream().println(returnEmail);
- }
- if (auditWriter != null) {
- resp.getOutputStream().println(auditWriter.getClass().getName());
- }
- if (defaultCode != null) {
- resp.getOutputStream().println("DefaultCode: " + defaultCode);
- }
- }
-
-
- }
-
- public static class Car {
- private final String make = "Lexus", model = "IS 350";
- private final int year = 2011;
-
- public String drive(String name) {
- return name + " is on the wheel of a " + year + " " + make + " " + model;
- }
- }
-
-
- public static interface Company {
- public String employ(String employeeName);
- }
-
- @Local
- public static interface CompanyLocal extends Company {
- }
-
- @Stateless
- public static class DefaultCompany implements CompanyLocal {
-
- private final String name = "TomEE Software Inc.";
-
- public String employ(String employeeName) {
- return employeeName + " is employed at " + name;
- }
-
- }
-
- @Stateless
- @LocalBean
- public static class SuperMarket {
-
- private final String name = "Apache Marketplace";
-
- public String shop(String employeeName) {
- return employeeName + " shops at " + name;
- }
-
- }
-
private static void addEnvEntry(WebAppDescriptor descriptor, String name, String type, String value) {
Node rootNode = ((NodeProvider) descriptor).getRootNode();
Node appNode = rootNode.get("/web-app").iterator().next();
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/SuperMarket.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/SuperMarket.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/SuperMarket.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/SuperMarket.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,16 @@
+package org.apache.openejb.arquillian.tests.filterenventry;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+
+@Stateless
+@LocalBean
+public class SuperMarket {
+
+ private final String name = "Apache Marketplace";
+
+ public String shop(String employeeName) {
+ return employeeName + " shops at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/Company.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/Company.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/Company.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/Company.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,5 @@
+package org.apache.openejb.arquillian.tests.filterlocalinject;
+
+public interface Company {
+ public String employ(String employeeName);
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/CompanyLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/CompanyLocal.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/CompanyLocal.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/CompanyLocal.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,7 @@
+package org.apache.openejb.arquillian.tests.filterlocalinject;
+
+import javax.ejb.Local;
+
+@Local
+public interface CompanyLocal extends Company {
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/DefaultCompany.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/DefaultCompany.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/DefaultCompany.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/DefaultCompany.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,14 @@
+package org.apache.openejb.arquillian.tests.filterlocalinject;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class DefaultCompany implements CompanyLocal {
+
+ private final String name = "TomEE Software Inc.";
+
+ public String employ(String employeeName) {
+ return employeeName + " is employed at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/PojoServletFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/PojoServletFilter.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/PojoServletFilter.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/PojoServletFilter.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,46 @@
+package org.apache.openejb.arquillian.tests.filterlocalinject;
+
+import java.io.IOException;
+
+import javax.ejb.EJB;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.junit.Assert;
+
+public class PojoServletFilter implements Filter {
+
+ @EJB
+ private CompanyLocal localCompany;
+
+ @EJB
+ private SuperMarket market;
+
+ public void init(FilterConfig config) {
+ }
+
+ public void destroy() {
+ }
+
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
+ TestRun.run(req, resp, this);
+ }
+
+ public void testLocalBean() {
+ Assert.assertNotNull(market);
+ market.shop("test");
+ }
+
+ public void testLocalEjb() {
+ Assert.assertNotNull(localCompany);
+ localCompany.employ("test");
+ }
+
+
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbLocalInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbLocalInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbLocalInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,22 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.filterlocalinject;
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.apache.openejb.arquillian.tests.TestSetup;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
import javax.servlet.*;
-import java.io.IOException;
@RunWith(Arquillian.class)
public class ServletFilterEjbLocalInjectionTest extends TestSetup {
@@ -48,7 +44,7 @@ public class ServletFilterEjbLocalInject
@Deployment(testable = false)
public static WebArchive getArchive() {
- return new ServletFilterEjbLocalInjectionTest().createDeployment(PojoServletFilter.class,
+ return new ServletFilterEjbLocalInjectionTest().createDeployment(TestRun.class, PojoServletFilter.class,
CompanyLocal.class, Company.class, DefaultCompany.class, SuperMarket.class);
}
@@ -56,69 +52,6 @@ public class ServletFilterEjbLocalInject
descriptor.filter(PojoServletFilter.class, "/" + getTestContextName());
}
- public static class PojoServletFilter implements Filter {
-
- @EJB
- private CompanyLocal localCompany;
-
- @EJB
- private SuperMarket market;
-
- public void init(FilterConfig config) {
- }
-
- public void destroy() {
- }
-
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
- run(req, resp, this);
- }
-
- public void testLocalBean() {
- Assert.assertNotNull(market);
- market.shop("test");
- }
-
- public void testLocalEjb() {
- Assert.assertNotNull(localCompany);
- localCompany.employ("test");
- }
-
-
- }
-
- public static interface Company {
- public String employ(String employeeName);
- }
-
- @Local
- public static interface CompanyLocal extends Company {
- }
-
- @Stateless
- public static class DefaultCompany implements CompanyLocal {
-
- private final String name = "TomEE Software Inc.";
-
- public String employ(String employeeName) {
- return employeeName + " is employed at " + name;
- }
-
- }
-
- @Stateless
- @LocalBean
- public static class SuperMarket {
-
- private final String name = "Apache Marketplace";
-
- public String shop(String employeeName) {
- return employeeName + " shops at " + name;
- }
-
- }
-
}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/SuperMarket.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/SuperMarket.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/SuperMarket.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/SuperMarket.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,16 @@
+package org.apache.openejb.arquillian.tests.filterlocalinject;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+
+@Stateless
+@LocalBean
+public class SuperMarket {
+
+ private final String name = "Apache Marketplace";
+
+ public String shop(String employeeName) {
+ return employeeName + " shops at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/Address.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/Address.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/Address.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/Address.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,44 @@
+package org.apache.openejb.arquillian.tests.filterpersistence;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Address {
+ public String getStreet() {
+ return street;
+ }
+
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getZip() {
+ return zip;
+ }
+
+ public void setZip(String zip) {
+ this.zip = zip;
+ }
+
+ private String street = "123 Lakeview St.", city = "Paradise", state = "ZZ", zip = "00000";
+
+ public String toString() {
+ return "Street: " + street + ", City: " + city + ", State: " + state + ", Zip: " + zip;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/PersistenceServletFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/PersistenceServletFilter.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/PersistenceServletFilter.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/PersistenceServletFilter.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,63 @@
+package org.apache.openejb.arquillian.tests.filterpersistence;
+
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.transaction.UserTransaction;
+
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.junit.Assert;
+
+public class PersistenceServletFilter implements Filter {
+
+ @Resource
+ private UserTransaction transaction;
+
+ @PersistenceUnit
+ private EntityManagerFactory entityMgrFactory;
+
+ @PersistenceContext
+ private EntityManager entityManager;
+
+ public void init(FilterConfig config) {
+ }
+
+ public void destroy() {
+ }
+
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
+ TestRun.run(req, resp, this);
+ }
+
+ public void testEntityManagerFactory() {
+ Assert.assertNotNull(entityMgrFactory);
+
+ Address a = new Address();
+ EntityManager em = entityMgrFactory.createEntityManager();
+ em.contains(a);
+ }
+
+ public void testEntityManager() {
+ Assert.assertNotNull(entityManager);
+ Address a = new Address();
+ entityManager.contains(a);
+ }
+
+ public void testUserTransaction() throws Exception{
+ Assert.assertNotNull(transaction);
+ transaction.begin();
+ transaction.commit();
+ }
+
+}
\ No newline at end of file