Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Replaced some sleeps with latches.

Browse Source
This commit is contained in:
akwizgran
2011-10-05 16:51:26 +01:00
parent 9464e29d75
commit c054e1c00e
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -10,6 +10,8 @@ import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.TestCase; import junit.framework.TestCase;
@@ -910,8 +912,8 @@ public class H2DatabaseTest extends TestCase {
@Test @Test
public void testCloseWaitsForCommit() throws Exception { public void testCloseWaitsForCommit() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean transactionFinished = new AtomicBoolean(false); final AtomicBoolean transactionFinished = new AtomicBoolean(false);
final AtomicBoolean closed = new AtomicBoolean(false);
final AtomicBoolean error = new AtomicBoolean(false); final AtomicBoolean error = new AtomicBoolean(false);
final Database<Connection> db = open(false); final Database<Connection> db = open(false);
@@ -922,8 +924,8 @@ public class H2DatabaseTest extends TestCase {
public void run() { public void run() {
try { try {
db.close(); db.close();
closed.set(true);
if(!transactionFinished.get()) error.set(true); if(!transactionFinished.get()) error.set(true);
latch.countDown();
} catch(Exception e) { } catch(Exception e) {
error.set(true); error.set(true);
} }
@@ -932,24 +934,21 @@ public class H2DatabaseTest extends TestCase {
t.start(); t.start();
// Do whatever the transaction needs to do // Do whatever the transaction needs to do
try { try {
Thread.sleep(100); Thread.sleep(10);
} catch(InterruptedException ignored) {} } catch(InterruptedException ignored) {}
transactionFinished.set(true); transactionFinished.set(true);
// Commit the transaction // Commit the transaction
db.commitTransaction(txn); db.commitTransaction(txn);
// The other thread should now terminate // The other thread should now terminate
try { assertTrue(latch.await(5, TimeUnit.SECONDS));
t.join(10 * 1000);
} catch(InterruptedException ignored) {}
assertTrue(closed.get());
// Check that the other thread didn't encounter an error // Check that the other thread didn't encounter an error
assertFalse(error.get()); assertFalse(error.get());
} }
@Test @Test
public void testCloseWaitsForAbort() throws Exception { public void testCloseWaitsForAbort() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean transactionFinished = new AtomicBoolean(false); final AtomicBoolean transactionFinished = new AtomicBoolean(false);
final AtomicBoolean closed = new AtomicBoolean(false);
final AtomicBoolean error = new AtomicBoolean(false); final AtomicBoolean error = new AtomicBoolean(false);
final Database<Connection> db = open(false); final Database<Connection> db = open(false);
@@ -960,8 +959,8 @@ public class H2DatabaseTest extends TestCase {
public void run() { public void run() {
try { try {
db.close(); db.close();
closed.set(true);
if(!transactionFinished.get()) error.set(true); if(!transactionFinished.get()) error.set(true);
latch.countDown();
} catch(Exception e) { } catch(Exception e) {
error.set(true); error.set(true);
} }
@@ -970,16 +969,13 @@ public class H2DatabaseTest extends TestCase {
t.start(); t.start();
// Do whatever the transaction needs to do // Do whatever the transaction needs to do
try { try {
Thread.sleep(100); Thread.sleep(10);
} catch(InterruptedException ignored) {} } catch(InterruptedException ignored) {}
transactionFinished.set(true); transactionFinished.set(true);
// Abort the transaction // Abort the transaction
db.abortTransaction(txn); db.abortTransaction(txn);
// The other thread should now terminate // The other thread should now terminate
try { assertTrue(latch.await(5, TimeUnit.SECONDS));
t.join(10000);
} catch(InterruptedException ignored) {}
assertTrue(closed.get());
// Check that the other thread didn't encounter an error // Check that the other thread didn't encounter an error
assertFalse(error.get()); assertFalse(error.get());
} }