[tor-commits] [Git][tpo/applications/fenix][tor-browser-84.0.0b2-10.5-1] 3 commits: Bug 40123: Allow building the instrumented tests apks for variants other than debug

Matthew Finkel pushed to branch tor-browser-84.0.0b2-10.5-1 at The Tor Project / Applications / fenix

Commits:

623da161

by Alex Catarineu at 2020-12-02T20:42:03+01:00

Bug 40123: Allow building the instrumented tests apks for variants other than debug

This allows to specify the variant of the instrumented tests via
a `testBuildType` gradle argument. It also applies a workaround for
a R8 issue from https://issuetracker.google.com/issues/140851070.

238126dc

by Alex Catarineu at 2020-12-02T20:42:09+01:00

fixup! Bug 40073: Use correct branding on About page

80ecb57c

by Matthew Finkel at 2020-12-03T16:35:27+00:00

Merge remote-tracking branch 'acatgl/40123+1' into tor-browser-84.0.0b2-10.5-1

3 changed files:

app/build.gradle
app/proguard-rules.pro
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt

Changes:

app/build.gradle

@@ -17,7 +17,16 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory
  import static org.gradle.api.tasks.testing.TestResult.ResultType
 +def obtainTestBuildType() {
 +    def result = "debug";
 +    if (project.hasProperty("testBuildType")) {
 +        result = project.getProperties().get("testBuildType")
 +    }
 +    result
 +}
++
  android {
 +    testBuildType obtainTestBuildType()
      compileSdkVersion Config.compileSdkVersion
      defaultConfig {
          applicationId "org.torproject"

app/proguard-rules.pro

@@ -119,4 +119,7 @@
  # Keep Android Lifecycle methods
  # https://bugzilla.mozilla.org/show_bug.cgi?id=1596302
 --keep class androidx.lifecycle.** { *; }
 \ No newline at end of file
 +-keep class androidx.lifecycle.** { *; }
++
 +# Workaround for 'already has mapping' r8 issue (https://issuetracker.google.com/issues/140851070)
 +-keep class com.google.android.gms.common.internal.BaseGmsClient { *; }
 \ No newline at end of file

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt


 }
 
 private fun assertProductCompany() {
-    onView(withId(R.id.tor_about_content))
-        .check(matches(withText(containsString("Firefox Preview is produced by the Tor Project."))))
+    onView(withId(R.id.about_content))
+        .check(matches(withText(containsString("Tor Browser Nightly is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit."))))
 }
 
 private fun assertCurrentTimestamp() {

...	...	@@ -107,8 +107,8 @@ private fun assertVersionNumber() {
107	107	}
108	108
109	109	private fun assertProductCompany() {
110		- onView(withId(R.id.tor_about_content))
111		- .check(matches(withText(containsString("Firefox Preview is produced by the Tor Project."))))
	110	+ onView(withId(R.id.about_content))
	111	+ .check(matches(withText(containsString("Tor Browser Nightly is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit."))))
112	112	}
113	113
114	114	private fun assertCurrentTimestamp() {