From d0495b7c00a6ea95c05ea632ed14cfbc8fa753b6 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 30 May 2019 13:55:16 +0100 Subject: [PATCH] Wait for transport properties as well as client versions. --- .../messaging/SimplexMessagingIntegrationTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java index f9445ead6..fb4206db8 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java @@ -94,11 +94,12 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase { bob.getEventBus().addListener(listener); // Alice sends a private message to Bob sendMessage(alice, bobId); - // Send three simplex streams to exchange client versions and the - // private message - 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 + // Sync Alice's client versions and transport properties + read(bob, aliceId, write(alice, bobId), 2); + // Sync Bob's client versions and transport properties + read(alice, bobId, write(bob, aliceId), 2); + // Sync the private message + read(bob, aliceId, write(alice, bobId), 1); // Bob should have received the private message assertTrue(listener.messageAdded); } @@ -131,8 +132,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase { } private void read(SimplexMessagingIntegrationTestComponent device, - ContactId contactId, byte[] stream, - @SuppressWarnings("SameParameterValue") int deliveries) + ContactId contactId, byte[] stream, int deliveries) throws Exception { // Listen for message deliveries MessageDeliveryListener listener =