diff options
Diffstat (limited to 'app/src/test/java')
7 files changed, 80 insertions, 111 deletions
diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/TestUtil.java b/app/src/test/java/it/niedermann/nextcloud/deck/TestUtil.java index 25d237c99..bd7dd8cbe 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/TestUtil.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/TestUtil.java @@ -17,9 +17,9 @@ public class TestUtil { * @see <a href="https://gist.github.com/JoseAlcerreca/1e9ee05dcdd6a6a6fa1cbfc125559bba">Source</a> */ public static <T> T getOrAwaitValue(final LiveData<T> liveData) throws InterruptedException { - final Object[] data = new Object[1]; - final CountDownLatch latch = new CountDownLatch(1); - Observer<T> observer = new Observer<T>() { + final var data = new Object[1]; + final var latch = new CountDownLatch(1); + final var observer = new Observer<T>() { @Override public void onChanged(@Nullable T o) { data[0] = o; diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/api/ResponseCallbackTest.java b/app/src/test/java/it/niedermann/nextcloud/deck/api/ResponseCallbackTest.java index 47e1bcedf..7f7e068a0 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/api/ResponseCallbackTest.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/api/ResponseCallbackTest.java @@ -1,5 +1,15 @@ package it.niedermann.nextcloud.deck.api; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -11,23 +21,13 @@ import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.Board; import it.niedermann.nextcloud.deck.model.Card; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - @RunWith(RobolectricTestRunner.class) public class ResponseCallbackTest { @Test public void testFillAccountIDs() { final Account account = new Account(1337L); - ResponseCallback<Object> callback = new ResponseCallback<Object>(account) { + ResponseCallback<Object> callback = new ResponseCallback<>(account) { @Override public void onResponse(Object response) { fail("I didn't ask you!"); diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManagerTest.java b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManagerTest.java index 50cd2b779..13325fd7b 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManagerTest.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManagerTest.java @@ -1,5 +1,25 @@ package it.niedermann.nextcloud.deck.persistence.sync; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.accounts.NetworkErrorException; import android.content.Context; @@ -13,7 +33,6 @@ import com.google.common.util.concurrent.MoreExecutors; import com.nextcloud.android.sso.api.ParsedResponse; import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException; -import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -51,26 +70,6 @@ import it.niedermann.nextcloud.deck.persistence.sync.helpers.providers.AbstractS import it.niedermann.nextcloud.deck.persistence.sync.helpers.providers.CardDataProvider; import it.niedermann.nextcloud.deck.persistence.sync.helpers.providers.StackDataProvider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(RobolectricTestRunner.class) public class SyncManagerTest { @@ -289,7 +288,7 @@ public class SyncManagerTest { return null; }).when(serverAdapter).getCapabilities(anyString(), any()); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + syncManager.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { assertEquals("Capabilities from server must be returned to the original callback", @@ -314,7 +313,7 @@ public class SyncManagerTest { return null; }).when(serverAdapter).getCapabilities(anyString(), any()); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + syncManager.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { assertEquals("Capabilities from server must be returned to the original callback", @@ -340,7 +339,7 @@ public class SyncManagerTest { return null; }).when(serverAdapter).getCapabilities(anyString(), any()); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + syncManager.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { fail("In case of an HTTP 500 the callback must not be responded successfully."); @@ -363,7 +362,7 @@ public class SyncManagerTest { return null; }).when(serverAdapter).getCapabilities(anyString(), any()); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + syncManager.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { assertEquals(Version.of("20.0.1"), response.getNextcloudVersion()); @@ -385,7 +384,7 @@ public class SyncManagerTest { return null; }).when(serverAdapter).getCapabilities(anyString(), any()); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + syncManager.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { fail("In case of any other exception the callback must not be responded successfully."); @@ -402,7 +401,7 @@ public class SyncManagerTest { doThrow(new OfflineException()).when(serverAdapter).getCapabilities(anyString(), any()); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + syncManager.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { fail("In case of an " + OfflineException.class.getSimpleName() + " the callback must not be responded successfully."); @@ -450,14 +449,15 @@ public class SyncManagerTest { // Bad paths - assertThrows(IllegalArgumentException.class, () -> syncManagerSpy.synchronize(new ResponseCallback<Boolean>(new Account(null)) { + assertThrows(IllegalArgumentException.class, () -> syncManagerSpy.synchronize(new ResponseCallback<>(new Account(null)) { @Override public void onResponse(Boolean response) { } })); - assertThrows(IllegalArgumentException.class, () -> syncManagerSpy.synchronize(new ResponseCallback<Boolean>(null) { + //noinspection ConstantConditions + assertThrows(IllegalArgumentException.class, () -> syncManagerSpy.synchronize(new ResponseCallback<>(null) { @Override public void onResponse(Boolean response) { @@ -493,7 +493,7 @@ public class SyncManagerTest { } @Override - public <T extends IRemoteEntity> void doSyncFor(@NonNull @NotNull AbstractSyncDataProvider<T> provider) { + public <U extends IRemoteEntity> void doSyncFor(@NonNull AbstractSyncDataProvider<U> provider) { if (success) { cb.onResponse(true); } else { @@ -502,7 +502,7 @@ public class SyncManagerTest { } @Override - public <T extends IRemoteEntity> void doUpSyncFor(@NonNull @NotNull AbstractSyncDataProvider<T> provider) { + public <U extends IRemoteEntity> void doUpSyncFor(@NonNull AbstractSyncDataProvider<U> provider) { if (success) { cb.onResponse(true); } else { diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapterTest.java b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapterTest.java index 5bbcc4e17..d15765d2c 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapterTest.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapterTest.java @@ -1,5 +1,10 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db; +import static org.junit.Assert.assertEquals; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createAccount; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createBoard; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createUser; + import android.content.Context; import androidx.room.Room; @@ -19,6 +24,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutorService; @@ -29,11 +35,6 @@ import it.niedermann.nextcloud.deck.model.full.FullBoard; import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity; import it.niedermann.nextcloud.deck.model.interfaces.IRemoteEntity; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createAccount; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createBoard; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createUser; -import static org.junit.Assert.assertEquals; - @RunWith(RobolectricTestRunner.class) public class DataBaseAdapterTest { @@ -75,9 +76,7 @@ public class DataBaseAdapterTest { final User user = createUser(db.getUserDao(), createAccount(db.getAccountDao())); final StringBuilder builder = new StringBuilder(); final List<Object> args = new ArrayList<>(1); - final List<? extends AbstractRemoteEntity> entities = new ArrayList<AbstractRemoteEntity>(1) {{ - add(user); - }}; + final List<? extends AbstractRemoteEntity> entities = Collections.singletonList(user); final Method fillSqlWithListValues = DataBaseAdapter.class.getDeclaredMethod("fillSqlWithListValues", StringBuilder.class, Collection.class, List.class); fillSqlWithListValues.setAccessible(true); @@ -105,14 +104,10 @@ public class DataBaseAdapterTest { @Test public void testFillSqlWithMultipleListValues() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { - final User user = createUser(db.getUserDao(), createAccount(db.getAccountDao())); - final StringBuilder builder = new StringBuilder(); - final List<Object> args = new ArrayList<>(2); - final Long leet = 1337L; - final List<?> entities = new ArrayList<Long>(2) {{ - add(leet); - add(leet + 1); - }}; + final var builder = new StringBuilder(); + final var args = new ArrayList<>(2); + final long leet = 1337L; + final var entities = List.of(leet, leet + 1); final Method fillSqlWithListValues = DataBaseAdapter.class.getDeclaredMethod("fillSqlWithListValues", StringBuilder.class, Collection.class, List.class); fillSqlWithListValues.setAccessible(true); diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabaseTestUtil.java b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabaseTestUtil.java index 7cb6d8483..cb377a8f3 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabaseTestUtil.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabaseTestUtil.java @@ -1,13 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.Observer; import java.util.Random; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.Board; @@ -28,29 +23,6 @@ public class DeckDatabaseTestUtil { // Util class } - /** - * @see <a href="https://gist.github.com/JoseAlcerreca/1e9ee05dcdd6a6a6fa1cbfc125559bba">Source</a> - */ - public static <T> T getOrAwaitValue(final LiveData<T> liveData) throws InterruptedException { - final Object[] data = new Object[1]; - final CountDownLatch latch = new CountDownLatch(1); - Observer<T> observer = new Observer<T>() { - @Override - public void onChanged(@Nullable T o) { - data[0] = o; - latch.countDown(); - liveData.removeObserver(this); - } - }; - liveData.observeForever(observer); - // Don't wait indefinitely if the LiveData is not set. - if (!latch.await(2, TimeUnit.SECONDS)) { - throw new RuntimeException("LiveData value was never set."); - } - //noinspection unchecked - return (T) data[0]; - } - public static Account createAccount(@NonNull AccountDao dao) { final Account accountToCreate = new Account(); accountToCreate.setName(randomString(15) + " " + randomString(15)); diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDaoTest.java b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDaoTest.java index a65756df3..9d6e84ab6 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDaoTest.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDaoTest.java @@ -1,17 +1,18 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; + import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import it.niedermann.nextcloud.deck.TestUtil; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.ocs.Capabilities; import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; - @RunWith(RobolectricTestRunner.class) public class AccountDaoTest extends AbstractDaoTest { @@ -39,13 +40,13 @@ public class AccountDaoTest extends AbstractDaoTest { @Test public void testGetAccountById() throws InterruptedException { final Account account = DeckDatabaseTestUtil.createAccount(db.getAccountDao()); - assertEquals(account.getName(), DeckDatabaseTestUtil.getOrAwaitValue(db.getAccountDao().getAccountById(account.getId())).getName()); + assertEquals(account.getName(), TestUtil.getOrAwaitValue(db.getAccountDao().getAccountById(account.getId())).getName()); } @Test public void testGetAccountByName() throws InterruptedException { final Account account = DeckDatabaseTestUtil.createAccount(db.getAccountDao()); - assertEquals(account.getUserName(), DeckDatabaseTestUtil.getOrAwaitValue(db.getAccountDao().getAccountByName(account.getName())).getUserName()); + assertEquals(account.getUserName(), TestUtil.getOrAwaitValue(db.getAccountDao().getAccountByName(account.getName())).getUserName()); } @Test @@ -54,7 +55,7 @@ public class AccountDaoTest extends AbstractDaoTest { for (int i = 0; i < expectedCount; i++) { DeckDatabaseTestUtil.createAccount(db.getAccountDao()); } - assertEquals(expectedCount, DeckDatabaseTestUtil.getOrAwaitValue(db.getAccountDao().getAllAccounts()).size()); + assertEquals(expectedCount, TestUtil.getOrAwaitValue(db.getAccountDao().getAllAccounts()).size()); } @Test @@ -72,7 +73,7 @@ public class AccountDaoTest extends AbstractDaoTest { for (int i = 0; i < expectedCount; i++) { DeckDatabaseTestUtil.createAccount(db.getAccountDao()); } - assertEquals(Integer.valueOf(expectedCount), DeckDatabaseTestUtil.getOrAwaitValue(db.getAccountDao().countAccounts())); + assertEquals(Integer.valueOf(expectedCount), TestUtil.getOrAwaitValue(db.getAccountDao().countAccounts())); } @Test diff --git a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDaoTest.java b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDaoTest.java index e87fb06df..171a080e4 100644 --- a/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDaoTest.java +++ b/app/src/test/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDaoTest.java @@ -1,5 +1,14 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createAccount; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createBoard; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createCard; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createStack; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createUser; + import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -7,6 +16,7 @@ import org.robolectric.RobolectricTestRunner; import java.time.Instant; import java.util.List; +import it.niedermann.nextcloud.deck.TestUtil; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.Board; import it.niedermann.nextcloud.deck.model.Card; @@ -15,15 +25,6 @@ import it.niedermann.nextcloud.deck.model.User; import it.niedermann.nextcloud.deck.model.enums.DBStatus; import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createAccount; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createBoard; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createCard; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createStack; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DeckDatabaseTestUtil.createUser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - @RunWith(RobolectricTestRunner.class) public class BoardDaoTest extends AbstractDaoTest { @@ -65,7 +66,7 @@ public class BoardDaoTest extends AbstractDaoTest { boardVisibleArchived.setArchived(true); db.getBoardDao().update(boardInVisible1, boardInVisible2, boardInVisible3, boardVisibleArchived); - final List<Board> boards = DeckDatabaseTestUtil.getOrAwaitValue(db.getBoardDao().getBoardsForAccount(account.getId())); + final List<Board> boards = TestUtil.getOrAwaitValue(db.getBoardDao().getBoardsForAccount(account.getId())); assertEquals(4, boards.size()); assertTrue(boards.stream().anyMatch((board -> boardVisible1.getLocalId().equals(board.getLocalId())))); assertTrue(boards.stream().anyMatch((board -> boardVisible2.getLocalId().equals(board.getLocalId())))); @@ -96,7 +97,7 @@ public class BoardDaoTest extends AbstractDaoTest { board4.setArchived(true); db.getBoardDao().update(board5, board6, board7, board4); - final List<Board> boards = DeckDatabaseTestUtil.getOrAwaitValue(db.getBoardDao().getArchivedBoardsForAccount(account.getId())); + final List<Board> boards = TestUtil.getOrAwaitValue(db.getBoardDao().getArchivedBoardsForAccount(account.getId())); assertEquals(1, boards.size()); assertFalse(boards.stream().anyMatch((board -> board1.getLocalId().equals(board.getLocalId())))); assertFalse(boards.stream().anyMatch((board -> board2.getLocalId().equals(board.getLocalId())))); @@ -127,7 +128,7 @@ public class BoardDaoTest extends AbstractDaoTest { board4.setArchived(true); db.getBoardDao().update(board5, board6, board7, board4); - final List<Board> boards = DeckDatabaseTestUtil.getOrAwaitValue(db.getBoardDao().getNonArchivedBoardsForAccount(account.getId())); + final List<Board> boards = TestUtil.getOrAwaitValue(db.getBoardDao().getNonArchivedBoardsForAccount(account.getId())); assertEquals(3, boards.size()); assertTrue(boards.stream().anyMatch((board -> board1.getLocalId().equals(board.getLocalId())))); assertTrue(boards.stream().anyMatch((board -> board2.getLocalId().equals(board.getLocalId())))); @@ -146,7 +147,7 @@ public class BoardDaoTest extends AbstractDaoTest { final Stack stack = createStack(db.getStackDao(), account, board); final Card card = createCard(db.getCardDao(), account, stack); - assertEquals(board.getLocalId(), DeckDatabaseTestUtil.getOrAwaitValue(db.getBoardDao().getLocalBoardIdByCardRemoteIdAndAccountId(card.getId(), account.getId()))); + assertEquals(board.getLocalId(), TestUtil.getOrAwaitValue(db.getBoardDao().getLocalBoardIdByCardRemoteIdAndAccountId(card.getId(), account.getId()))); } @Test @@ -169,6 +170,6 @@ public class BoardDaoTest extends AbstractDaoTest { board4.setArchived(true); db.getBoardDao().update(board5, board6, board7, board4); - assertEquals(Integer.valueOf(1), DeckDatabaseTestUtil.getOrAwaitValue(db.getBoardDao().countArchivedBoards(account.getId()))); + assertEquals(Integer.valueOf(1), TestUtil.getOrAwaitValue(db.getBoardDao().countArchivedBoards(account.getId()))); } } |