[openejb-scm] openejb/modules/core/src/test/org/openejb/timer TimerServiceImplTest.java

[djencks]

djencks     2004/10/05 03:04:04

  Modified:    modules/core/src/test/org/openejb/timer
                        TimerServiceImplTest.java
  Log:

  Use TransactionContextManager rather than TransactionContext static methods.  Mostly 
fix GERONIMO-355. Progress on GERONIMO-347. This demonstrates the problems in 
GERONIMO-359 and GERONIMO-360 (there are now itest failures)
  
  Revision  Changes    Path
  1.3       +4 -4      
openejb/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java
  
  Index: TimerServiceImplTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TimerServiceImplTest.java 20 Jul 2004 23:40:03 -0000      1.2
  +++ TimerServiceImplTest.java 5 Oct 2004 07:04:04 -0000       1.3
  @@ -105,8 +105,8 @@
       private Serializable userKey = "test user info";
   
       protected void setUp() throws Exception {
  -        TransactionManager transactionManager = new TransactionManagerImpl();
  -        transactionContextManager = new 
TransactionContextManager(transactionManager);
  +        TransactionManagerImpl transactionManager = new TransactionManagerImpl();
  +        transactionContextManager = new 
TransactionContextManager(transactionManager, transactionManager, null);
           executableWorkFactory = new 
TransactionalExecutorTaskFactory(transactionContextManager, 1);
           threadPool = new ThreadPool();
           threadPool.setPoolSize(5);
  @@ -114,7 +114,7 @@
           threadPool.setPoolName("TestPool");
           threadPool.doStart();
           WorkerPersistence workerPersistence = new VMWorkerPersistence();
  -        threadPooledTimer = new ThreadPooledTimer(executableWorkFactory, 
workerPersistence, threadPool);
  +        threadPooledTimer = new ThreadPooledTimer(executableWorkFactory, 
workerPersistence, threadPool, transactionContextManager);
           threadPooledTimer.doStart();
   
           TransactionContext.setContext(null);