From db53e79d1d6584f89df7b16531d3edd711ccbf98 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 7 Jan 2021 17:00:57 -0300 Subject: [PATCH] Remove ForumActivityTest which provided little value anyway --- .../briar/android/activity/BaseActivity.java | 7 - .../android/forum/ForumActivityTest.java | 120 ------------------ .../android/forum/TestForumActivity.java | 65 ---------- 3 files changed, 192 deletions(-) delete mode 100644 briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java index 594154f36..08f196e18 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java @@ -14,7 +14,6 @@ import org.briarproject.briar.android.BriarApplication; import org.briarproject.briar.android.DestroyableContext; import org.briarproject.briar.android.Localizer; import org.briarproject.briar.android.controller.ActivityLifecycleController; -import org.briarproject.briar.android.forum.ForumModule; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment; import org.briarproject.briar.android.util.UiUtils; @@ -87,7 +86,6 @@ public abstract class BaseActivity extends AppCompatActivity activityComponent = DaggerActivityComponent.builder() .androidComponent(applicationComponent) .activityModule(getActivityModule()) - .forumModule(getForumModule()) .build(); injectActivity(activityComponent); super.onCreate(state); @@ -122,11 +120,6 @@ public abstract class BaseActivity extends AppCompatActivity return new ActivityModule(this); } - // TODO use a test module where this is used in tests - protected ForumModule getForumModule() { - return new ForumModule(); - } - @Override protected void onStart() { super.onStart(); 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 50c4c80fc..e69de29bb 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 @@ -1,120 +0,0 @@ -package org.briarproject.briar.android.forum; - -import android.content.Intent; - -import junit.framework.Assert; - -import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.identity.Author; -import org.briarproject.briar.api.identity.AuthorInfo; -import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; -import org.briarproject.briar.android.threaded.ThreadItemAdapter; -import org.briarproject.briar.android.threaded.ThreadItemList; -import org.briarproject.briar.android.threaded.ThreadItemListImpl; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; - -import java.util.Arrays; - -import static junit.framework.Assert.assertEquals; -import static org.briarproject.briar.api.identity.AuthorInfo.Status.UNKNOWN; -import static org.briarproject.bramble.test.TestUtils.getAuthor; -import static org.briarproject.bramble.test.TestUtils.getRandomId; -import static org.briarproject.bramble.util.StringUtils.getRandomString; -import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_POST_TEXT_LENGTH; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -@RunWith(RobolectricTestRunner.class) -@Config(sdk = 21) -public class ForumActivityTest { - - private final static MessageId[] MESSAGE_IDS = new MessageId[6]; - - static { - for (int i = 0; i < MESSAGE_IDS.length; i++) - MESSAGE_IDS[i] = new MessageId(getRandomId()); - } - - private final static MessageId[] PARENT_IDS = { - null, - MESSAGE_IDS[0], - MESSAGE_IDS[1], - MESSAGE_IDS[2], - MESSAGE_IDS[0], - null - }; - - /* - 1 - -> 2 - -> 3 - -> 4 - 5 - 6 - */ - private final static int[] LEVELS = { - 0, 1, 2, 3, 1, 0 - }; - - private TestForumActivity forumActivity; - @Captor - private ArgumentCaptor, DbException>> - rc; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - Intent intent = new Intent(); - intent.putExtra("briar.GROUP_ID", getRandomId()); - forumActivity = Robolectric.buildActivity(TestForumActivity.class, - intent).create().start().resume().get(); - } - - 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); - forumPostItems[i] = new ForumPostItem(MESSAGE_IDS[i], PARENT_IDS[i], - text, System.currentTimeMillis(), author, - new AuthorInfo(UNKNOWN)); - forumPostItems[i].setLevel(LEVELS[i]); - } - ThreadItemList list = new ThreadItemListImpl<>(); - list.addAll(Arrays.asList(forumPostItems)); - return list; - } - - @Test - public void testNestedEntries() { - ForumController mc = forumActivity.getController(); - ThreadItemList dummyData = getDummyData(); - verify(mc, times(1)).loadItems(rc.capture()); - rc.getValue().onResult(dummyData); - ThreadItemAdapter adapter = forumActivity.getAdapter(); - Assert.assertNotNull(adapter); - assertEquals(6, adapter.getItemCount()); - 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 deleted file mode 100644 index dd71be55f..000000000 --- a/briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.briarproject.briar.android.forum; - -import android.os.Bundle; - -import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; -import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.briar.R; -import org.briarproject.briar.android.activity.ActivityModule; -import org.briarproject.briar.android.activity.BaseActivity; -import org.briarproject.briar.android.controller.BriarController; -import org.briarproject.briar.android.controller.BriarControllerImpl; -import org.briarproject.briar.android.threaded.ThreadItemAdapter; -import org.mockito.Mockito; - -import javax.annotation.Nullable; - -/** - * This class exposes the ForumController and offers the possibility to - * override it. - */ -@MethodsNotNullByDefault -@ParametersNotNullByDefault -public class TestForumActivity extends ForumActivity { - - @Override - public ForumController getController() { - return forumController; - } - - public ThreadItemAdapter getAdapter() { - return adapter; - } - - @Override - public void onCreate(@Nullable Bundle state) { - setTheme(R.style.BriarTheme_NoActionBar); - super.onCreate(state); - } - - @Override - protected ActivityModule getActivityModule() { - return new ActivityModule(this) { - - @Override - protected BriarController provideBriarController( - BriarControllerImpl briarController) { - BriarController c = Mockito.mock(BriarController.class); - Mockito.when(c.accountSignedIn()).thenReturn(true); - return c; - } - - }; - } - - @Override - protected ForumModule getForumModule() { - return new ForumModule() { - @Override - ForumController provideForumController(BaseActivity activity, - ForumControllerImpl forumController) { - return Mockito.mock(ForumController.class); - } - }; - } -}