Skip to content

Commit 389fb4c

Browse files
committed
Refactored Espresso tests and forced english language for all tests
1 parent 272a6e3 commit 389fb4c

File tree

14 files changed

+282
-320
lines changed

14 files changed

+282
-320
lines changed

omniNotes/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ android.productFlavors.each { flavor ->
246246
apply plugin: 'jacoco-android'
247247
jacocoAndroidUnitTestReport {
248248
csv.enabled false
249-
html.enabled true
249+
html.enabled false
250250
xml.enabled true
251251
}
252252
jacoco {

omniNotes/src/androidTest/java/it/feio/android/omninotes/BaseAndroidTestCase.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,19 @@
1717

1818
package it.feio.android.omninotes;
1919

20-
import static org.junit.Assert.assertFalse;
20+
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
21+
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
22+
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
23+
import static android.Manifest.permission.RECORD_AUDIO;
24+
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
25+
import static java.util.Locale.ENGLISH;
2126

22-
import android.Manifest;
2327
import android.content.Context;
2428
import android.content.SharedPreferences;
25-
import androidx.test.core.app.ApplicationProvider;
29+
import androidx.test.platform.app.InstrumentationRegistry;
2630
import androidx.test.rule.GrantPermissionRule;
2731
import it.feio.android.omninotes.db.DbHelper;
32+
import it.feio.android.omninotes.helpers.LanguageHelper;
2833
import it.feio.android.omninotes.utils.Constants;
2934
import org.junit.AfterClass;
3035
import org.junit.BeforeClass;
@@ -42,22 +47,20 @@ public class BaseAndroidTestCase {
4247

4348
@Rule
4449
public GrantPermissionRule permissionRule = GrantPermissionRule.grant(
45-
Manifest.permission.ACCESS_COARSE_LOCATION,
46-
Manifest.permission.READ_EXTERNAL_STORAGE,
47-
Manifest.permission.WRITE_EXTERNAL_STORAGE,
48-
Manifest.permission.RECORD_AUDIO
50+
ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION, READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE, RECORD_AUDIO
4951
);
5052

5153
@BeforeClass
5254
public static void setUpBeforeClass () {
53-
testContext = ApplicationProvider.getApplicationContext();
55+
testContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
5456
prefs = testContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS);
5557
dbHelper = DbHelper.getInstance(testContext);
5658
prefs = testContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_PRIVATE);
5759
// assertTrue("Database used for tests MUST not be the default one but prefixed by '" + DB_PREFIX + "'", dbHelper
5860
// .getDatabase().getPath().matches(DB_PATH_REGEX));
5961
// assertFalse("Database MUST be writable", dbHelper.getDatabase(true).isReadOnly());
6062
// cleanDatabase();
63+
LanguageHelper.updateLanguage(testContext, ENGLISH.toString());
6164
}
6265

6366
@AfterClass

omniNotes/src/androidTest/java/it/feio/android/omninotes/CategoryLifecycleTest.java

Lines changed: 0 additions & 244 deletions
This file was deleted.

omniNotes/src/androidTest/java/it/feio/android/omninotes/AutoBackupTest.java renamed to omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/AutoBackupTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
package it.feio.android.omninotes;
18+
package it.feio.android.omninotes.ui;
1919

2020
import static androidx.test.espresso.Espresso.onData;
2121
import static androidx.test.espresso.Espresso.onView;
@@ -37,8 +37,10 @@
3737
import static org.junit.Assert.assertTrue;
3838

3939
import androidx.test.espresso.ViewInteraction;
40+
import androidx.test.espresso.matcher.ViewMatchers;
4041
import androidx.test.filters.LargeTest;
4142
import androidx.test.ext.junit.runners.AndroidJUnit4;
43+
import it.feio.android.omninotes.R;
4244
import it.feio.android.omninotes.helpers.BackupHelper;
4345
import it.feio.android.omninotes.models.Note;
4446
import it.feio.android.omninotes.utils.Constants;
@@ -112,7 +114,7 @@ public void everyUpdateToNotesShouldTriggerAutobackup () throws InterruptedExcep
112114

113115
// Category addition
114116

115-
onData(anything()).inAdapterView(withId(R.id.list)).atPosition(0).perform(click());
117+
onData(anything()).inAdapterView(ViewMatchers.withId(R.id.list)).atPosition(0).perform(click());
116118

117119
onView(allOf(withId(R.id.menu_category), withContentDescription(R.string.category),
118120
childAtPosition(

0 commit comments

Comments
 (0)