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

merge with master and fixes after comments

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-09-27 23:34:00 +02:00
parent 33795e7046
commit 92f2e7b0fc
10 changed files with 186 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/test/java/org/briarproject/android/forum/ForumActivityTest.java
View File

@@ -7,7 +7,8 @@ import junit.framework.Assert;
import org.briarproject.BuildConfig;
import org.briarproject.TestUtils;
import org.briarproject.android.TestBriarApplication;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.api.db.DbException;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
import org.briarproject.api.sync.GroupId;
@@ -80,7 +81,8 @@ public class ForumActivityTest {
private TestForumActivity forumActivity;
@Captor
private ArgumentCaptor<UiResultHandler<List<ForumEntry>>> rc;
private ArgumentCaptor<UiResultExceptionHandler<List<ForumEntry>, DbException>>
rc;
@Before
public void setUp() {
@@ -91,7 +93,6 @@ public class ForumActivityTest {
.withIntent(intent).create().resume().get();
}
private List<ForumEntry> getDummyData() {
ForumEntry[] forumEntries = new ForumEntry[6];
for (int i = 0; i < forumEntries.length; i++) {