From 2e6742f2ef222384599b1b53014f4081dab614ba Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Thu, 8 Aug 2019 14:24:45 +0100 Subject: [PATCH] #1212 resolve compilation errors --- .../kiwix/kiwixmobile/BookDatabaseTest.java | 45 ------------------- .../data/local/dao/BookDaoTest.java | 1 + .../settings/KiwixSettingsActivityTest.java | 1 + 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 app/src/androidTest/java/org/kiwix/kiwixmobile/BookDatabaseTest.java diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/BookDatabaseTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/BookDatabaseTest.java deleted file mode 100644 index 326eb04eb..000000000 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/BookDatabaseTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Kiwix Android - * Copyright (C) 2018 Kiwix - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.kiwix.kiwixmobile; - -import android.content.Context; -import androidx.test.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.kiwix.kiwixmobile.data.local.KiwixDatabase; -import org.kiwix.kiwixmobile.data.local.dao.BookDao; -import org.kiwix.kiwixmobile.data.local.entity.BookDatabaseEntity; -import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import static org.junit.Assert.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -@RunWith(AndroidJUnit4.class) -public class BookDatabaseTest diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java index 56897a773..eb43a4705 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java @@ -32,6 +32,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import static org.junit.Assert.assertEquals; +import static org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java index a939e3699..f3d2cf6a7 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.java @@ -27,6 +27,7 @@ import org.kiwix.kiwixmobile.main.MainActivity; import static androidx.test.espresso.Espresso.onData; import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.matcher.PreferenceMatchers.withKey; +import static com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is;