Tightened up some tests.

This commit is contained in:
akwizgran
2016-11-30 10:21:27 +00:00
parent f245b04726
commit f8266d8a02

View File

@@ -94,28 +94,35 @@ public class GroupInvitationIntegrationTest extends BriarIntegrationTest {
Collection<InvitationMessage> messages = Collection<InvitationMessage> messages =
groupInvitationManager1.getInvitationMessages(contactId0From1); groupInvitationManager1.getInvitationMessages(contactId0From1);
assertEquals(2, messages.size()); assertEquals(2, messages.size());
boolean foundResponse = false;
for (InvitationMessage m : messages) { for (InvitationMessage m : messages) {
if (m instanceof GroupInvitationResponse) { if (m instanceof GroupInvitationResponse) {
foundResponse = true;
GroupInvitationResponse response = (GroupInvitationResponse) m; GroupInvitationResponse response = (GroupInvitationResponse) m;
assertEquals(contactId0From1, response.getContactId()); assertEquals(contactId0From1, response.getContactId());
assertTrue(response.isLocal()); assertTrue(response.isLocal());
assertFalse(response.wasAccepted()); assertFalse(response.wasAccepted());
} }
} }
assertTrue(foundResponse);
sync1To0(1, true); sync1To0(1, true);
messages = messages =
groupInvitationManager0.getInvitationMessages(contactId1From0); groupInvitationManager0.getInvitationMessages(contactId1From0);
assertEquals(2, messages.size()); assertEquals(2, messages.size());
foundResponse = false;
for (InvitationMessage m : messages) { for (InvitationMessage m : messages) {
if (m instanceof GroupInvitationResponse) { if (m instanceof GroupInvitationResponse) {
foundResponse = true;
GroupInvitationResponse response = (GroupInvitationResponse) m; GroupInvitationResponse response = (GroupInvitationResponse) m;
assertEquals(contactId0From1, response.getContactId()); assertEquals(contactId0From1, response.getContactId());
assertFalse(response.isLocal()); assertFalse(response.isLocal());
assertFalse(response.wasAccepted()); assertFalse(response.wasAccepted());
} }
} }
assertTrue(foundResponse);
// no invitations are open // no invitations are open
assertTrue(groupInvitationManager1.getInvitations().isEmpty()); assertTrue(groupInvitationManager1.getInvitations().isEmpty());
// no groups were added // no groups were added
@@ -136,24 +143,31 @@ public class GroupInvitationIntegrationTest extends BriarIntegrationTest {
Collection<InvitationMessage> messages = Collection<InvitationMessage> messages =
groupInvitationManager1.getInvitationMessages(contactId0From1); groupInvitationManager1.getInvitationMessages(contactId0From1);
assertEquals(2, messages.size()); assertEquals(2, messages.size());
boolean foundResponse = false;
for (InvitationMessage m : messages) { for (InvitationMessage m : messages) {
if (m instanceof GroupInvitationResponse) { if (m instanceof GroupInvitationResponse) {
foundResponse = true;
GroupInvitationResponse response = (GroupInvitationResponse) m; GroupInvitationResponse response = (GroupInvitationResponse) m;
assertTrue(response.wasAccepted()); assertTrue(response.wasAccepted());
} }
} }
assertTrue(foundResponse);
sync1To0(1, true); sync1To0(1, true);
messages = messages =
groupInvitationManager0.getInvitationMessages(contactId1From0); groupInvitationManager0.getInvitationMessages(contactId1From0);
assertEquals(2, messages.size()); assertEquals(2, messages.size());
foundResponse = false;
for (InvitationMessage m : messages) { for (InvitationMessage m : messages) {
if (m instanceof GroupInvitationResponse) { if (m instanceof GroupInvitationResponse) {
foundResponse = true;
GroupInvitationResponse response = (GroupInvitationResponse) m; GroupInvitationResponse response = (GroupInvitationResponse) m;
assertTrue(response.wasAccepted()); assertTrue(response.wasAccepted());
} }
} }
assertTrue(foundResponse);
// no invitations are open // no invitations are open
assertTrue(groupInvitationManager1.getInvitations().isEmpty()); assertTrue(groupInvitationManager1.getInvitations().isEmpty());
// group was added // group was added