From 921e952b05849b82909000f4929c0b3497016652 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 5 Jan 2021 12:11:22 -0300 Subject: [PATCH] Rename ForumItem to ForumPostItem --- .../briar/android/forum/ForumActivity.java | 6 +-- .../briar/android/forum/ForumController.java | 4 +- .../android/forum/ForumControllerImpl.java | 12 ++--- .../{ForumItem.java => ForumPostItem.java} | 8 ++-- .../android/forum/ForumActivityTest.java | 45 +++++++++---------- .../android/forum/TestForumActivity.java | 2 +- 6 files changed, 38 insertions(+), 39 deletions(-) rename briar-android/src/main/java/org/briarproject/briar/android/forum/{ForumItem.java => ForumPostItem.java} (73%) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java index d8303da19..f77ac93e0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java @@ -38,7 +38,7 @@ import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_POST_TEX @MethodsNotNullByDefault @ParametersNotNullByDefault public class ForumActivity extends - ThreadListActivity> + ThreadListActivity> implements ForumListener { @Inject @@ -50,7 +50,7 @@ public class ForumActivity extends } @Override - protected ThreadListController getController() { + protected ThreadListController getController() { return forumController; } @@ -82,7 +82,7 @@ public class ForumActivity extends } @Override - protected ThreadItemAdapter createAdapter( + protected ThreadItemAdapter createAdapter( LinearLayoutManager layoutManager) { return new ThreadItemAdapter<>(this, layoutManager); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java index 5f11f4e1d..6658e60fc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java @@ -8,9 +8,9 @@ import org.briarproject.briar.api.forum.Forum; import androidx.annotation.UiThread; @NotNullByDefault -interface ForumController extends ThreadListController { +interface ForumController extends ThreadListController { - interface ForumListener extends ThreadListListener { + interface ForumListener extends ThreadListListener { @UiThread void onForumLeft(ContactId c); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java index 75551ef93..6ad325d5b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java @@ -43,7 +43,7 @@ import static org.briarproject.bramble.util.LogUtils.logException; @NotNullByDefault class ForumControllerImpl extends - ThreadListControllerImpl + ThreadListControllerImpl implements ForumController { private static final Logger LOG = @@ -138,8 +138,8 @@ class ForumControllerImpl extends @Override public void createAndStoreMessage(String text, - @Nullable ForumItem parentItem, - ResultExceptionHandler handler) { + @Nullable ForumPostItem parentItem, + ResultExceptionHandler handler) { runOnDbThread(() -> { try { LocalAuthor author = identityManager.getLocalAuthor(); @@ -158,7 +158,7 @@ class ForumControllerImpl extends private void createMessage(String text, long timestamp, @Nullable MessageId parentId, LocalAuthor author, - ResultExceptionHandler handler) { + ResultExceptionHandler handler) { cryptoExecutor.execute(() -> { LOG.info("Creating forum post..."); ForumPost msg = forumManager.createLocalPost(getGroupId(), text, @@ -178,8 +178,8 @@ class ForumControllerImpl extends } @Override - protected ForumItem buildItem(ForumPostHeader header, String text) { - return new ForumItem(header, text); + protected ForumPostItem buildItem(ForumPostHeader header, String text) { + return new ForumPostItem(header, text); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumPostItem.java similarity index 73% rename from briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java rename to briar-android/src/main/java/org/briarproject/briar/android/forum/ForumPostItem.java index 4dae7e7c1..03df1b0a0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumPostItem.java @@ -10,15 +10,15 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; @NotThreadSafe -class ForumItem extends ThreadItem { +class ForumPostItem extends ThreadItem { - ForumItem(ForumPostHeader h, String text) { + ForumPostItem(ForumPostHeader h, String text) { super(h.getId(), h.getParentId(), text, h.getTimestamp(), h.getAuthor(), h.getAuthorInfo(), h.isRead()); } - ForumItem(MessageId messageId, @Nullable MessageId parentId, String text, - long timestamp, Author author, AuthorInfo authorInfo) { + ForumPostItem(MessageId messageId, @Nullable MessageId parentId, + String text, long timestamp, Author author, AuthorInfo authorInfo) { super(messageId, parentId, text, timestamp, author, authorInfo, true); } diff --git a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java index 5a8892f9b..8c04d85b4 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java @@ -25,7 +25,6 @@ import org.robolectric.annotation.Config; import java.util.Arrays; import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN; import static org.briarproject.bramble.test.TestUtils.getAuthor; import static org.briarproject.bramble.test.TestUtils.getRandomId; @@ -68,7 +67,7 @@ public class ForumActivityTest { private TestForumActivity forumActivity; @Captor - private ArgumentCaptor, DbException>> + private ArgumentCaptor, DbException>> rc; @Before @@ -80,42 +79,42 @@ public class ForumActivityTest { intent).create().start().resume().get(); } - private ThreadItemList getDummyData() { - ForumItem[] forumItems = new ForumItem[6]; - for (int i = 0; i < forumItems.length; i++) { + private ThreadItemList getDummyData() { + ForumPostItem[] forumPostItems = new ForumPostItem[6]; + for (int i = 0; i < forumPostItems.length; i++) { Author author = getAuthor(); String text = getRandomString(MAX_FORUM_POST_TEXT_LENGTH); - forumItems[i] = new ForumItem(MESSAGE_IDS[i], PARENT_IDS[i], + forumPostItems[i] = new ForumPostItem(MESSAGE_IDS[i], PARENT_IDS[i], text, System.currentTimeMillis(), author, new AuthorInfo(UNKNOWN)); - forumItems[i].setLevel(LEVELS[i]); + forumPostItems[i].setLevel(LEVELS[i]); } - ThreadItemList list = new ThreadItemListImpl<>(); - list.addAll(Arrays.asList(forumItems)); + ThreadItemList list = new ThreadItemListImpl<>(); + list.addAll(Arrays.asList(forumPostItems)); return list; } @Test public void testNestedEntries() { ForumController mc = forumActivity.getController(); - ThreadItemList dummyData = getDummyData(); + ThreadItemList dummyData = getDummyData(); verify(mc, times(1)).loadItems(rc.capture()); rc.getValue().onResult(dummyData); - ThreadItemAdapter adapter = forumActivity.getAdapter(); + ThreadItemAdapter adapter = forumActivity.getAdapter(); Assert.assertNotNull(adapter); assertEquals(6, adapter.getItemCount()); - assertTrue(dummyData.get(0).getText() - .equals(adapter.getItemAt(0).getText())); - assertTrue(dummyData.get(1).getText() - .equals(adapter.getItemAt(1).getText())); - assertTrue(dummyData.get(2).getText() - .equals(adapter.getItemAt(2).getText())); - assertTrue(dummyData.get(3).getText() - .equals(adapter.getItemAt(3).getText())); - assertTrue(dummyData.get(4).getText() - .equals(adapter.getItemAt(4).getText())); - assertTrue(dummyData.get(5).getText() - .equals(adapter.getItemAt(5).getText())); + assertEquals(dummyData.get(0).getText(), + adapter.getItemAt(0).getText()); + assertEquals(dummyData.get(1).getText(), + adapter.getItemAt(1).getText()); + assertEquals(dummyData.get(2).getText(), + adapter.getItemAt(2).getText()); + assertEquals(dummyData.get(3).getText(), + adapter.getItemAt(3).getText()); + assertEquals(dummyData.get(4).getText(), + adapter.getItemAt(4).getText()); + assertEquals(dummyData.get(5).getText(), + adapter.getItemAt(5).getText()); } } diff --git a/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java b/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java index 7a04b4517..dd71be55f 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java @@ -27,7 +27,7 @@ public class TestForumActivity extends ForumActivity { return forumController; } - public ThreadItemAdapter getAdapter() { + public ThreadItemAdapter getAdapter() { return adapter; }