From 93e37038ea9205dd26ed408f18b52a83e939c956 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sun, 29 Apr 2018 00:30:42 +0200 Subject: [PATCH] Set language in preferences for user add test --- .../com/health/openscale/gui/UserAddTest.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java index f0e105f0..9548acfa 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java @@ -34,6 +34,7 @@ import android.widget.DatePicker; import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleUser; +import com.health.openscale.gui.activities.BaseAppCompatActivity; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -68,25 +69,16 @@ public class UserAddTest { @Rule public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(MainActivity.class, false, false); - private void setLanguage(String language, String country) { - Locale locale = new Locale(language, country); - Locale.setDefault(locale); - Resources res = context.getResources(); - Configuration config = res.getConfiguration(); - config.locale = locale; - res.updateConfiguration(config, res.getDisplayMetrics()); - } - @Before public void initTest() { context = InstrumentationRegistry.getTargetContext(); - // set app language to English - setLanguage("en", "EN"); - // Set first start to true to get the user add dialog SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - prefs.edit().putBoolean("firstStart", true).commit(); + prefs.edit() + .putBoolean("firstStart", true) + .putString(BaseAppCompatActivity.PREFERENCE_LANGUAGE, "en") + .commit(); } @After