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

Don't attach contact ID to RemoteTransportPropertiesUpdatedEvent.

Browse Source
This commit is contained in:
akwizgran
2020-07-21 17:04:14 +01:00
parent f68d8d284f
commit 2063f6c57c
3 changed files with 4 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java
View File

@@ -36,8 +36,6 @@ import static java.util.Arrays.asList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
import static org.briarproject.bramble.api.properties.TransportPropertyConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.bramble.api.properties.TransportPropertyConstants.GROUP_KEY_CONTACT_IDS_STORED;
import static org.briarproject.bramble.api.properties.TransportPropertyConstants.GROUP_KEY_DISCOVERED;
import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_LOCAL;
import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_TRANSPORT_ID;
@@ -106,9 +104,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
Transaction txn = new Transaction(null, false);
Contact contact = getContact();
Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
BdfDictionary contactGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())
);
context.checking(new Expectations() {{
oneOf(db).containsGroup(txn, localGroup.getId());
@@ -125,8 +120,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
will(returnValue(SHARED));
oneOf(db).setGroupVisibility(txn, contact.getId(),
contactGroup.getId(), SHARED);
oneOf(clientHelper).mergeGroupMetadata(txn, contactGroup.getId(),
contactGroupMeta);
}});
// Copy the latest local properties into the group
expectGetLocalProperties(txn);
@@ -140,57 +133,13 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
}
@Test
public void testAddsContactIdsToGroupsAtStartupIfAlreadyCreated()
public void testDoesNotCreateGroupsAtStartupIfAlreadyCreated()
throws Exception {
Transaction txn = new Transaction(null, false);
Contact contact = getContact();
Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
BdfDictionary contactGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())
);
BdfDictionary localGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_IDS_STORED, true)
);
context.checking(new Expectations() {{
oneOf(db).containsGroup(txn, localGroup.getId());
will(returnValue(true));
// Contact IDs have not been added to contact groups
oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
localGroup.getId());
will(returnValue(new BdfDictionary()));
// Add contact IDs to contact groups
oneOf(db).getContacts(txn);
will(returnValue(singletonList(contact)));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(clientHelper).mergeGroupMetadata(txn, contactGroup.getId(),
contactGroupMeta);
// Remember that contact IDs have been added
oneOf(clientHelper).mergeGroupMetadata(txn, localGroup.getId(),
localGroupMeta);
}});
TransportPropertyManagerImpl t = createInstance();
t.onDatabaseOpened(txn);
}
@Test
public void testDoesNotAddContactIdsToGroupsAtStartupIfAlreadyAdded()
throws Exception {
Transaction txn = new Transaction(null, false);
BdfDictionary localGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_IDS_STORED, true)
);
context.checking(new Expectations() {{
oneOf(db).containsGroup(txn, localGroup.getId());
will(returnValue(true));
// Contact IDs have already been added to contact groups
oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
localGroup.getId());
will(returnValue(localGroupMeta));
}});
TransportPropertyManagerImpl t = createInstance();
@@ -202,9 +151,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
Transaction txn = new Transaction(null, false);
Contact contact = getContact();
Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
BdfDictionary contactGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())
);
context.checking(new Expectations() {{
// Create the group and share it with the contact
@@ -217,8 +163,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
will(returnValue(SHARED));
oneOf(db).setGroupVisibility(txn, contact.getId(),
contactGroup.getId(), SHARED);
oneOf(clientHelper).mergeGroupMetadata(txn, contactGroup.getId(),
contactGroupMeta);
}});
// Copy the latest local properties into the group
expectGetLocalProperties(txn);
@@ -252,11 +196,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
public void testDoesNotDeleteAnythingWhenFirstUpdateIsDelivered()
throws Exception {
Transaction txn = new Transaction(null, false);
Contact contact = getContact();
GroupId contactGroupId = new GroupId(getRandomId());
BdfDictionary contactGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())
);
Message message = getMessage(contactGroupId);
Metadata meta = new Metadata();
BdfDictionary metaDictionary = BdfDictionary.of(
@@ -287,10 +227,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
contactGroupId);
will(returnValue(messageMetadata));
// Look up the contact ID to broadcast an event
oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
contactGroupId);
will(returnValue(contactGroupMeta));
}});
TransportPropertyManagerImpl t = createInstance();
@@ -302,11 +238,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
public void testDeletesOlderUpdatesWhenUpdateIsDelivered()
throws Exception {
Transaction txn = new Transaction(null, false);
Contact contact = getContact();
GroupId contactGroupId = new GroupId(getRandomId());
BdfDictionary contactGroupMeta = BdfDictionary.of(
new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())
);
Message message = getMessage(contactGroupId);
Metadata meta = new Metadata();
// Version 4 is being delivered
@@ -334,10 +266,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
// The previous update (version 3) should be deleted
oneOf(db).deleteMessage(txn, fooVersion3);
oneOf(db).deleteMessageMetadata(txn, fooVersion3);
// Look up the contact ID to broadcast an event
oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
contactGroupId);
will(returnValue(contactGroupMeta));
}});
TransportPropertyManagerImpl t = createInstance();