Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

[core] Add a detector for message delivery non-determinism

Browse Source
This commit is contained in:
Torsten Grote
2018-10-30 12:00:20 -03:00
parent 8547b4dc91
commit 4a42e767d3
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
View File

@@ -56,6 +56,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -67,6 +68,7 @@ import static org.briarproject.bramble.api.sync.ValidationManager.State.INVALID;
import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING; import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING;
import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY; import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY;
import static org.briarproject.bramble.test.TestUtils.getSecretKey; import static org.briarproject.bramble.test.TestUtils.getSecretKey;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@@ -122,6 +124,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
// objects accessed from background threads need to be volatile // objects accessed from background threads need to be volatile
private volatile Waiter validationWaiter; private volatile Waiter validationWaiter;
private volatile Waiter deliveryWaiter; private volatile Waiter deliveryWaiter;
private volatile AtomicInteger messageCounter = new AtomicInteger(0);
protected final static int TIMEOUT = 15000; protected final static int TIMEOUT = 15000;
protected C c0, c1, c2; protected C c0, c1, c2;
@@ -218,11 +221,13 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
if (!event.isLocal()) { if (!event.isLocal()) {
if (event.getState() == DELIVERED) { if (event.getState() == DELIVERED) {
LOG.info("Delivered new message"); LOG.info("Delivered new message");
messageCounter.addAndGet(1);
deliveryWaiter.resume(); deliveryWaiter.resume();
} else if (event.getState() == INVALID || } else if (event.getState() == INVALID ||
event.getState() == PENDING) { event.getState() == PENDING) {
LOG.info("Validated new " + event.getState().name() + LOG.info("Validated new " + event.getState().name() +
" message"); " message");
messageCounter.addAndGet(1);
validationWaiter.resume(); validationWaiter.resume();
} }
} }
@@ -341,7 +346,8 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
String to = "0"; String to = "0";
if (toSync == sync1) to = "1"; if (toSync == sync1) to = "1";
else if (toSync == sync2) to = "2"; else if (toSync == sync2) to = "2";
LOG.info("TEST: Sending message from " + from + " to " + to); LOG.info("TEST: Sending " + num + " message(s) from " + from + " to " +
to);
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
StreamWriter streamWriter = new TestStreamWriter(out); StreamWriter streamWriter = new TestStreamWriter(out);
@@ -364,6 +370,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
} else { } else {
validationWaiter.await(TIMEOUT, num); validationWaiter.await(TIMEOUT, num);
} }
assertEquals("Messages delivered", num, messageCounter.getAndSet(0));
} }
protected void removeAllContacts() throws DbException { protected void removeAllContacts() throws DbException {