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

Wait for message delivery in integration test.

Browse Source
This commit is contained in:
akwizgran
2019-05-13 12:26:05 +01:00
parent d38176faea
commit ee874947d0
1 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java
View File

@@ -13,6 +13,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.SyncSession;
import org.briarproject.bramble.api.sync.SyncSessionFactory;
import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent;
import org.briarproject.bramble.api.transport.KeyManager;
import org.briarproject.bramble.api.transport.StreamContext;
import org.briarproject.bramble.api.transport.StreamReaderFactory;
@@ -24,7 +25,6 @@ import org.briarproject.bramble.lifecycle.LifecycleModule;
import org.briarproject.bramble.sync.validation.ValidationModule;
import org.briarproject.bramble.system.SystemModule;
import org.briarproject.bramble.test.TestDatabaseModule;
import org.briarproject.bramble.test.TestUtils;
import org.briarproject.bramble.transport.TransportModule;
import org.briarproject.bramble.versioning.VersioningModule;
import org.briarproject.briar.api.messaging.MessagingManager;
@@ -40,11 +40,15 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
import java.util.concurrent.CountDownLatch;
import static java.util.Collections.emptyList;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.briarproject.bramble.api.sync.validation.MessageState.DELIVERED;
import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY;
import static org.briarproject.bramble.test.TestPluginConfigModule.TRANSPORT_ID;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
import static org.briarproject.bramble.test.TestUtils.getSecretKey;
import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
import static org.junit.Assert.assertEquals;
@@ -53,6 +57,8 @@ import static org.junit.Assert.assertTrue;
public class SimplexMessagingIntegrationTest extends BriarTestCase {
private static final int TIMEOUT_MS = 5_000;
private final File testDir = getTestDirectory();
private final File aliceDir = new File(testDir, "alice");
private final File bobDir = new File(testDir, "bob");
@@ -90,12 +96,9 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
sendMessage(alice, bobId);
// Send three simplex streams to exchange client versions and the
// private message
read(bob, aliceId, write(alice, bobId));
read(alice, bobId, write(bob, aliceId));
read(bob, aliceId, write(alice, bobId));
// Tear down the devices
tearDown(alice);
tearDown(bob);
read(bob, aliceId, write(alice, bobId), 1); // Alice's client versions
read(alice, bobId, write(bob, aliceId), 1); // Bob's client versions
read(bob, aliceId, write(alice, bobId), 1); // Alice's private message
// Bob should have received the private message
assertTrue(listener.messageAdded);
}
@@ -128,7 +131,13 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
}
private void read(SimplexMessagingIntegrationTestComponent device,
ContactId contactId, byte[] stream) throws Exception {
ContactId contactId, byte[] stream,
@SuppressWarnings("SameParameterValue") int deliveries)
throws Exception {
// Listen for message deliveries
MessageDeliveryListener listener =
new MessageDeliveryListener(deliveries);
device.getEventBus().addListener(listener);
// Read and recognise the tag
ByteArrayInputStream in = new ByteArrayInputStream(stream);
byte[] tag = new byte[TAG_LENGTH];
@@ -149,6 +158,10 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
// Read whatever needs to be read
session.run();
streamReader.close();
// Wait for the messages to be delivered
assertTrue(listener.delivered.await(TIMEOUT_MS, MILLISECONDS));
// Clean up the listener
device.getEventBus().removeListener(listener);
}
private byte[] write(SimplexMessagingIntegrationTestComponent device,
@@ -184,8 +197,11 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
}
@After
public void tearDown() {
TestUtils.deleteTestDirectory(testDir);
public void tearDown() throws Exception {
// Tear down the devices
tearDown(alice);
tearDown(bob);
deleteTestDirectory(testDir);
}
private static void injectEagerSingletons(
@@ -200,6 +216,24 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
component.inject(new VersioningModule.EagerSingletons());
}
@NotNullByDefault
private static class MessageDeliveryListener implements EventListener {
private final CountDownLatch delivered;
private MessageDeliveryListener(int deliveries) {
delivered = new CountDownLatch(deliveries);
}
@Override
public void eventOccurred(Event e) {
if (e instanceof MessageStateChangedEvent) {
MessageStateChangedEvent m = (MessageStateChangedEvent) e;
if (m.getState().equals(DELIVERED)) delivered.countDown();
}
}
}
@NotNullByDefault
private static class PrivateMessageListener implements EventListener {