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

Addressed review comments.

Browse Source
This commit is contained in:
akwizgran
2016-11-29 18:27:19 +00:00
parent 2850763ec6
commit edbd7f4eeb
8 changed files with 69 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java
View File

@@ -17,6 +17,7 @@ import java.util.Collection;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
import static junit.framework.TestCase.assertFalse;
import static org.briarproject.TestUtils.assertGroupCount;
import static org.junit.Assert.assertTrue;
public class ForumManagerTest extends BriarIntegrationTest {
@@ -24,9 +25,10 @@ public class ForumManagerTest extends BriarIntegrationTest {
private ForumManager forumManager0, forumManager1;
private ForumSharingManager forumSharingManager0, forumSharingManager1;
private Forum forum0;
private GroupId g;
private GroupId groupId0;
@Before
@Override
public void setUp() throws Exception {
super.setUp();
@@ -37,9 +39,9 @@ public class ForumManagerTest extends BriarIntegrationTest {
forum0 = forumManager0.addForum("Test Forum");
g = forum0.getId();
groupId0 = forum0.getId();
// share forum
forumSharingManager0.sendInvitation(g, contactId1From0, null);
forumSharingManager0.sendInvitation(groupId0, contactId1From0, null);
sync0To1(1, true);
forumSharingManager1.respondToInvitation(forum0, contact0From1, true);
sync1To0(1, true);
@@ -93,8 +95,7 @@ public class ForumManagerTest extends BriarIntegrationTest {
assertEquals(body1, hBody);
assertNull(h.getParentId());
assertTrue(h.isRead());
}
else {
} else {
assertEquals(h.getTimestamp(), ms2);
assertEquals(body2, hBody);
assertEquals(h.getParentId(), post2.getParent());
@@ -109,55 +110,55 @@ public class ForumManagerTest extends BriarIntegrationTest {
public void testForumPostDelivery() throws Exception {
// add one forum post
long time = clock.currentTimeMillis();
ForumPost post1 = createForumPost(g, null, "a", time);
ForumPost post1 = createForumPost(groupId0, null, "a", time);
forumManager0.addLocalPost(post1);
assertEquals(1, forumManager0.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertGroupCount(messageTracker0, g, 1, 0, time);
assertGroupCount(messageTracker1, g, 0, 0, 0);
assertEquals(1, forumManager0.getPostHeaders(groupId0).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
assertGroupCount(messageTracker0, groupId0, 1, 0, time);
assertGroupCount(messageTracker1, groupId0, 0, 0, 0);
// send post to 1
sync0To1(1, true);
assertEquals(1, forumManager1.getPostHeaders(g).size());
assertGroupCount(messageTracker1, g, 1, 1, time);
assertEquals(1, forumManager1.getPostHeaders(groupId0).size());
assertGroupCount(messageTracker1, groupId0, 1, 1, time);
// add another forum post
long time2 = clock.currentTimeMillis();
ForumPost post2 = createForumPost(g, null, "b", time2);
ForumPost post2 = createForumPost(groupId0, null, "b", time2);
forumManager1.addLocalPost(post2);
assertEquals(1, forumManager0.getPostHeaders(g).size());
assertEquals(2, forumManager1.getPostHeaders(g).size());
assertGroupCount(messageTracker0, g, 1, 0, time);
assertGroupCount(messageTracker1, g, 2, 1, time2);
assertEquals(1, forumManager0.getPostHeaders(groupId0).size());
assertEquals(2, forumManager1.getPostHeaders(groupId0).size());
assertGroupCount(messageTracker0, groupId0, 1, 0, time);
assertGroupCount(messageTracker1, groupId0, 2, 1, time2);
// send post to 0
sync1To0(1, true);
assertEquals(2, forumManager1.getPostHeaders(g).size());
assertGroupCount(messageTracker0, g, 2, 1, time2);
assertEquals(2, forumManager1.getPostHeaders(groupId0).size());
assertGroupCount(messageTracker0, groupId0, 2, 1, time2);
}
@Test
public void testForumPostDeliveredAfterParent() throws Exception {
// add one forum post without the parent
long time = clock.currentTimeMillis();
ForumPost post1 = createForumPost(g, null, "a", time);
ForumPost post2 = createForumPost(g, post1, "a", time);
ForumPost post1 = createForumPost(groupId0, null, "a", time);
ForumPost post2 = createForumPost(groupId0, post1, "a", time);
forumManager0.addLocalPost(post2);
assertEquals(1, forumManager0.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertEquals(1, forumManager0.getPostHeaders(groupId0).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
// send post to 1 without waiting for message delivery
sync0To1(1, false);
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
// now add the parent post as well
forumManager0.addLocalPost(post1);
assertEquals(2, forumManager0.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertEquals(2, forumManager0.getPostHeaders(groupId0).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
// and send it over to 1 and wait for a second message to be delivered
sync0To1(2, true);
assertEquals(2, forumManager1.getPostHeaders(g).size());
assertEquals(2, forumManager1.getPostHeaders(groupId0).size());
}
@Test
@@ -173,15 +174,15 @@ public class ForumManagerTest extends BriarIntegrationTest {
// add one forum post with a parent in another forum
long time = clock.currentTimeMillis();
ForumPost post1 = createForumPost(g1, null, "a", time);
ForumPost post = createForumPost(g, post1, "b", time);
ForumPost post = createForumPost(groupId0, post1, "b", time);
forumManager0.addLocalPost(post);
assertEquals(1, forumManager0.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertEquals(1, forumManager0.getPostHeaders(groupId0).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
// send the child post to 1
sync0To1(1, false);
assertEquals(1, forumManager0.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertEquals(1, forumManager0.getPostHeaders(groupId0).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
// now also add the parent post which is in another group
forumManager0.addLocalPost(post1);
@@ -190,10 +191,10 @@ public class ForumManagerTest extends BriarIntegrationTest {
// send posts to 1
sync0To1(1, true);
assertEquals(1, forumManager0.getPostHeaders(g).size());
assertEquals(1, forumManager0.getPostHeaders(groupId0).size());
assertEquals(1, forumManager0.getPostHeaders(g1).size());
// the next line is critical, makes sure post doesn't show up
assertEquals(0, forumManager1.getPostHeaders(g).size());
assertEquals(0, forumManager1.getPostHeaders(groupId0).size());
assertEquals(1, forumManager1.getPostHeaders(g1).size());
}