kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-12 17:08:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolving Deprecated API Usage

Browse Source 
Resolve Deprecated API Usage
This commit is contained in:
Adeel Zafar 2019-02-09 12:05:28 +05:00 committed by Isaac Hutt
parent cb026089d0
commit 5b5031a6db
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -65,8 +65,9 @@ dependencies {
} }
androidTestImplementation "androidx.annotation:annotation:$annotationVersion" androidTestImplementation "androidx.annotation:annotation:$annotationVersion"
androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation "androidx.test.ext:junit:1.1.0"
androidTestImplementation 'androidx.test:rules:1.1.1' androidTestImplementation 'androidx.test:rules:1.1.1'
androidTestImplementation 'androidx.test:core:1.1.0'
// Tab indicator // Tab indicator
implementation "com.pacioianu.david:ink-page-indicator:$inkPageIndicatorVersion" implementation "com.pacioianu.david:ink-page-indicator:$inkPageIndicatorVersion"
@ -380,6 +381,6 @@ testdroid {
testRunName "Auto Test " + buildNumber testRunName "Auto Test " + buildNumber
fullRunConfig { fullRunConfig {
instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" instrumentationRunner = "androidx.test.ext.runner.AndroidJUnitRunner"
} }
} }

6
app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/KiwixDatabaseTest.java
View File

@ -20,9 +20,9 @@
package org.kiwix.kiwixmobile.data.local; package org.kiwix.kiwixmobile.data.local;
import android.content.Context; import android.content.Context;
import androidx.test.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.yahoo.squidb.data.SquidCursor; import com.yahoo.squidb.data.SquidCursor;
import com.yahoo.squidb.sql.Query; import com.yahoo.squidb.sql.Query;
import java.io.BufferedWriter; import java.io.BufferedWriter;
@ -45,7 +45,7 @@ public class KiwixDatabaseTest {
private final Context context; private final Context context;
public KiwixDatabaseTest() { public KiwixDatabaseTest() {
context = InstrumentationRegistry.getTargetContext(); context = InstrumentationRegistry.getInstrumentation().getTargetContext();
} }
@Test @Test

14
app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/TestUtils.java
View File

@ -25,8 +25,8 @@ import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.util.Log; import android.util.Log;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.test.InstrumentationRegistry;
import androidx.test.espresso.matcher.BoundedMatcher; import androidx.test.espresso.matcher.BoundedMatcher;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.runner.screenshot.Screenshot; import androidx.test.runner.screenshot.Screenshot;
import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiDevice;
import androidx.test.uiautomator.UiObject; import androidx.test.uiautomator.UiObject;
@ -42,8 +42,6 @@ import org.hamcrest.Description;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book; import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
/** /**
* Created by mhutti1 on 07/04/17. * Created by mhutti1 on 07/04/17.
*/ */
@ -63,15 +61,17 @@ public class TestUtils {
*/ */
public static boolean hasStoragePermission() { public static boolean hasStoragePermission() {
return ContextCompat.checkSelfPermission(InstrumentationRegistry.getTargetContext(), return ContextCompat.checkSelfPermission(
InstrumentationRegistry.getInstrumentation().getTargetContext(),
Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
ContextCompat.checkSelfPermission(InstrumentationRegistry.getTargetContext(), ContextCompat.checkSelfPermission(
InstrumentationRegistry.getInstrumentation().getTargetContext(),
Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
} }
public static void allowPermissionsIfNeeded() { public static void allowPermissionsIfNeeded() {
if (Build.VERSION.SDK_INT >= 23 && !hasStoragePermission()) { if (Build.VERSION.SDK_INT >= 23 && !hasStoragePermission()) {
UiDevice device = UiDevice.getInstance(getInstrumentation()); UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
UiObject allowPermissions = UiObject allowPermissions =
device.findObject(new UiSelector().clickable(true).checkable(false).index(1)); device.findObject(new UiSelector().clickable(true).checkable(false).index(1));
if (allowPermissions.exists()) { if (allowPermissions.exists()) {
@ -139,7 +139,7 @@ public class TestUtils {
} }
public static String getResourceString(int id) { public static String getResourceString(int id) {
Context targetContext = InstrumentationRegistry.getTargetContext(); Context targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
return targetContext.getResources().getString(id); return targetContext.getResources().getString(id);
} }
} }