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

Added active flag to contacts.

Browse Source
This commit is contained in:
akwizgran
2016-02-17 18:10:52 +00:00
parent 6b76b75d08
commit a6baa5821e
14 changed files with 186 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
View File

@@ -107,7 +107,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
transportId = new TransportId("id");
maxLatency = Integer.MAX_VALUE;
contactId = new ContactId(234);
contact = new Contact(contactId, author, localAuthorId);
contact = new Contact(contactId, author, localAuthorId, true);
}
private DatabaseComponent createDatabaseComponent(Database<Object> database,
@@ -143,7 +143,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
will(returnValue(true));
oneOf(database).containsContact(txn, authorId, localAuthorId);
will(returnValue(false));
oneOf(database).addContact(txn, author, localAuthorId);
oneOf(database).addContact(txn, author, localAuthorId, true);
will(returnValue(contactId));
oneOf(eventBus).broadcast(with(any(ContactAddedEvent.class)));
// getContacts()
@@ -193,7 +193,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
try {
db.addLocalAuthor(transaction, localAuthor);
assertEquals(contactId,
db.addContact(transaction, author, localAuthorId));
db.addContact(transaction, author, localAuthorId, true));
assertEquals(Collections.singletonList(contact),
db.getContacts(transaction));
db.addGroup(transaction, group); // First time - listeners called
@@ -294,11 +294,11 @@ public class DatabaseComponentImplTest extends BriarTestCase {
final EventBus eventBus = context.mock(EventBus.class);
context.checking(new Expectations() {{
// Check whether the contact is in the DB (which it's not)
exactly(17).of(database).startTransaction();
exactly(18).of(database).startTransaction();
will(returnValue(txn));
exactly(17).of(database).containsContact(txn, contactId);
exactly(18).of(database).containsContact(txn, contactId);
will(returnValue(false));
exactly(17).of(database).abortTransaction(txn);
exactly(18).of(database).abortTransaction(txn);
}});
DatabaseComponent db = createDatabaseComponent(database, eventBus,
shutdown);
@@ -456,6 +456,16 @@ public class DatabaseComponentImplTest extends BriarTestCase {
db.endTransaction(transaction);
}
transaction = db.startTransaction();
try {
db.setContactActive(transaction, contactId, true);
fail();
} catch (NoSuchContactException expected) {
// Expected
} finally {
db.endTransaction(transaction);
}
transaction = db.startTransaction();
try {
db.setReorderingWindow(transaction, contactId, transportId, 0, 0,
@@ -501,7 +511,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
Transaction transaction = db.startTransaction();
try {
db.addContact(transaction, author, localAuthorId);
db.addContact(transaction, author, localAuthorId, true);
fail();
} catch (NoSuchLocalAuthorException expected) {
// Expected
@@ -755,7 +765,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
will(returnValue(true));
oneOf(database).containsContact(txn, authorId, localAuthorId);
will(returnValue(false));
oneOf(database).addContact(txn, author, localAuthorId);
oneOf(database).addContact(txn, author, localAuthorId, true);
will(returnValue(contactId));
oneOf(eventBus).broadcast(with(any(ContactAddedEvent.class)));
// endTransaction()
@@ -776,7 +786,7 @@ public class DatabaseComponentImplTest extends BriarTestCase {
try {
db.addLocalAuthor(transaction, localAuthor);
assertEquals(contactId,
db.addContact(transaction, author, localAuthorId));
db.addContact(transaction, author, localAuthorId, true));
transaction.setComplete();
} finally {
db.endTransaction(transaction);

64
briar-tests/src/org/briarproject/db/H2DatabaseTest.java
View File

@@ -108,7 +108,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
assertFalse(db.containsContact(txn, contactId));
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
assertTrue(db.containsContact(txn, contactId));
assertFalse(db.containsGroup(txn, groupId));
db.addGroup(txn, group);
@@ -170,7 +171,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and a message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addMessage(txn, message, VALID, true);
@@ -207,7 +209,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and an unvalidated message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addMessage(txn, message, UNKNOWN, true);
@@ -245,7 +248,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and an unshared message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addMessage(txn, message, VALID, false);
@@ -283,7 +287,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and a message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addMessage(txn, message, VALID, true);
@@ -309,7 +314,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact and a group
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
@@ -345,7 +351,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and a message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addMessage(txn, message, VALID, true);
@@ -508,7 +515,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact and a group
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
@@ -527,7 +535,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
// The group is not in the database
assertFalse(db.containsVisibleMessage(txn, contactId, messageId));
@@ -544,7 +553,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and a message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addMessage(txn, message, VALID, true);
db.addStatus(txn, contactId, messageId, false, false);
@@ -563,7 +573,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact and a group
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
// The group should not be visible to the contact
@@ -598,7 +609,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact and the groups
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
for (Group g : groups) db.addGroup(txn, g);
// Make the groups visible to the contact
@@ -630,7 +642,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add the contact, the transport and the transport keys
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addTransport(txn, transportId, 123);
db.addTransportKeys(txn, contactId, keys);
@@ -691,7 +704,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add the contact, transport and transport keys
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addTransport(txn, transportId, 123);
db.updateTransportKeys(txn, Collections.singletonMap(contactId, keys));
@@ -726,7 +740,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add the contact, transport and transport keys
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addTransport(txn, transportId, 123);
db.updateTransportKeys(txn, Collections.singletonMap(contactId, keys));
@@ -762,7 +777,8 @@ public class H2DatabaseTest extends BriarTestCase {
assertEquals(Collections.emptyList(), contacts);
// Add a contact associated with the local author
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
contacts = db.getContacts(txn, localAuthorId);
assertEquals(Collections.singletonList(contactId), contacts);
@@ -783,7 +799,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact - initially there should be no offered messages
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
assertEquals(0, db.countOfferedMessages(txn, contactId));
// Add some offered messages and count them
@@ -921,7 +938,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
// Add a group and make it visible to the contact
db.addGroup(txn, group);
@@ -997,7 +1015,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact and a group
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
// The group should not be visible to the contact
@@ -1030,8 +1049,8 @@ public class H2DatabaseTest extends BriarTestCase {
db.addLocalAuthor(txn, localAuthor1);
// Add the same contact for each local pseudonym
ContactId contactId = db.addContact(txn, author, localAuthorId);
ContactId contactId1 = db.addContact(txn, author, localAuthorId1);
ContactId contactId = db.addContact(txn, author, localAuthorId, true);
ContactId contactId1 = db.addContact(txn, author, localAuthorId1, true);
// The contacts should be distinct
assertNotEquals(contactId, contactId1);
@@ -1050,7 +1069,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, a group and a message
db.addLocalAuthor(txn, localAuthor);
assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertEquals(contactId, db.addContact(txn, author, localAuthorId,
true));
db.addGroup(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addMessage(txn, message, VALID, true);

6
briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java
View File

@@ -134,7 +134,8 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
// Add Bob as a contact
Author bobAuthor = new Author(bobId, "Bob",
new byte[MAX_PUBLIC_KEY_LENGTH]);
ContactId contactId = contactManager.addContact(bobAuthor, aliceId);
ContactId contactId = contactManager.addContact(bobAuthor, aliceId,
true);
// Derive and store the transport keys
keyManager.addContact(contactId, master, timestamp, true);
@@ -204,7 +205,8 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
// Add Alice as a contact
Author aliceAuthor = new Author(aliceId, "Alice",
new byte[MAX_PUBLIC_KEY_LENGTH]);
ContactId contactId = contactManager.addContact(aliceAuthor, bobId);
ContactId contactId = contactManager.addContact(aliceAuthor, bobId,
true);
// Derive and store the transport keys
keyManager.addContact(contactId, master, timestamp, false);