diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java index 06ffdae4d..2b1dfb427 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java @@ -48,6 +48,7 @@ import org.briarproject.bramble.api.transport.IncomingKeys; import org.briarproject.bramble.api.transport.OutgoingKeys; import org.briarproject.bramble.api.transport.TransportKeys; import org.briarproject.bramble.test.BrambleMockTestCase; +import org.briarproject.bramble.test.CaptureArgumentAction; import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.StringUtils; import org.jmock.Expectations; @@ -56,9 +57,12 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import static java.util.Collections.emptyMap; +import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; @@ -160,7 +164,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { ContactStatusChangedEvent.class))); // getContacts() oneOf(database).getContacts(txn); - will(returnValue(Collections.singletonList(contact))); + will(returnValue(singletonList(contact))); // addGroup() oneOf(database).containsGroup(txn, groupId); will(returnValue(false)); @@ -171,12 +175,12 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { will(returnValue(true)); // getGroups() oneOf(database).getGroups(txn, clientId); - will(returnValue(Collections.singletonList(group))); + will(returnValue(singletonList(group))); // removeGroup() oneOf(database).containsGroup(txn, groupId); will(returnValue(true)); oneOf(database).getGroupVisibility(txn, groupId); - will(returnValue(Collections.emptyMap())); + will(returnValue(emptyMap())); oneOf(database).removeGroup(txn, groupId); oneOf(eventBus).broadcast(with(any(GroupRemovedEvent.class))); oneOf(eventBus).broadcast(with(any( @@ -206,11 +210,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { assertEquals(contactId, db.addContact(transaction, author, localAuthorId, true, true)); - assertEquals(Collections.singletonList(contact), + assertEquals(singletonList(contact), db.getContacts(transaction)); db.addGroup(transaction, group); // First time - listeners called db.addGroup(transaction, group); // Second time - not called - assertEquals(Collections.singletonList(group), + assertEquals(singletonList(group), db.getGroups(transaction, clientId)); db.removeGroup(transaction, group); db.removeContact(transaction, contactId); @@ -392,7 +396,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { transaction = db.startTransaction(false); try { - Ack a = new Ack(Collections.singletonList(messageId)); + Ack a = new Ack(singletonList(messageId)); db.receiveAck(transaction, contactId, a); fail(); } catch (NoSuchContactException expected) { @@ -413,7 +417,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { transaction = db.startTransaction(false); try { - Offer o = new Offer(Collections.singletonList(messageId)); + Offer o = new Offer(singletonList(messageId)); db.receiveOffer(transaction, contactId, o); fail(); } catch (NoSuchContactException expected) { @@ -424,7 +428,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { transaction = db.startTransaction(false); try { - Request r = new Request(Collections.singletonList(messageId)); + Request r = new Request(singletonList(messageId)); db.receiveRequest(transaction, contactId, r); fail(); } catch (NoSuchContactException expected) { @@ -1017,7 +1021,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { Transaction transaction = db.startTransaction(false); try { - Ack a = new Ack(Collections.singletonList(messageId)); + Ack a = new Ack(singletonList(messageId)); db.receiveAck(transaction, contactId, a); db.commitTransaction(transaction); } finally { @@ -1187,7 +1191,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { Transaction transaction = db.startTransaction(false); try { - Request r = new Request(Collections.singletonList(messageId)); + Request r = new Request(singletonList(messageId)); db.receiveRequest(transaction, contactId, r); db.commitTransaction(transaction); } finally { @@ -1198,6 +1202,9 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { @Test public void testChangingVisibilityFromInvisibleToVisibleCallsListeners() throws Exception { + AtomicReference event = + new AtomicReference<>(); + context.checking(new Expectations() {{ oneOf(database).startTransaction(); will(returnValue(txn)); @@ -1206,11 +1213,13 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { oneOf(database).containsGroup(txn, groupId); will(returnValue(true)); oneOf(database).getGroupVisibility(txn, contactId, groupId); - will(returnValue(INVISIBLE)); // Not yet visible + will(returnValue(INVISIBLE)); oneOf(database).addGroupVisibility(txn, contactId, groupId, false); oneOf(database).commitTransaction(txn); oneOf(eventBus).broadcast(with(any( GroupVisibilityUpdatedEvent.class))); + will(new CaptureArgumentAction<>(event, + GroupVisibilityUpdatedEvent.class, 0)); }}); DatabaseComponent db = createDatabaseComponent(database, eventBus, shutdown); @@ -1222,11 +1231,18 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { } finally { db.endTransaction(transaction); } + + GroupVisibilityUpdatedEvent e = event.get(); + assertNotNull(e); + assertEquals(singletonList(contactId), e.getAffectedContacts()); } @Test public void testChangingVisibilityFromVisibleToInvisibleCallsListeners() throws Exception { + AtomicReference event = + new AtomicReference<>(); + context.checking(new Expectations() {{ oneOf(database).startTransaction(); will(returnValue(txn)); @@ -1235,11 +1251,13 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { oneOf(database).containsGroup(txn, groupId); will(returnValue(true)); oneOf(database).getGroupVisibility(txn, contactId, groupId); - will(returnValue(VISIBLE)); // Not yet visible + will(returnValue(VISIBLE)); oneOf(database).removeGroupVisibility(txn, contactId, groupId); oneOf(database).commitTransaction(txn); oneOf(eventBus).broadcast(with(any( GroupVisibilityUpdatedEvent.class))); + will(new CaptureArgumentAction<>(event, + GroupVisibilityUpdatedEvent.class, 0)); }}); DatabaseComponent db = createDatabaseComponent(database, eventBus, shutdown); @@ -1251,6 +1269,10 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { } finally { db.endTransaction(transaction); } + + GroupVisibilityUpdatedEvent e = event.get(); + assertNotNull(e); + assertEquals(singletonList(contactId), e.getAffectedContacts()); } @Test @@ -1282,8 +1304,8 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { @Test public void testTransportKeys() throws Exception { TransportKeys transportKeys = createTransportKeys(); - Map keys = Collections.singletonMap( - contactId, transportKeys); + Map keys = + singletonMap(contactId, transportKeys); context.checking(new Expectations() {{ // startTransaction() oneOf(database).startTransaction();