From 8a139eaf5d7aaf3dd48cd19698c874b0470e9368 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 30 Nov 2016 11:17:57 +0000
Subject: [PATCH] Tightened up test expectations.
---
.../PrivateGroupIntegrationTest.java | 24 ++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/briar-android-tests/src/test/java/org/briarproject/PrivateGroupIntegrationTest.java b/briar-android-tests/src/test/java/org/briarproject/PrivateGroupIntegrationTest.java
index 05234da663..f1b96df29f 100644
--- a/briar-android-tests/src/test/java/org/briarproject/PrivateGroupIntegrationTest.java
+++ b/briar-android-tests/src/test/java/org/briarproject/PrivateGroupIntegrationTest.java
@@ -25,7 +25,6 @@ import static org.briarproject.api.privategroup.Visibility.REVEALED_BY_CONTACT;
import static org.briarproject.api.privategroup.Visibility.REVEALED_BY_US;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
/**
* This class tests how PrivateGroupManager and GroupInvitationManager
@@ -40,6 +39,7 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
groupInvitationManager1, groupInvitationManager2;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -81,17 +81,23 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
// now the group has two members
members = groupManager0.getMembers(groupId0);
assertEquals(2, members.size());
- members = groupManager1.getMembers(groupId0);
- assertEquals(2, members.size());
-
- // make sure 1's member list is as expected
for (GroupMember m : members) {
- if (m.getStatus() != OURSELVES) {
+ if (m.getStatus() == OURSELVES) {
assertEquals(author0.getId(), m.getAuthor().getId());
} else {
assertEquals(author1.getId(), m.getAuthor().getId());
}
}
+
+ members = groupManager1.getMembers(groupId0);
+ assertEquals(2, members.size());
+ for (GroupMember m : members) {
+ if (m.getStatus() == OURSELVES) {
+ assertEquals(author1.getId(), m.getAuthor().getId());
+ } else {
+ assertEquals(author0.getId(), m.getAuthor().getId());
+ }
+ }
}
@Test
@@ -161,12 +167,15 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
sync2To1(1, true);
headers = groupManager1.getHeaders(groupId0);
assertEquals(4, headers.size());
+ boolean foundPost = false;
for (GroupMessageHeader h : headers) {
if (h instanceof JoinMessageHeader) continue;
+ foundPost = true;
assertEquals(time, h.getTimestamp());
assertEquals(groupId0, h.getGroupId());
assertEquals(author2.getId(), h.getAuthor().getId());
}
+ assertTrue(foundPost);
// message should sync from 1 to 0 without 2 being involved
sync1To0(1, true);
@@ -190,8 +199,7 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
for (GroupMember m : members) {
if (m.getAuthor().getId().equals(a)) return m;
}
- fail();
- throw new RuntimeException();
+ throw new AssertionError();
}
}
--
GitLab