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

Let integration tests mind the mailbox prop update when adding contact

Browse Source
This commit is contained in:
Daniel Lublin
2022-05-13 11:46:41 +02:00
parent a42d9eec1c
commit 84afc6d934
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementIntegrationTest.java
View File

@@ -345,11 +345,12 @@ public class TransportKeyAgreementIntegrationTest
.canSendOutgoingStreams(aliceId, DUPLEX_TRANSPORT_ID)); .canSendOutgoingStreams(aliceId, DUPLEX_TRANSPORT_ID));
} }
// Sync initial client versioning updates // Sync initial client versioning updates and mailbox properties updates
syncMessage(alice, bob, bobId, 1, true); syncMessage(alice, bob, bobId, 1, true);
syncMessage(bob, alice, aliceId, 1, true); syncMessage(bob, alice, aliceId, 1, true);
syncMessage(alice, bob, bobId, 1, true); syncMessage(alice, bob, bobId, 2, true);
sendAcks(bob, alice, aliceId, 1); syncMessage(bob, alice, aliceId, 1, true);
sendAcks(alice, bob, bobId, 1);
return new Pair<>(aliceId, bobId); return new Pair<>(aliceId, bobId);
} }

7
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
View File

@@ -1051,11 +1051,12 @@ public class IntroductionIntegrationTest
true); true);
contact0From1 = contactManager1.getContact(contactId0From1); contact0From1 = contactManager1.getContact(contactId0From1);
// Sync initial client versioning updates and transport properties // Sync initial client versioning updates, mailbox properties updates,
// and transport properties
sync0To1(1, true); sync0To1(1, true);
sync1To0(1, true); sync1To0(1, true);
sync0To1(2, true); sync0To1(3, true);
sync1To0(1, true); sync1To0(2, true);
// a new introduction should be possible // a new introduction should be possible
assertTrue(introductionManager0 assertTrue(introductionManager0

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

@@ -172,16 +172,18 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
true); true);
contact0From2 = contactManager2.getContact(contactId0From2); contact0From2 = contactManager2.getContact(contactId0From2);
// Sync initial client versioning updates // Sync initial client versioning updates and mailbox properties updates
sync0To1(1, true); sync0To1(1, true);
sync1To0(1, true); sync1To0(1, true);
sync0To1(1, true); sync0To1(2, true);
ack1To0(1); sync1To0(1, true);
ack0To1(1);
sync0To2(1, true); sync0To2(1, true);
sync2To0(1, true); sync2To0(1, true);
sync0To2(1, true); sync0To2(2, true);
ack2To0(1); sync2To0(1, true);
ack0To2(1);
} }
protected void addContacts1And2() throws Exception { protected void addContacts1And2() throws Exception {
@@ -200,13 +202,16 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
// Sync initial client versioning updates // Sync initial client versioning updates
sync1To2(1, true); sync1To2(1, true);
sync2To1(1, true); sync2To1(1, true);
// Sync 2nd client versioning msg from 1to2, mailbox properties updates,
// and transport properties if we should
if (haveTransportProperties) { if (haveTransportProperties) {
sync1To2(3, true);
sync2To1(2, true);
ack1To2(2);
} else {
sync1To2(2, true); sync1To2(2, true);
sync2To1(1, true); sync2To1(1, true);
ack1To2(1); ack1To2(1);
} else {
sync1To2(1, true);
ack2To1(1);
} }
} }