Refactored Espresso tests and forced english language for all tests

federicoiosue · Feb 9, 2020 · 389fb4c · 389fb4c
1 parent 272a6e3
commit 389fb4c
Show file tree

Hide file tree

Showing 14 changed files with 282 additions and 320 deletions.
diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle
@@ -246,7 +246,7 @@ android.productFlavors.each { flavor ->
 apply plugin: 'jacoco-android'
 jacocoAndroidUnitTestReport {
     csv.enabled false
-    html.enabled true
+    html.enabled false
     xml.enabled true
 }
 jacoco {

diff --git a/omniNotes/src/androidTest/java/it/feio/android/omninotes/BaseAndroidTestCase.java b/omniNotes/src/androidTest/java/it/feio/android/omninotes/BaseAndroidTestCase.java
@@ -17,14 +17,19 @@
 
 package it.feio.android.omninotes;
 
-import static org.junit.Assert.assertFalse;
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+import static android.Manifest.permission.RECORD_AUDIO;
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import static java.util.Locale.ENGLISH;
 
-import android.Manifest;
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.test.core.app.ApplicationProvider;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.GrantPermissionRule;
 import it.feio.android.omninotes.db.DbHelper;
+import it.feio.android.omninotes.helpers.LanguageHelper;
 import it.feio.android.omninotes.utils.Constants;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -42,22 +47,20 @@ public class BaseAndroidTestCase {
 
   @Rule
   public GrantPermissionRule permissionRule = GrantPermissionRule.grant(
-      Manifest.permission.ACCESS_COARSE_LOCATION,
-      Manifest.permission.READ_EXTERNAL_STORAGE,
-      Manifest.permission.WRITE_EXTERNAL_STORAGE,
-      Manifest.permission.RECORD_AUDIO
+      ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION, READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE, RECORD_AUDIO
   );
 
   @BeforeClass
   public static void setUpBeforeClass () {
-    testContext = ApplicationProvider.getApplicationContext();
+    testContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
     prefs = testContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS);
     dbHelper = DbHelper.getInstance(testContext);
     prefs = testContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_PRIVATE);
 //		assertTrue("Database used for tests MUST not be the default one but prefixed by '" + DB_PREFIX + "'", dbHelper
 //				.getDatabase().getPath().matches(DB_PATH_REGEX));
 //    assertFalse("Database MUST be writable", dbHelper.getDatabase(true).isReadOnly());
 //    cleanDatabase();
+    LanguageHelper.updateLanguage(testContext, ENGLISH.toString());
   }
 
   @AfterClass

diff --git a/omniNotes/src/androidTest/java/it/feio/android/omninotes/CategoryLifecycleTest.java b/omniNotes/src/androidTest/java/it/feio/android/omninotes/CategoryLifecycleTest.java
diff --git a/...eio/android/omninotes/AutoBackupTest.java → .../android/omninotes/ui/AutoBackupTest.java b/...eio/android/omninotes/AutoBackupTest.java → .../android/omninotes/ui/AutoBackupTest.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.feio.android.omninotes;
+package it.feio.android.omninotes.ui;
 
 import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
@@ -37,8 +37,10 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.filters.LargeTest;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import it.feio.android.omninotes.R;
 import it.feio.android.omninotes.helpers.BackupHelper;
 import it.feio.android.omninotes.models.Note;
 import it.feio.android.omninotes.utils.Constants;
@@ -112,7 +114,7 @@ public void everyUpdateToNotesShouldTriggerAutobackup () throws InterruptedExcep
 
     // Category addition
 
-    onData(anything()).inAdapterView(withId(R.id.list)).atPosition(0).perform(click());
+    onData(anything()).inAdapterView(ViewMatchers.withId(R.id.list)).atPosition(0).perform(click());
 
     onView(allOf(withId(R.id.menu_category), withContentDescription(R.string.category),
         childAtPosition(