From 2140deb9856c17abf4a01a75aef401ecde467efb Mon Sep 17 00:00:00 2001 From: oliexdev Date: Fri, 1 Jun 2018 21:16:33 +0200 Subject: [PATCH 1/4] finalize add measurement use case test --- .../openscale/gui/AddMeasurementTest.java | 98 ++++++++++++++++--- .../com/health/openscale/gui/TestData.java | 33 +++++++ 2 files changed, 118 insertions(+), 13 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..fa4dc946 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 @@ -19,35 +19,50 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; -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; import android.widget.DatePicker; +import android.widget.EditText; +import android.widget.TimePicker; import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.gui.activities.BaseAppCompatActivity; +import com.health.openscale.gui.views.BicepsMeasurementView; +import com.health.openscale.gui.views.BoneMeasurementView; +import com.health.openscale.gui.views.Caliper1MeasurementView; +import com.health.openscale.gui.views.Caliper2MeasurementView; +import com.health.openscale.gui.views.Caliper3MeasurementView; +import com.health.openscale.gui.views.ChestMeasurementView; +import com.health.openscale.gui.views.CommentMeasurementView; +import com.health.openscale.gui.views.DateMeasurementView; +import com.health.openscale.gui.views.FatMeasurementView; +import com.health.openscale.gui.views.HipMeasurementView; +import com.health.openscale.gui.views.LBMMeasurementView; +import com.health.openscale.gui.views.MeasurementView; +import com.health.openscale.gui.views.MuscleMeasurementView; +import com.health.openscale.gui.views.NeckMeasurementView; +import com.health.openscale.gui.views.ThighMeasurementView; +import com.health.openscale.gui.views.TimeMeasurementView; +import com.health.openscale.gui.views.VisceralFatMeasurementView; +import com.health.openscale.gui.views.WaistMeasurementView; +import com.health.openscale.gui.views.WaterMeasurementView; +import com.health.openscale.gui.views.WeightMeasurementView; -import org.hamcrest.Description; -import org.hamcrest.Matcher; import org.hamcrest.Matchers; -import org.hamcrest.TypeSafeMatcher; import org.junit.After; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import java.util.Calendar; +import java.util.List; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; @@ -56,7 +71,6 @@ import static android.support.test.espresso.action.ViewActions.replaceText; import static android.support.test.espresso.action.ViewActions.scrollTo; import static android.support.test.espresso.matcher.ViewMatchers.withClassName; import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static org.hamcrest.Matchers.allOf; import static org.junit.Assert.assertEquals; @LargeTest @@ -79,8 +93,8 @@ public class AddMeasurementTest { openScale = OpenScale.getInstance(); - openScale.addScaleUser(male); - openScale.addScaleUser(female); + male.setId(openScale.addScaleUser(male)); + female.setId(openScale.addScaleUser(female)); // Set first start to true to get the user add dialog SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); @@ -88,19 +102,77 @@ public class AddMeasurementTest { .putBoolean("firstStart", false) .putString(BaseAppCompatActivity.PREFERENCE_LANGUAGE, "en") .putInt("selectedUserId", male.getId()) + .putBoolean(VisceralFatMeasurementView.KEY + "Enable", true) + .putBoolean(LBMMeasurementView.KEY + "Enable", true) + .putBoolean(BoneMeasurementView.KEY + "Enable", true) + .putBoolean(WaistMeasurementView.KEY + "Enable", true) + .putBoolean(HipMeasurementView.KEY + "Enable", true) + .putBoolean(ChestMeasurementView.KEY + "Enable", true) + .putBoolean(BicepsMeasurementView.KEY + "Enable", true) + .putBoolean(ThighMeasurementView.KEY + "Enable", true) + .putBoolean(NeckMeasurementView.KEY + "Enable", true) + .putBoolean(Caliper1MeasurementView.KEY + "Enable", true) + .putBoolean(Caliper2MeasurementView.KEY + "Enable", true) + .putBoolean(Caliper3MeasurementView.KEY + "Enable", true) .commit(); } + @After + public void addMeasurementVerification() { + List scaleMeasurementList = openScale.getScaleMeasurementList(); + assertEquals(1, scaleMeasurementList.size()); + + TestData.compareMeasurements(TestData.getMeasurement(1), scaleMeasurementList.get(0)); + } + @AfterClass - public static void addMeasurementVerification() { + public static void cleanup() { openScale.deleteScaleUser(male.getId()); openScale.deleteScaleUser(female.getId()); } @Test public void addMeasurementTest() { + ScaleMeasurement measurement = TestData.getMeasurement(1); onView(withId(R.id.action_add_measurement)).perform(click()); - ScaleMeasurement measurement = TestData.getMeasurement(1); + onView(withClassName(Matchers.equalTo(DateMeasurementView.class.getName()))).perform(scrollTo(), click()); + Calendar date = Calendar.getInstance(); + date.setTime(measurement.getDateTime()); + onView(withClassName(Matchers.equalTo(DatePicker.class.getName()))).perform(PickerActions.setDate(date.get(Calendar.YEAR), date.get(Calendar.MONTH)+1, date.get(Calendar.DAY_OF_MONTH))); + onView(withId(android.R.id.button1)).perform(click()); + + onView(withClassName(Matchers.equalTo(TimeMeasurementView.class.getName()))).perform(scrollTo(), click()); + onView(withClassName(Matchers.equalTo(TimePicker.class.getName()))).perform(PickerActions.setTime(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))); + onView(withId(android.R.id.button1)).perform(click()); + + setMeasuremntField(WeightMeasurementView.class.getName(), measurement.getWeight()); + setMeasuremntField(FatMeasurementView.class.getName(), measurement.getFat()); + setMeasuremntField(WaterMeasurementView.class.getName(), measurement.getWater()); + setMeasuremntField(MuscleMeasurementView.class.getName(), measurement.getMuscle()); + setMeasuremntField(LBMMeasurementView.class.getName(), measurement.getLbm()); + setMeasuremntField(BoneMeasurementView.class.getName(), measurement.getBone()); + setMeasuremntField(WaistMeasurementView.class.getName(), measurement.getWaist()); + setMeasuremntField(HipMeasurementView.class.getName(), measurement.getHip()); + setMeasuremntField(VisceralFatMeasurementView.class.getName(), measurement.getVisceralFat()); + setMeasuremntField(ChestMeasurementView.class.getName(), measurement.getChest()); + setMeasuremntField(ThighMeasurementView.class.getName(), measurement.getThigh()); + setMeasuremntField(BicepsMeasurementView.class.getName(), measurement.getBiceps()); + setMeasuremntField(NeckMeasurementView.class.getName(), measurement.getNeck()); + setMeasuremntField(Caliper1MeasurementView.class.getName(), measurement.getCaliper1()); + setMeasuremntField(Caliper2MeasurementView.class.getName(), measurement.getCaliper2()); + setMeasuremntField(Caliper3MeasurementView.class.getName(), measurement.getCaliper3()); + + onView(withClassName(Matchers.equalTo(CommentMeasurementView.class.getName()))).perform(scrollTo(), click()); + onView(withClassName(Matchers.equalTo(EditText.class.getName()))).perform(click(), replaceText(measurement.getComment()), closeSoftKeyboard()); + onView(withId(android.R.id.button1)).perform(click()); + + onView(withId(R.id.saveButton)).perform(click()); + } + + private void setMeasuremntField(String className, float value) { + onView(withClassName(Matchers.equalTo(className))).perform(scrollTo(), click()); + onView(withId(R.id.float_input)).perform(replaceText(String.valueOf(value)), closeSoftKeyboard()); + onView(withId(android.R.id.button1)).perform(click()); } } diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java index 7c96be62..deec71df 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java @@ -23,8 +23,11 @@ import java.util.Calendar; import java.util.Date; import java.util.Random; +import static org.junit.Assert.assertEquals; + public class TestData { private static Random rand = new Random(); + private static final double DELTA = 1e-15; public static ScaleUser getMaleUser() { ScaleUser male = new ScaleUser(); @@ -76,6 +79,7 @@ public class TestData { measurement.setHip(60.0f + getRandNumberInRange(0,50)); measurement.setChest(80.0f + getRandNumberInRange(0,50)); measurement.setThigh(40.0f + getRandNumberInRange(0,50)); + measurement.setVisceralFat(10 + getRandNumberInRange(0,5)); measurement.setBiceps(30.0f + getRandNumberInRange(0,50)); measurement.setNeck(15.0f + getRandNumberInRange(0,50)); measurement.setCaliper1(5.0f + getRandNumberInRange(0,10)); @@ -86,10 +90,35 @@ public class TestData { return measurement; } + public static void compareMeasurements(ScaleMeasurement measurementA, ScaleMeasurement measurementB) { + assertEquals(measurementA.getDateTime().getTime(), measurementB.getDateTime().getTime(), DELTA); + assertEquals(measurementA.getWeight(), measurementB.getWeight(), DELTA); + assertEquals(measurementA.getFat(), measurementB.getFat(), DELTA); + assertEquals(measurementA.getWater(), measurementB.getWater(), DELTA); + assertEquals(measurementA.getMuscle(), measurementB.getMuscle(), DELTA); + assertEquals(measurementA.getLbm(), measurementB.getLbm(), DELTA); + assertEquals(measurementA.getBone(), measurementB.getBone(), DELTA); + assertEquals(measurementA.getWaist(), measurementB.getWaist(), DELTA); + assertEquals(measurementA.getHip(), measurementB.getHip(), DELTA); + assertEquals(measurementA.getChest(), measurementB.getChest(), DELTA); + assertEquals(measurementA.getThigh(), measurementB.getThigh(), DELTA); + assertEquals(measurementA.getVisceralFat(), measurementB.getVisceralFat(), DELTA); + assertEquals(measurementA.getBiceps(), measurementB.getBiceps(), DELTA); + assertEquals(measurementA.getNeck(), measurementB.getNeck(), DELTA); + assertEquals(measurementA.getCaliper1(), measurementB.getCaliper1(), DELTA); + assertEquals(measurementA.getCaliper2(), measurementB.getCaliper2(), DELTA); + assertEquals(measurementA.getCaliper3(), measurementB.getCaliper3(), DELTA); + assertEquals(measurementA.getComment(), measurementB.getComment()); + } + private static Date getDateFromYears(int years) { Calendar currentTime = Calendar.getInstance(); currentTime.add(Calendar.YEAR, years); + currentTime.set(Calendar.HOUR_OF_DAY, 8); + currentTime.set(Calendar.MINUTE, 0); + currentTime.set(Calendar.MILLISECOND, 0); + currentTime.set(Calendar.SECOND, 0); return currentTime.getTime(); } @@ -98,6 +127,10 @@ public class TestData { Calendar currentTime = Calendar.getInstance(); currentTime.add(Calendar.DAY_OF_YEAR, days); + currentTime.set(Calendar.HOUR_OF_DAY, 8); + currentTime.set(Calendar.MINUTE, 0); + currentTime.set(Calendar.MILLISECOND, 0); + currentTime.set(Calendar.SECOND, 0); return currentTime.getTime(); } From f869974a584080e7cff656cff2ac120c62c6c159 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Fri, 1 Jun 2018 21:20:42 +0200 Subject: [PATCH 2/4] removed closeSoftKeyboard() --- .../java/com/health/openscale/gui/AddMeasurementTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 fa4dc946..0e192aa8 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 @@ -164,7 +164,7 @@ public class AddMeasurementTest { setMeasuremntField(Caliper3MeasurementView.class.getName(), measurement.getCaliper3()); onView(withClassName(Matchers.equalTo(CommentMeasurementView.class.getName()))).perform(scrollTo(), click()); - onView(withClassName(Matchers.equalTo(EditText.class.getName()))).perform(click(), replaceText(measurement.getComment()), closeSoftKeyboard()); + onView(withClassName(Matchers.equalTo(EditText.class.getName()))).perform(replaceText(measurement.getComment())); onView(withId(android.R.id.button1)).perform(click()); onView(withId(R.id.saveButton)).perform(click()); @@ -172,7 +172,7 @@ public class AddMeasurementTest { private void setMeasuremntField(String className, float value) { onView(withClassName(Matchers.equalTo(className))).perform(scrollTo(), click()); - onView(withId(R.id.float_input)).perform(replaceText(String.valueOf(value)), closeSoftKeyboard()); + onView(withId(R.id.float_input)).perform(replaceText(String.valueOf(value))); onView(withId(android.R.id.button1)).perform(click()); } } From 589081f7283c5e059522a416d05d302cc9f3de78 Mon Sep 17 00:00:00 2001 From: OliE Date: Sun, 3 Jun 2018 11:17:47 +0200 Subject: [PATCH 3/4] - add measurement female test - increase max hip value - set selected user immediately - if scale measurement list differs from the selected user get an updated measurement list --- .../openscale/gui/AddMeasurementTest.java | 67 +++++++++++++++---- .../com/health/openscale/gui/TestData.java | 2 +- .../com/health/openscale/core/OpenScale.java | 8 ++- .../gui/views/HipMeasurementView.java | 2 +- 4 files changed, 64 insertions(+), 15 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 0e192aa8..b7a0e375 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 @@ -31,6 +31,7 @@ import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleUser; +import com.health.openscale.core.utils.Converters; import com.health.openscale.gui.activities.BaseAppCompatActivity; import com.health.openscale.gui.views.BicepsMeasurementView; import com.health.openscale.gui.views.BoneMeasurementView; @@ -76,8 +77,6 @@ import static org.junit.Assert.assertEquals; @LargeTest @RunWith(AndroidJUnit4.class) public class AddMeasurementTest { - private static final double DELTA = 1e-15; - private static Context context; private static OpenScale openScale; @@ -101,7 +100,6 @@ public class AddMeasurementTest { prefs.edit() .putBoolean("firstStart", false) .putString(BaseAppCompatActivity.PREFERENCE_LANGUAGE, "en") - .putInt("selectedUserId", male.getId()) .putBoolean(VisceralFatMeasurementView.KEY + "Enable", true) .putBoolean(LBMMeasurementView.KEY + "Enable", true) .putBoolean(BoneMeasurementView.KEY + "Enable", true) @@ -117,14 +115,6 @@ public class AddMeasurementTest { .commit(); } - @After - public void addMeasurementVerification() { - List scaleMeasurementList = openScale.getScaleMeasurementList(); - assertEquals(1, scaleMeasurementList.size()); - - TestData.compareMeasurements(TestData.getMeasurement(1), scaleMeasurementList.get(0)); - } - @AfterClass public static void cleanup() { openScale.deleteScaleUser(male.getId()); @@ -132,7 +122,9 @@ public class AddMeasurementTest { } @Test - public void addMeasurementTest() { + public void addMeasurementMaleTest() { + openScale.selectScaleUser(male.getId()); + ScaleMeasurement measurement = TestData.getMeasurement(1); onView(withId(R.id.action_add_measurement)).perform(click()); @@ -168,6 +160,57 @@ public class AddMeasurementTest { onView(withId(android.R.id.button1)).perform(click()); onView(withId(R.id.saveButton)).perform(click()); + + List scaleMeasurementList = openScale.getScaleMeasurementList(); + assertEquals(1, scaleMeasurementList.size()); + + TestData.compareMeasurements(measurement, scaleMeasurementList.get(0)); + } + + @Test + public void addMeasurementFemaleTest() { + openScale.selectScaleUser(female.getId()); + + ScaleMeasurement measurement = TestData.getMeasurement(2); + onView(withId(R.id.action_add_measurement)).perform(click()); + + onView(withClassName(Matchers.equalTo(DateMeasurementView.class.getName()))).perform(scrollTo(), click()); + Calendar date = Calendar.getInstance(); + date.setTime(measurement.getDateTime()); + onView(withClassName(Matchers.equalTo(DatePicker.class.getName()))).perform(PickerActions.setDate(date.get(Calendar.YEAR), date.get(Calendar.MONTH)+1, date.get(Calendar.DAY_OF_MONTH))); + onView(withId(android.R.id.button1)).perform(click()); + + onView(withClassName(Matchers.equalTo(TimeMeasurementView.class.getName()))).perform(scrollTo(), click()); + onView(withClassName(Matchers.equalTo(TimePicker.class.getName()))).perform(PickerActions.setTime(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))); + onView(withId(android.R.id.button1)).perform(click()); + + setMeasuremntField(WeightMeasurementView.class.getName(), Converters.fromKilogram(measurement.getWeight(), Converters.WeightUnit.LB)); + setMeasuremntField(FatMeasurementView.class.getName(), measurement.getFat()); + setMeasuremntField(WaterMeasurementView.class.getName(), measurement.getWater()); + setMeasuremntField(MuscleMeasurementView.class.getName(), measurement.getMuscle()); + setMeasuremntField(LBMMeasurementView.class.getName(), Converters.fromKilogram(measurement.getLbm(), Converters.WeightUnit.LB)); + setMeasuremntField(BoneMeasurementView.class.getName(), Converters.fromKilogram(measurement.getBone(), Converters.WeightUnit.LB)); + setMeasuremntField(WaistMeasurementView.class.getName(), Converters.fromCentimeter(measurement.getWaist(), Converters.MeasureUnit.INCH)); + setMeasuremntField(HipMeasurementView.class.getName(), Converters.fromCentimeter(measurement.getHip(), Converters.MeasureUnit.INCH)); + setMeasuremntField(VisceralFatMeasurementView.class.getName(), measurement.getVisceralFat()); + setMeasuremntField(ChestMeasurementView.class.getName(), Converters.fromCentimeter(measurement.getChest(), Converters.MeasureUnit.INCH)); + setMeasuremntField(ThighMeasurementView.class.getName(), Converters.fromCentimeter(measurement.getThigh(), Converters.MeasureUnit.INCH)); + setMeasuremntField(BicepsMeasurementView.class.getName(), Converters.fromCentimeter(measurement.getBiceps(), Converters.MeasureUnit.INCH)); + setMeasuremntField(NeckMeasurementView.class.getName(), Converters.fromCentimeter(measurement.getNeck(), Converters.MeasureUnit.INCH)); + setMeasuremntField(Caliper1MeasurementView.class.getName(), Converters.fromCentimeter(measurement.getCaliper1(), Converters.MeasureUnit.INCH)); + setMeasuremntField(Caliper2MeasurementView.class.getName(), Converters.fromCentimeter(measurement.getCaliper2(), Converters.MeasureUnit.INCH)); + setMeasuremntField(Caliper3MeasurementView.class.getName(), Converters.fromCentimeter(measurement.getCaliper3(), Converters.MeasureUnit.INCH)); + + onView(withClassName(Matchers.equalTo(CommentMeasurementView.class.getName()))).perform(scrollTo(), click()); + onView(withClassName(Matchers.equalTo(EditText.class.getName()))).perform(replaceText(measurement.getComment())); + onView(withId(android.R.id.button1)).perform(click()); + + onView(withId(R.id.saveButton)).perform(click()); + + List scaleMeasurementList = openScale.getScaleMeasurementList(); + assertEquals(1, scaleMeasurementList.size()); + + TestData.compareMeasurements(measurement, scaleMeasurementList.get(0)); } private void setMeasuremntField(String className, float value) { diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java index deec71df..16c1d924 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/TestData.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; public class TestData { private static Random rand = new Random(); - private static final double DELTA = 1e-15; + private static final double DELTA = 1e-4; public static ScaleUser getMaleUser() { ScaleUser male = new ScaleUser(); diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index 247c319e..d8a810d1 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -160,7 +160,7 @@ public class OpenScale { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); prefs.edit().putInt("selectedUserId", userId).apply(); - selectedScaleUser = null; + selectedScaleUser = getScaleUser(userId); } public int getSelectedScaleUserId() { @@ -229,6 +229,12 @@ public class OpenScale { } public List getScaleMeasurementList() { + if (!scaleMeasurementList.isEmpty()) { + if (scaleMeasurementList.get(0).getUserId() != getSelectedScaleUserId()) { + scaleMeasurementList = measurementDAO.getAll(getSelectedScaleUserId()); + } + } + return scaleMeasurementList; } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java index 8dfa498d..36e18fe1 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java @@ -54,7 +54,7 @@ public class HipMeasurementView extends FloatMeasurementView { @Override protected float getMaxValue() { - return 200; + return 500; } @Override From be805a108b3c3fcd944a2812456eb2a39b21cd92 Mon Sep 17 00:00:00 2001 From: OliE Date: Mon, 8 Oct 2018 20:00:06 +0200 Subject: [PATCH 4/4] change deprecated import of LargeTest annotation --- .../java/com/health/openscale/gui/AddMeasurementTest.java | 2 +- .../androidTest/java/com/health/openscale/gui/AddUserTest.java | 2 +- .../java/com/health/openscale/gui/ScreenshotRecorder.java | 2 +- 3 files changed, 3 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 b7a0e375..3ef62437 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 @@ -22,7 +22,7 @@ import android.support.test.InstrumentationRegistry; 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.widget.DatePicker; import android.widget.EditText; import android.widget.TimePicker; 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..88f57378 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 @@ -25,7 +25,7 @@ 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;