From f073148c4e0f0b505ce27a11980481b1d74b3aba Mon Sep 17 00:00:00 2001 From: OliE Date: Sun, 7 Oct 2018 13:18:06 +0200 Subject: [PATCH] change deprecated import of LargeTest annotation --- .../java/com/health/openscale/gui/AddMeasurementTest.java | 2 +- .../java/com/health/openscale/gui/AddUserTest.java | 2 +- .../java/com/health/openscale/gui/ScreenshotRecorder.java | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java index e0b914ed..93333e3d 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java @@ -23,7 +23,6 @@ import android.support.test.espresso.ViewInteraction; import android.support.test.espresso.contrib.PickerActions; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; @@ -46,6 +45,7 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import android.support.test.filters.LargeTest; import java.util.Calendar; diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java index 54a7089f..79da11bf 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java @@ -25,7 +25,7 @@ import android.support.test.espresso.ViewInteraction; import android.support.test.espresso.contrib.PickerActions; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; -import android.test.suitebuilder.annotation.LargeTest; +import android.support.test.filters.LargeTest; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java index 732e41ad..d83a50df 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java @@ -15,17 +15,19 @@ */ package com.health.openscale.gui; +import android.Manifest; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Bitmap; import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ActivityTestRule; +import android.support.test.rule.GrantPermissionRule; import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.screenshot.BasicScreenCaptureProcessor; import android.support.test.runner.screenshot.ScreenCapture; import android.support.test.runner.screenshot.Screenshot; -import android.test.suitebuilder.annotation.LargeTest; +import android.support.test.filters.LargeTest; import android.view.Gravity; import com.health.openscale.R; @@ -74,6 +76,9 @@ public class ScreenshotRecorder { @Rule public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(MainActivity.class, false , false); + @Rule + public GrantPermissionRule permissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE); + @Before public void initRecorder() { context = InstrumentationRegistry.getTargetContext();