Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java Sun Jan 6 13:00:08 2013 @@ -19,7 +19,7 @@ package org.apache.openejb.core.stateles import org.apache.openejb.jee.Empty; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java Sun Jan 6 13:00:08 2013 @@ -24,7 +24,7 @@ import org.apache.openejb.jee.Intercepto import org.apache.openejb.jee.NamedMethod; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.apache.openejb.test.util.Asserts; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/InterceptorBindingEjbTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/InterceptorBindingEjbTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/InterceptorBindingEjbTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/InterceptorBindingEjbTest.java Sun Jan 6 13:00:08 2013 @@ -21,7 +21,7 @@ import org.apache.openejb.jee.Beans; import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java Sun Jan 6 13:00:08 2013 @@ -23,7 +23,7 @@ import org.apache.openejb.jee.Intercepto import org.apache.openejb.jee.InterceptorBinding; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java Sun Jan 6 13:00:08 2013 @@ -23,7 +23,7 @@ import org.apache.openejb.jee.Intercepto import org.apache.openejb.jee.InterceptorBinding; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java Sun Jan 6 13:00:08 2013 @@ -23,7 +23,7 @@ import org.apache.openejb.jee.Intercepto import org.apache.openejb.jee.InterceptorBinding; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/junit/DescriptorTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/junit/DescriptorTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/junit/DescriptorTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/junit/DescriptorTest.java Sun Jan 6 13:00:08 2013 @@ -16,10 +16,10 @@ */ package org.apache.openejb.junit; -import org.apache.openejb.assembler.classic.AppInfo; -import org.apache.openejb.assembler.classic.Assembler; import org.apache.openejb.jee.EjbJar; -import org.apache.openejb.loader.SystemInstance; +import org.apache.openejb.testing.Descriptor; +import org.apache.openejb.testing.Descriptors; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/monitoring/JMXContainerTest.java Sun Jan 6 13:00:08 2013 @@ -22,7 +22,7 @@ import javax.management.ObjectName; import org.apache.openejb.core.singleton.SingletonContainer; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/DataSourceInitialSizeAdjustingTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/DataSourceInitialSizeAdjustingTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/DataSourceInitialSizeAdjustingTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/DataSourceInitialSizeAdjustingTest.java Sun Jan 6 13:00:08 2013 @@ -22,8 +22,8 @@ import org.apache.openejb.assembler.clas import org.apache.openejb.jee.jpa.unit.Persistence; import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.openejb.loader.SystemInstance; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java Sun Jan 6 13:00:08 2013 @@ -21,8 +21,8 @@ import org.apache.openejb.assembler.clas import org.apache.openejb.jee.jpa.unit.Persistence; import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java Sun Jan 6 13:00:08 2013 @@ -17,23 +17,18 @@ package org.apache.openejb.persistence; import java.util.Properties; -import javax.ejb.EJB; -import javax.ejb.LocalBean; -import javax.ejb.Stateless; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContext; -import org.apache.openejb.jee.Empty; -import org.apache.openejb.jee.StatelessBean; + import org.apache.openejb.jee.jpa.unit.Persistence; import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.jee.jpa.unit.TransactionType; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.webbeans.logger.JULLoggerFactory; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java Sun Jan 6 13:00:08 2013 @@ -28,8 +28,8 @@ import org.apache.openejb.jee.jpa.unit.P import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.jee.jpa.unit.TransactionType; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.webbeans.logger.JULLoggerFactory; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/AliasesTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/AliasesTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/AliasesTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/AliasesTest.java Sun Jan 6 13:00:08 2013 @@ -22,8 +22,8 @@ import org.apache.openejb.jee.SingletonB import org.apache.openejb.jee.jpa.unit.Persistence; import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/CustomPoolDataSourceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/CustomPoolDataSourceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/CustomPoolDataSourceTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/CustomPoolDataSourceTest.java Sun Jan 6 13:00:08 2013 @@ -18,8 +18,8 @@ package org.apache.openejb.resource.jdbc import org.apache.openejb.jee.EjbJar; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.openejb.resource.jdbc.pool.PoolDataSourceCreator; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceIsClosedTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceIsClosedTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceIsClosedTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceIsClosedTest.java Sun Jan 6 13:00:08 2013 @@ -18,8 +18,8 @@ package org.apache.openejb.resource.jdbc import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedDataSourceTest.java Sun Jan 6 13:00:08 2013 @@ -19,8 +19,8 @@ package org.apache.openejb.resource.jdbc import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; import org.junit.After; import org.junit.BeforeClass; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java Sun Jan 6 13:00:08 2013 @@ -19,8 +19,8 @@ package org.apache.openejb.resource.jdbc import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; import org.junit.After; import org.junit.BeforeClass; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java Sun Jan 6 13:00:08 2013 @@ -19,8 +19,8 @@ package org.apache.openejb.resource.jdbc import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; import org.junit.After; import org.junit.BeforeClass; Added: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/testng/TestNGAppComposerTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/testng/TestNGAppComposerTest.java?rev=1429511&view=auto ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/testng/TestNGAppComposerTest.java (added) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/testng/TestNGAppComposerTest.java Sun Jan 6 13:00:08 2013 @@ -0,0 +1,45 @@ +package org.apache.openejb.testng; + +import org.apache.openejb.OpenEJB; +import org.apache.openejb.jee.EnterpriseBean; +import org.apache.openejb.jee.SingletonBean; +import org.apache.openejb.testing.Module; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + +import javax.ejb.EJB; +import javax.transaction.SystemException; + +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +@Listeners(ApplicationComposerListener.class) +public class TestNGAppComposerTest { + @EJB + private TestNGSingleton singleton; + + @Module + public EnterpriseBean singleton() { + return new SingletonBean(TestNGSingleton.class).localBean(); + } + + @Test + public void notNull() { + assertNotNull(singleton); + } + + @Test + public void ejb() { + assertTrue(singleton.ejb()); + } + + public static class TestNGSingleton { + public boolean ejb() { + try { + return OpenEJB.getTransactionManager().getTransaction() != null; + } catch (SystemException e) { + return false; + } + } + } +} Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java Sun Jan 6 13:00:08 2013 @@ -27,7 +27,7 @@ import org.apache.openejb.core.timer.Tim import org.apache.openejb.jee.Empty; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Module; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.spi.ContainerSystem; import org.junit.Test; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java Sun Jan 6 13:00:08 2013 @@ -24,8 +24,8 @@ import org.apache.openejb.jee.StatelessB import org.apache.openejb.jee.jpa.unit.Persistence; import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java Sun Jan 6 13:00:08 2013 @@ -25,8 +25,7 @@ import javax.ejb.EJB; import org.apache.openejb.jee.Empty; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Module; -import org.apache.openejb.test.util.Asserts; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/web/LightweightWebAppBuilderTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/web/LightweightWebAppBuilderTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/web/LightweightWebAppBuilderTest.java (original) +++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/web/LightweightWebAppBuilderTest.java Sun Jan 6 13:00:08 2013 @@ -21,8 +21,8 @@ import org.apache.openejb.config.WebModu import org.apache.openejb.core.WebContext; import org.apache.openejb.jee.WebApp; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Component; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Component; +import org.apache.openejb.testing.Module; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.spi.ContainerSystem; import org.junit.Test; Modified: openejb/trunk/openejb/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java (original) +++ openejb/trunk/openejb/examples/application-composer/src/test/java/org/superbiz/composed/MoviesTest.java Sun Jan 6 13:00:08 2013 @@ -21,8 +21,8 @@ import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.StatefulBean; import org.apache.openejb.jee.jpa.unit.PersistenceUnit; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/examples/rest-applicationcomposer-mockito/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/rest-applicationcomposer-mockito/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/examples/rest-applicationcomposer-mockito/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java (original) +++ openejb/trunk/openejb/examples/rest-applicationcomposer-mockito/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java Sun Jan 6 13:00:08 2013 @@ -18,9 +18,9 @@ package org.superbiz.composed.rest; import org.apache.openejb.OpenEjbContainer; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.MockInjector; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.MockInjector; +import org.apache.openejb.testing.Module; import org.apache.openejb.loader.IO; import org.apache.openejb.mockito.MockitoInjector; import org.junit.Test; Modified: openejb/trunk/openejb/examples/rest-applicationcomposer/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/rest-applicationcomposer/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/examples/rest-applicationcomposer/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java (original) +++ openejb/trunk/openejb/examples/rest-applicationcomposer/src/test/java/org/superbiz/composed/rest/GreetingServiceTest.java Sun Jan 6 13:00:08 2013 @@ -23,8 +23,8 @@ import org.apache.openejb.jee.SingletonB import org.apache.openejb.jee.oejb3.EjbDeployment; import org.apache.openejb.jee.oejb3.OpenejbJar; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Configuration; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; import org.apache.openejb.loader.IO; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java (original) +++ openejb/trunk/openejb/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java Sun Jan 6 13:00:08 2013 @@ -19,9 +19,9 @@ package org.superbiz.rest; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.openejb.jee.WebApp; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Classes; -import org.apache.openejb.junit.EnableServices; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Classes; +import org.apache.openejb.testing.EnableServices; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java (original) +++ openejb/trunk/openejb/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java Sun Jan 6 13:00:08 2013 @@ -19,9 +19,9 @@ package org.superbiz.rest; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.openejb.jee.WebApp; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.Classes; -import org.apache.openejb.junit.EnableServices; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Classes; +import org.apache.openejb.testing.EnableServices; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (original) +++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Sun Jan 6 13:00:08 2013 @@ -335,6 +335,7 @@ org.junit.rules;resolution:=optional, org.junit.runners;resolution:=optional, org.junit.runners.model;resolution:=optional, + org.testng;resolution:=optional, org.omg.CORBA, org.quartz;resolution:=optional, org.quartz.impl;resolution:=optional, Modified: openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java (original) +++ openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java Sun Jan 6 13:00:08 2013 @@ -16,7 +16,7 @@ */ package org.apache.openejb.mockito; -import org.apache.openejb.junit.TestInstance; +import org.apache.openejb.testing.TestInstance; import org.apache.openejb.loader.SystemInstance; import org.mockito.Mock; Modified: openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoInjector.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoInjector.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoInjector.java (original) +++ openejb/trunk/openejb/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockitoInjector.java Sun Jan 6 13:00:08 2013 @@ -18,7 +18,7 @@ package org.apache.openejb.mockito; import org.apache.openejb.Injection; import org.apache.openejb.injection.FallbackPropertyInjector; -import org.apache.openejb.junit.TestInstance; +import org.apache.openejb.testing.TestInstance; import org.apache.openejb.loader.SystemInstance; import org.mockito.MockitoAnnotations; Modified: openejb/trunk/openejb/utils/openejb-mockito/src/test/java/org/apache/openejb/mockito/MockitoAndAppComposerTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-mockito/src/test/java/org/apache/openejb/mockito/MockitoAndAppComposerTest.java?rev=1429511&r1=1429510&r2=1429511&view=diff ============================================================================== --- openejb/trunk/openejb/utils/openejb-mockito/src/test/java/org/apache/openejb/mockito/MockitoAndAppComposerTest.java (original) +++ openejb/trunk/openejb/utils/openejb-mockito/src/test/java/org/apache/openejb/mockito/MockitoAndAppComposerTest.java Sun Jan 6 13:00:08 2013 @@ -17,8 +17,8 @@ package org.apache.openejb.mockito; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.MockInjector; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.MockInjector; +import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock;
