[infinispan-commits] Infinispan SVN: r1869 - in trunk/core/src/test/java/org/infinispan: config/parsing and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-05-27 15:41:56 -0400 (Thu, 27 May 2010)
New Revision: 1869

Modified:
   trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
   trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
Log:
commented out test and enahnced other

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java	2010-05-27 18:40:47 UTC (rev 1868)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java	2010-05-27 19:41:56 UTC (rev 1869)
@@ -76,20 +76,24 @@
    }
 
    public void testReadAfterTxStarted() throws Exception {
-      AtomicMap<Integer, String> atomicMap = AtomicMapLookup.getAtomicMap(cache, KEY);
-      atomicMap.put(1, "existing");
-      tm.begin();
-      atomicMap.put(1, "newVal");
       OtherThread ot = new OtherThread();
-      ot.start();
-      ot.toExecute.put(Operation.READ);
-      Object response = ot.response.take();
-      assert response.equals("existing");
-      tm.commit();
-      assert atomicMap.get(1).equals("newVal");
-      ot.toExecute.put(Operation.READ);
-      response = ot.response.take();
-      assert response.equals("newVal");
+      try {
+         AtomicMap<Integer, String> atomicMap = AtomicMapLookup.getAtomicMap(cache, KEY);
+         atomicMap.put(1, "existing");
+         tm.begin();
+         atomicMap.put(1, "newVal");
+         ot.start();
+         ot.toExecute.put(Operation.READ);
+         Object response = ot.response.take();
+         assert response.equals("existing");
+         tm.commit();
+         assert atomicMap.get(1).equals("newVal");
+         ot.toExecute.put(Operation.READ);
+         response = ot.response.take();
+         assert response.equals("newVal");
+      } finally {
+         ot.interrupt();
+      }
    }
 
    public class OtherThread extends Thread {

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java	2010-05-27 18:40:47 UTC (rev 1868)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java	2010-05-27 19:41:56 UTC (rev 1869)
@@ -13,9 +13,10 @@
 import java.io.FileOutputStream;
 
 /**
+ * //todo re-enable test as it makes the suite hang
  * @author Mircea.Markus at jboss.com
  */
- at Test(groups = "functional", testName = "config.parsing.Coherence2InfinispanTransformerTest")
+ at Test(groups = "functional", testName = "config.parsing.Coherence2InfinispanTransformerTest", enabled = false)
 public class Coherence2InfinispanTransformerTest extends AbstractInfinispanTest {
 
    public static final String XSLT_FILE = "xslt/coherence35x2infinispan4x.xslt";