From 2fe37f6c26aa3b581ca90fb830b0499e83b9b564 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 5 Jul 2017 14:17:35 +0100 Subject: [PATCH 1/2] Set applicationId to match app_package. --- briar-android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 44e63f4e4..1bda7d5e5 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -80,6 +80,7 @@ android { targetSdkVersion 22 versionCode 15 versionName "0.15" + applicationId "org.briarproject.briar.beta" resValue "string", "app_package", "org.briarproject.briar.beta" buildConfigField "String", "GitHash", "\"${getGitHash()}\"" } From 5678f8aaa49e5e37988966ac9d72490f157a8364 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 5 Jul 2017 14:40:03 +0100 Subject: [PATCH 2/2] Update Robolectric tests so they can find resources. --- .../briarproject/briar/android/forum/ForumActivityTest.java | 3 ++- .../briar/android/login/ChangePasswordActivityTest.java | 3 ++- .../briarproject/briar/android/login/SetupActivityTest.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java index fe5d064c3..68c362b6f 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java @@ -36,7 +36,8 @@ import static org.mockito.Mockito.verify; @RunWith(RobolectricGradleTestRunner.class) @Config(constants = BuildConfig.class, sdk = 21, - application = TestBriarApplication.class) + application = TestBriarApplication.class, + packageName = "org.briarproject.briar") public class ForumActivityTest { private final static String AUTHOR_1 = "Author 1"; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java index 572192188..24c84835a 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java @@ -41,7 +41,8 @@ import static org.mockito.Mockito.when; @RunWith(RobolectricGradleTestRunner.class) @Config(constants = BuildConfig.class, sdk = 21, - application = TestBriarApplication.class) + application = TestBriarApplication.class, + packageName = "org.briarproject.briar") public class ChangePasswordActivityTest { private static final int TIMEOUT_MS = 10 * 1000; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java index 2d500c998..7841d792b 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java @@ -47,7 +47,8 @@ import static org.robolectric.Shadows.shadowOf; @RunWith(RobolectricGradleTestRunner.class) @Config(constants = BuildConfig.class, sdk = 21, - application = TestBriarApplication.class) + application = TestBriarApplication.class, + packageName = "org.briarproject.briar") public class SetupActivityTest { private static final int TIMEOUT_MS = 10 * 1000;