[jboss-cvs] JBossCache/tests-50/functional/org/jboss/cache/pojo/optimistic ...

[Manik Surtani]

  User: msurtani
  Date: 07/01/09 11:21:53

  Modified:    tests-50/functional/org/jboss/cache/pojo/optimistic 
                        LocalTxTest.java
  Log:
  Added tests and fix for JBCACHE-927
  
  Revision  Changes    Path
  1.3       +29 -12    JBossCache/tests-50/functional/org/jboss/cache/pojo/optimistic/LocalTxTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocalTxTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/optimistic/LocalTxTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- LocalTxTest.java	27 Dec 2006 14:44:57 -0000	1.2
  +++ LocalTxTest.java	9 Jan 2007 16:21:53 -0000	1.3
  @@ -22,29 +22,28 @@
   
   package org.jboss.cache.pojo.optimistic;
   
  -import junit.framework.TestCase;
   import junit.framework.Test;
   import junit.framework.TestSuite;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.jboss.cache.Fqn;
   import org.jboss.cache.pojo.PojoCache;
  -import org.jboss.cache.pojo.PojoCacheFactory;
   import org.jboss.cache.pojo.TestingUtil;
  -import org.jboss.cache.pojo.test.Person;
   import org.jboss.cache.pojo.test.Address;
  +import org.jboss.cache.pojo.test.Person;
   import org.jboss.cache.transaction.DummyTransactionManager;
   
   import javax.naming.Context;
  -import javax.naming.NamingException;
   import javax.naming.InitialContext;
  -import javax.transaction.UserTransaction;
  -import javax.transaction.SystemException;
  +import javax.naming.NamingException;
   import javax.transaction.NotSupportedException;
  -import javax.transaction.Transaction;
   import javax.transaction.RollbackException;
  -import java.util.Properties;
  -import java.util.List;
  +import javax.transaction.SystemException;
  +import javax.transaction.Transaction;
  +import javax.transaction.UserTransaction;
   import java.util.ArrayList;
  +import java.util.List;
  +import java.util.Properties;
   
   /**
    */
  @@ -206,7 +205,8 @@
                  try
                  {
                     tx.rollback();
  -               } catch (SystemException e)
  +               }
  +               catch (SystemException e)
                  {
                     e.printStackTrace();
                     t2_ex = e;
  @@ -231,6 +231,21 @@
   
      }
   
  +   public void testFailure1() throws Exception
  +   {
  +      log.info("testFailure1() ....");
  +      UserTransaction tx = getTransaction();
  +      Fqn f = Fqn.fromString("/person/test2");
  +      tx.begin();
  +      cache.getCache().put(f, "test", "test");
  +      tx.commit();
  +
  +      tx.begin();
  +      cache.getCache().removeNode(f);
  +      cache.getCache().put(f, "test", "test");
  +      tx.commit();
  +   }
  +
      public void testConcurrentSimplePutsII() throws Exception
      {
         Thread t1 = new Thread("t1")
  @@ -289,7 +304,8 @@
                  try
                  {
                     tx.rollback();
  -               } catch (SystemException e)
  +               }
  +               catch (SystemException e)
                  {
                     e.printStackTrace();
                     t2_ex = e;
  @@ -371,7 +387,8 @@
                  try
                  {
                     tx.rollback();
  -               } catch (SystemException e)
  +               }
  +               catch (SystemException e)
                  {
                     e.printStackTrace();
                     t2_ex = e;