ozeigermann 2004/06/04 05:10:15
Modified: transaction/src/test/org/apache/commons/transaction/memory
MapWrapperTest.java OptimisticMapWrapperTest.java
transaction build.xml
Log:
Extended tests (run fine)
Revision Changes Path
1.6 +229 -124
jakarta-commons-sandbox/transaction/src/test/org/apache/commons/transaction/memory/MapWrapperTest.java
Index: MapWrapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/transaction/src/test/org/apache/commons/transaction/memory/MapWrapperTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MapWrapperTest.java 4 Jun 2004 11:20:13 -0000 1.5
+++ MapWrapperTest.java 4 Jun 2004 12:10:15 -0000 1.6
@@ -25,7 +25,10 @@
import junit.framework.*;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.logging.*;
@@ -41,24 +44,35 @@
*/
public class MapWrapperTest extends TestCase {
- private static final Logger logger =
- Logger.getLogger(MapWrapperTest.class.getName());
+ private static final Logger logger =
Logger.getLogger(MapWrapperTest.class.getName());
private static final LoggerFacade sLogger = new Jdk14Logger(logger);
- private static final long BARRIER_TIMEOUT = 2000;
+ protected static final long BARRIER_TIMEOUT = 2000;
// XXX need this, as JUnit seems to print only part of these strings
- private static void report(String should, String is) {
+ protected static void report(String should, String is) {
if (!should.equals(is)) {
- fail(
- "\nWrong output:\n'"
- + is
- + "'\nShould be:\n'"
- + should
- + "'\n");
+ fail("\nWrong output:\n'" + is + "'\nShould be:\n'" + should + "'\n");
}
}
+ protected static void checkCollection(Collection col, Object[] values) {
+ int cnt = 0;
+ int trueCnt = 0;
+
+ for (Iterator it = col.iterator(); it.hasNext();) {
+ cnt++;
+ Object value1 = it.next();
+ for (int i = 0; i < values.length; i++) {
+ Object value2 = values[i];
+ if (value2.equals(value1))
+ trueCnt++;
+ }
+ }
+ assertEquals(cnt, values.length);
+ assertEquals(trueCnt, values.length);
+ }
+
public static Test suite() {
TestSuite suite = new TestSuite(MapWrapperTest.class);
return suite;
@@ -72,9 +86,9 @@
super(testName);
}
- protected TransactionalMapWrapper getNewWrapper(Map map) {
- return new TransactionalMapWrapper(map);
- }
+ protected TransactionalMapWrapper getNewWrapper(Map map) {
+ return new TransactionalMapWrapper(map);
+ }
public void testBasic() throws Throwable {
@@ -84,16 +98,16 @@
final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
- assertTrue(txMap1.isEmpty());
+ assertTrue(txMap1.isEmpty());
// make sure changes are propagated to wrapped map outside tx
txMap1.put("key1", "value1");
report("value1", (String) map1.get("key1"));
- assertFalse(txMap1.isEmpty());
+ assertFalse(txMap1.isEmpty());
// make sure changes are progated to wrapped map only after commit
txMap1.startTransaction();
- assertFalse(txMap1.isEmpty());
+ assertFalse(txMap1.isEmpty());
txMap1.put("key1", "value2");
report("value1", (String) map1.get("key1"));
report("value2", (String) txMap1.get("key1"));
@@ -109,89 +123,182 @@
report("value2", (String) txMap1.get("key1"));
}
- public void testComplex() throws Throwable {
+ public void testComplex() throws Throwable {
+
+ logger.info("Checking advanced and complex transaction features");
+
+ final Map map1 = new HashMap();
+
+ final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
+
+ // first fill in some global values:
+ txMap1.put("key1", "value1");
+ txMap1.put("key2", "value2");
+
+ // let's see if we have all values:
+ logger.info("Checking if global values are present");
+
+ assertTrue(txMap1.containsValue("value1"));
+ assertTrue(txMap1.containsValue("value2"));
+ assertFalse(txMap1.containsValue("novalue"));
+
+ // ... and all keys
+ logger.info("Checking if global keys are present");
+ assertTrue(txMap1.containsKey("key1"));
+ assertTrue(txMap1.containsKey("key2"));
+ assertFalse(txMap1.containsKey("nokey"));
+
+ // and now some inside a transaction
+ txMap1.startTransaction();
+ txMap1.put("key3", "value3");
+ txMap1.put("key4", "value4");
+
+ // let's see if we have all values:
+ logger.info("Checking if values inside transactions are present");
+ assertTrue(txMap1.containsValue("value1"));
+ assertTrue(txMap1.containsValue("value2"));
+ assertTrue(txMap1.containsValue("value3"));
+ assertTrue(txMap1.containsValue("value4"));
+ assertFalse(txMap1.containsValue("novalue"));
+
+ // ... and all keys
+ logger.info("Checking if keys inside transactions are present");
+ assertTrue(txMap1.containsKey("key1"));
+ assertTrue(txMap1.containsKey("key2"));
+ assertTrue(txMap1.containsKey("key3"));
+ assertTrue(txMap1.containsKey("key4"));
+ assertFalse(txMap1.containsKey("nokey"));
+
+ // now let's delete some old stuff
+ logger.info("Checking remove inside transactions");
+ txMap1.remove("key1");
+ assertFalse(txMap1.containsKey("key1"));
+ assertFalse(txMap1.containsValue("value1"));
+ assertNull(txMap1.get("key1"));
+ assertEquals(3, txMap1.size());
+
+ // and some newly created
+ txMap1.remove("key3");
+ assertFalse(txMap1.containsKey("key3"));
+ assertFalse(txMap1.containsValue("value3"));
+ assertNull(txMap1.get("key3"));
+ assertEquals(2, txMap1.size());
+
+ logger.info("Checking remove and propagation after commit");
+ txMap1.commitTransaction();
+
+ txMap1.remove("key1");
+ assertFalse(txMap1.containsKey("key1"));
+ assertFalse(txMap1.containsValue("value1"));
+ assertNull(txMap1.get("key1"));
+ assertFalse(txMap1.containsKey("key3"));
+ assertFalse(txMap1.containsValue("value3"));
+ assertNull(txMap1.get("key3"));
+ assertEquals(2, txMap1.size());
+ }
+
+ public void testSets() throws Throwable {
- logger.info("Checking advanced and complex transaction features");
+ logger.info("Checking set opertaions");
- final Map map1 = new HashMap();
+ final Map map1 = new HashMap();
- final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
+ final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
+
+ // first fill in some global values:
+ txMap1.put("key1", "value1");
+ txMap1.put("key2", "value200");
+
+ // and now some inside a transaction
+ txMap1.startTransaction();
+ txMap1.put("key2", "value2"); // modify
+ txMap1.put("key3", "value3");
+ txMap1.put("key4", "value4");
+
+ // check entry set
+ boolean key1P, key2P, key3P, key4P;
+ key1P = key2P = key3P = key4P = false;
+ int cnt = 0;
+ for (Iterator it = txMap1.entrySet().iterator(); it.hasNext();) {
+ cnt++;
+ Map.Entry entry = (Map.Entry) it.next();
+ if (entry.getKey().equals("key1") && entry.getValue().equals("value1"))
+ key1P = true;
+ else if (entry.getKey().equals("key2") &&
entry.getValue().equals("value2"))
+ key2P = true;
+ else if (entry.getKey().equals("key3") &&
entry.getValue().equals("value3"))
+ key3P = true;
+ else if (entry.getKey().equals("key4") &&
entry.getValue().equals("value4"))
+ key4P = true;
+ }
+ assertEquals(cnt, 4);
+ assertTrue(key1P && key2P && key3P && key4P);
+
+ checkCollection(txMap1.values(), new String[] { "value1", "value2",
"value3", "value4" });
+ checkCollection(txMap1.keySet(), new String[] { "key1", "key2", "key3",
"key4" });
+
+ txMap1.commitTransaction();
+
+ // check again after commit (should be the same)
+ key1P = key2P = key3P = key4P = false;
+ cnt = 0;
+ for (Iterator it = txMap1.entrySet().iterator(); it.hasNext();) {
+ cnt++;
+ Map.Entry entry = (Map.Entry) it.next();
+ if (entry.getKey().equals("key1") && entry.getValue().equals("value1"))
+ key1P = true;
+ else if (entry.getKey().equals("key2") &&
entry.getValue().equals("value2"))
+ key2P = true;
+ else if (entry.getKey().equals("key3") &&
entry.getValue().equals("value3"))
+ key3P = true;
+ else if (entry.getKey().equals("key4") &&
entry.getValue().equals("value4"))
+ key4P = true;
+ }
+ assertEquals(cnt, 4);
+ assertTrue(key1P && key2P && key3P && key4P);
+
+ checkCollection(txMap1.values(), new String[] { "value1", "value2",
"value3", "value4" });
+ checkCollection(txMap1.keySet(), new String[] { "key1", "key2", "key3",
"key4" });
+
+ // now try clean
+
+ txMap1.startTransaction();
+
+ // add
+ txMap1.put("key5", "value5");
+ // modify
+ txMap1.put("key4", "value400");
+ // delete
+ txMap1.remove("key1");
+
+ assertEquals(txMap1.size(), 4);
+
+ txMap1.clear();
+ assertEquals(txMap1.size(), 0);
+ assertEquals(map1.size(), 4);
+
+ // add
+ txMap1.put("key5", "value5");
+ // delete
+ txMap1.remove("key1");
+
+ // adding one, not removing anything gives size 1
+ assertEquals(txMap1.size(), 1);
+ assertEquals(map1.size(), 4);
+ assertNull(txMap1.get("key4"));
+ assertNotNull(txMap1.get("key5"));
+
+ txMap1.commitTransaction();
+
+ // after commit clear must have been propagated to wrapped map:
+ assertEquals(txMap1.size(), 1);
+ assertEquals(map1.size(), 1);
+ assertNull(txMap1.get("key4"));
+ assertNotNull(txMap1.get("key5"));
+ assertNull(map1.get("key4"));
+ assertNotNull(map1.get("key5"));
+ }
- // first fill in some global values:
- txMap1.put("key1", "value1");
- txMap1.put("key2", "value2");
-
- // let's see if we have all values:
- logger.info("Checking if global values are present");
-
- assertTrue(txMap1.containsValue("value1"));
- assertTrue(txMap1.containsValue("value2"));
- assertFalse(txMap1.containsValue("novalue"));
-
- // ... and all keys
- logger.info("Checking if global keys are present");
- assertTrue(txMap1.containsKey("key1"));
- assertTrue(txMap1.containsKey("key2"));
- assertFalse(txMap1.containsKey("nokey"));
-
- // and now some inside a transaction
- txMap1.startTransaction();
- txMap1.put("key3", "value3");
- txMap1.put("key4", "value4");
-
- // let's see if we have all values:
- logger.info("Checking if values inside transactions are present");
- assertTrue(txMap1.containsValue("value1"));
- assertTrue(txMap1.containsValue("value2"));
- assertTrue(txMap1.containsValue("value3"));
- assertTrue(txMap1.containsValue("value4"));
- assertFalse(txMap1.containsValue("novalue"));
-
- // ... and all keys
- logger.info("Checking if keys inside transactions are present");
- assertTrue(txMap1.containsKey("key1"));
- assertTrue(txMap1.containsKey("key2"));
- assertTrue(txMap1.containsKey("key3"));
- assertTrue(txMap1.containsKey("key4"));
- assertFalse(txMap1.containsKey("nokey"));
-
- // now let's delete some old stuff
- logger.info("Checking remove inside transactions");
- txMap1.remove("key1");
- assertFalse(txMap1.containsKey("key1"));
- assertFalse(txMap1.containsValue("value1"));
- assertNull(txMap1.get("key1"));
- assertEquals(3, txMap1.size());
-
- // and some newly created
- txMap1.remove("key3");
- assertFalse(txMap1.containsKey("key3"));
- assertFalse(txMap1.containsValue("value3"));
- assertNull(txMap1.get("key3"));
- assertEquals(2, txMap1.size());
-
- logger.info("Checking remove and propagation after commit");
- txMap1.commitTransaction();
-
- txMap1.remove("key1");
- assertFalse(txMap1.containsKey("key1"));
- assertFalse(txMap1.containsValue("value1"));
- assertNull(txMap1.get("key1"));
- assertFalse(txMap1.containsKey("key3"));
- assertFalse(txMap1.containsValue("value3"));
- assertNull(txMap1.get("key3"));
- assertEquals(2, txMap1.size());
- }
-
- public void testSets() throws Throwable {
-
- logger.info("Checking set opertaions");
-
- final Map map1 = new HashMap();
-
- final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
- }
-
public void testMulti() throws Throwable {
logger.info("Checking concurrent transaction features");
@@ -202,52 +309,50 @@
final RendezvousBarrier beforeCommitBarrier =
new RendezvousBarrier("Before Commit", 2, BARRIER_TIMEOUT, sLogger);
- final RendezvousBarrier afterCommitBarrier =
- new RendezvousBarrier("After Commit", 2, BARRIER_TIMEOUT,
sLogger);
+ final RendezvousBarrier afterCommitBarrier = new RendezvousBarrier("After
Commit", 2, BARRIER_TIMEOUT, sLogger);
Thread thread1 = new Thread(new Runnable() {
public void run() {
txMap1.startTransaction();
try {
- beforeCommitBarrier.meet();
+ beforeCommitBarrier.meet();
txMap1.put("key1", "value2");
txMap1.commitTransaction();
- afterCommitBarrier.call();
+ afterCommitBarrier.call();
} catch (InterruptedException e) {
- logger.log(Level.WARNING, "Thread interrupted", e);
- afterCommitBarrier.reset();
- beforeCommitBarrier.reset();
+ logger.log(Level.WARNING, "Thread interrupted", e);
+ afterCommitBarrier.reset();
+ beforeCommitBarrier.reset();
}
}
}, "Thread1");
- txMap1.put("key1", "value1");
-
+ txMap1.put("key1", "value1");
txMap1.startTransaction();
- thread1.start();
-
- report("value1", (String) txMap1.get("key1"));
- beforeCommitBarrier.call();
- afterCommitBarrier.meet();
+ thread1.start();
+
+ report("value1", (String) txMap1.get("key1"));
+ beforeCommitBarrier.call();
+ afterCommitBarrier.meet();
// we have read committed as isolation level, that's why I will see the new
value of the other thread now
- report("value2", (String) txMap1.get("key1"));
-
- // now when I override it it should of course be my value again
- txMap1.put("key1", "value3");
- report("value3", (String) txMap1.get("key1"));
-
- // after rollback it must be the value written by the other thread
again
- txMap1.rollbackTransaction();
- report("value2", (String) txMap1.get("key1"));
+ report("value2", (String) txMap1.get("key1"));
+
+ // now when I override it it should of course be my value again
+ txMap1.put("key1", "value3");
+ report("value3", (String) txMap1.get("key1"));
+
+ // after rollback it must be the value written by the other thread again
+ txMap1.rollbackTransaction();
+ report("value2", (String) txMap1.get("key1"));
}
public void testTxControl() throws Throwable {
logger.info("Checking advanced transaction control (heavily used in JCA
implementation)");
-
- final Map map1 = new HashMap();
- final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
+ final Map map1 = new HashMap();
+
+ final TransactionalMapWrapper txMap1 = getNewWrapper(map1);
}
1.5 +7 -12
jakarta-commons-sandbox/transaction/src/test/org/apache/commons/transaction/memory/OptimisticMapWrapperTest.java
Index: OptimisticMapWrapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/transaction/src/test/org/apache/commons/transaction/memory/OptimisticMapWrapperTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OptimisticMapWrapperTest.java 4 Jun 2004 11:20:13 -0000 1.4
+++ OptimisticMapWrapperTest.java 4 Jun 2004 12:10:15 -0000 1.5
@@ -43,15 +43,6 @@
private static final Logger logger =
Logger.getLogger(OptimisticMapWrapperTest.class.getName());
private static final LoggerFacade sLogger = new Jdk14Logger(logger);
- private static final long BARRIER_TIMEOUT = 20000;
-
- // XXX need this, as JUnit seems to print only part of these strings
- private static void report(String should, String is) {
- if (!should.equals(is)) {
- fail("\nWrong output:\n'" + is + "'\nShould be:\n'" + should + "'\n");
- }
- }
-
public static Test suite() {
TestSuite suite = new TestSuite(OptimisticMapWrapperTest.class);
return suite;
@@ -76,6 +67,10 @@
public void testComplex() throws Throwable {
super.testComplex();
+ }
+
+ public void testSets() throws Throwable {
+ super.testSets();
}
public void testMulti() throws Throwable {
1.5 +1 -0 jakarta-commons-sandbox/transaction/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/transaction/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2 Jun 2004 14:58:01 -0000 1.4
+++ build.xml 4 Jun 2004 12:10:15 -0000 1.5
@@ -315,6 +315,7 @@
<formatter type="plain" />
<test name="org.apache.commons.transaction.file.FileResourceManagerTest"
haltonfailure="yes" />
<test name="org.apache.commons.transaction.memory.MapWrapperTest"
haltonfailure="yes" />
+ <test name="org.apache.commons.transaction.memory.OptimisticMapWrapperTest"
haltonfailure="yes" />
</junit>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
