Working on #586: Check/implement what other CI/CD automation might be needed, removed TF from UI test builds

Author: Antonis

Examples/restcomm-olympus/app/build.gradle

@@ -49,7 +49,8 @@ android {
         buildConfigField "String", "TEST_RESTCOMM_PASSWORD", TEST_RESTCOMM_PASSWORD
         buildConfigField "String", "TEST_RESTCOMM_ACCOUNT_SID", TEST_RESTCOMM_ACCOUNT_SID
         buildConfigField "String", "TEST_RESTCOMM_AUTH_TOKEN", TEST_RESTCOMM_AUTH_TOKEN
-        //buildConfigField "String", "TEST_MESSAGE_VERIFICATION", TEST_MESSAGE_VERIFICATION
+        buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", ENABLE_TEST_FAIRY_RUNTIME
+
 
 
         // ICE_USERNAME & ICE_PASSWORD are defined in project gradle.properties, but also overriden in global gradle.properties

Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/MainActivity.java

@@ -96,7 +96,9 @@ protected void onCreate(Bundle savedInstanceState)
 
       // For TestFairy troubleshooting. IMPORTANT: remove for production apps, as TestFairy sends logs, screenshots, etc to their servers
       //TestFairy.begin(this, "#TESTFAIRY_APP_TOKEN");
-      TestFairy.begin(this, "52d3ee1de1b7681d1fcbbc3295b2b86a0aa43fcc");
+      if (BuildConfig.ENABLE_TEST_FAIRY_RUNTIME) {
+         TestFairy.begin(this, "52d3ee1de1b7681d1fcbbc3295b2b86a0aa43fcc");
+      }
 
       Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
       setSupportActionBar(toolbar);

Examples/restcomm-olympus/gradle.properties

@@ -36,6 +36,8 @@ TEST_RESTCOMM_PASSWORD = "1234"
 TEST_RESTCOMM_ACCOUNT_SID = ""
 TEST_RESTCOMM_AUTH_TOKEN = ""
 
+# When this is true, then when Olympus App starts it will bootstrap TestFairy facilities
+ENABLE_TEST_FAIRY_RUNTIME = true
 
 # Android version name & code: For official builds, this gets overwritten by global settings and/or environment variables
 # When using double quotes in this one the generated BuildConfig.java get's messed up (has 2 double quotes and breaks the build)

scripts/handle-ui-tests.bash

@@ -24,8 +24,9 @@ fi
 cd Examples/restcomm-olympus || exit 1 # && wait_with_output ./gradlew app:connectedAndroidTest 
 
 # Build App and Test .apk files (remember that for instrumented tests we need 2 apks one of the actual App under test and another for the testing logic)
+# Important: we don't want TestFairy to be enabled in runtime for Olympus UI tests: a. Because we don't care since we can get logs from Firebase, b. TF messes up our tests because it presents some UI elements (like auto update dialog)
 echo "-- Build App and Test .apk files"
-./gradlew --quiet -x androidJavadocs -x signArchives -x uploadArchives assembleDebug assembleDebugAndroidTest
+./gradlew --quiet -x androidJavadocs -x signArchives -x uploadArchives assembleDebug assembleDebugAndroidTest -PENABLE_TEST_FAIRY_RUNTIME=false
 if [ $? -ne 0 ]
 then
 	echo "-- Failed to build Olympus for UI tests."