From f8266d8a02d1437a17a5bc8eeb7e77daa749df77 Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Wed, 30 Nov 2016 10:21:27 +0000 Subject: [PATCH] Tightened up some tests. --- .../GroupInvitationIntegrationTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/briar-android-tests/src/test/java/org/briarproject/GroupInvitationIntegrationTest.java b/briar-android-tests/src/test/java/org/briarproject/GroupInvitationIntegrationTest.java index fad73342f3..fedaa929a7 100644 --- a/briar-android-tests/src/test/java/org/briarproject/GroupInvitationIntegrationTest.java +++ b/briar-android-tests/src/test/java/org/briarproject/GroupInvitationIntegrationTest.java @@ -94,28 +94,35 @@ public class GroupInvitationIntegrationTest extends BriarIntegrationTest { Collection<InvitationMessage> messages = groupInvitationManager1.getInvitationMessages(contactId0From1); assertEquals(2, messages.size()); + boolean foundResponse = false; for (InvitationMessage m : messages) { if (m instanceof GroupInvitationResponse) { + foundResponse = true; GroupInvitationResponse response = (GroupInvitationResponse) m; assertEquals(contactId0From1, response.getContactId()); assertTrue(response.isLocal()); assertFalse(response.wasAccepted()); } } + assertTrue(foundResponse); sync1To0(1, true); messages = groupInvitationManager0.getInvitationMessages(contactId1From0); assertEquals(2, messages.size()); + foundResponse = false; for (InvitationMessage m : messages) { if (m instanceof GroupInvitationResponse) { + foundResponse = true; GroupInvitationResponse response = (GroupInvitationResponse) m; assertEquals(contactId0From1, response.getContactId()); assertFalse(response.isLocal()); assertFalse(response.wasAccepted()); } } + assertTrue(foundResponse); + // no invitations are open assertTrue(groupInvitationManager1.getInvitations().isEmpty()); // no groups were added @@ -136,24 +143,31 @@ public class GroupInvitationIntegrationTest extends BriarIntegrationTest { Collection<InvitationMessage> messages = groupInvitationManager1.getInvitationMessages(contactId0From1); assertEquals(2, messages.size()); + boolean foundResponse = false; for (InvitationMessage m : messages) { if (m instanceof GroupInvitationResponse) { + foundResponse = true; GroupInvitationResponse response = (GroupInvitationResponse) m; assertTrue(response.wasAccepted()); } } + assertTrue(foundResponse); sync1To0(1, true); messages = groupInvitationManager0.getInvitationMessages(contactId1From0); assertEquals(2, messages.size()); + foundResponse = false; for (InvitationMessage m : messages) { if (m instanceof GroupInvitationResponse) { + foundResponse = true; GroupInvitationResponse response = (GroupInvitationResponse) m; assertTrue(response.wasAccepted()); } } + assertTrue(foundResponse); + // no invitations are open assertTrue(groupInvitationManager1.getInvitations().isEmpty()); // group was added -- GitLab