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

Tightened up test expectations.

Browse Source
This commit is contained in:
akwizgran
2016-11-30 11:17:57 +00:00
parent d51f73151f
commit 8a139eaf5d
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
briar-android-tests/src/test/java/org/briarproject/PrivateGroupIntegrationTest.java
View File

@@ -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.briarproject.api.privategroup.Visibility.REVEALED_BY_US;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/** /**
* This class tests how PrivateGroupManager and GroupInvitationManager * This class tests how PrivateGroupManager and GroupInvitationManager
@@ -40,6 +39,7 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
groupInvitationManager1, groupInvitationManager2; groupInvitationManager1, groupInvitationManager2;
@Before @Before
@Override
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
@@ -81,17 +81,23 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
// now the group has two members // now the group has two members
members = groupManager0.getMembers(groupId0); members = groupManager0.getMembers(groupId0);
assertEquals(2, members.size()); 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) { for (GroupMember m : members) {
if (m.getStatus() != OURSELVES) { if (m.getStatus() == OURSELVES) {
assertEquals(author0.getId(), m.getAuthor().getId()); assertEquals(author0.getId(), m.getAuthor().getId());
} else { } else {
assertEquals(author1.getId(), m.getAuthor().getId()); 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 @Test
@@ -161,12 +167,15 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
sync2To1(1, true); sync2To1(1, true);
headers = groupManager1.getHeaders(groupId0); headers = groupManager1.getHeaders(groupId0);
assertEquals(4, headers.size()); assertEquals(4, headers.size());
boolean foundPost = false;
for (GroupMessageHeader h : headers) { for (GroupMessageHeader h : headers) {
if (h instanceof JoinMessageHeader) continue; if (h instanceof JoinMessageHeader) continue;
foundPost = true;
assertEquals(time, h.getTimestamp()); assertEquals(time, h.getTimestamp());
assertEquals(groupId0, h.getGroupId()); assertEquals(groupId0, h.getGroupId());
assertEquals(author2.getId(), h.getAuthor().getId()); assertEquals(author2.getId(), h.getAuthor().getId());
} }
assertTrue(foundPost);
// message should sync from 1 to 0 without 2 being involved // message should sync from 1 to 0 without 2 being involved
sync1To0(1, true); sync1To0(1, true);
@@ -190,8 +199,7 @@ public class PrivateGroupIntegrationTest extends BriarIntegrationTest {
for (GroupMember m : members) { for (GroupMember m : members) {
if (m.getAuthor().getId().equals(a)) return m; if (m.getAuthor().getId().equals(a)) return m;
} }
fail(); throw new AssertionError();
throw new RuntimeException();
} }
} }