CI: Fix test failures

.github/workflows/build_and_test.yml

@@ -1,6 +1,6 @@
 name: Build jsc-android and test
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -27,7 +27,6 @@ jobs:
     - name: Install Android packages
       run: |
         sdkmanager \
-          "lldb;3.0" \
           "cmake;3.10.2.4988404"
       shell: bash
     - name: Build
@@ -44,7 +43,7 @@ jobs:
           mv dist.unstripped archive/
       shell: bash
 
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@v2
       with:
         name: archive
         path: archive
@@ -57,33 +56,15 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v2
       with:
         name: archive
         path: archive
 
-    - name: Launch AVD
-      run: |
-          source scripts/android-setup.sh
-          export PATH="${ANDROID_HOME}/emulator:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${PATH}"
-          export AVD_PACKAGES="system-images;android-${ANDROID_SDK_TARGET_API_LEVEL};google_apis;${AVD_ABI}"
-          sdkmanager "${AVD_PACKAGES}"
-          createAVD
-          launchAVD &
-      shell: bash
-
-    - name: Wait AVD
-      run: |
-        export PATH="${ANDROID_HOME}/emulator:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${PATH}"
-        source scripts/android-setup.sh
-        set +e +o pipefail
-        waitForAVD
-      shell: bash
-
     - name: Run test
-      run: |
-        mv archive/dist .
-        cd test
-        yarn
-        cd android && ./gradlew assembleDebug assembleAndroidTest connectedAndroidTest
-      shell: bash
+      uses: reactivecircus/android-emulator-runner@v2
+      with:
+        api-level: 16
+        arch: x86
+        disable-animations: false
+        script: mv archive/dist . && cd test && yarn && cd android && ./gradlew assembleRelease assembleAndroidTest connectedAndroidTest

test/android/app/build.gradle

@@ -164,6 +164,9 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
+    testBuildType 'release'
+
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -192,10 +195,10 @@ dependencies {
         implementation jscFlavor
     }
 
-    androidTestImplementation 'androidx.test:core:1.1.0';
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0';
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0';
+    androidTestImplementation 'androidx.test:core:1.3.0';
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2';
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0';
 }
 
 // Run this once to be able to run the application with BUCK

test/android/app/src/androidTest/java/com/test/SimpleTest.java

@@ -7,13 +7,13 @@
 
 import android.view.View;
 
-import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.util.TreeIterables;
 import androidx.test.espresso.util.HumanReadables;
 import androidx.test.filters.LargeTest;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import java.util.concurrent.TimeoutException;
@@ -29,10 +29,8 @@
 @LargeTest
 public class SimpleTest {
 
-    @Before
-    public void launchActivity() {
-      ActivityScenario.launch(MainActivity.class);
-    }
+    @Rule public ActivityScenarioRule<MainActivity> activityScenarioRule
+            = new ActivityScenarioRule<>(MainActivity.class);
 
     @Test
     public void testIfAppLoads() {