Run all API levels

Author: seladb

.github/workflows/builtAndTest.yml

@@ -12,7 +12,7 @@ jobs:
   build-and-test-client:
     strategy:
       matrix:
-        api-level: [33]
+        api-level: [30, 33, 35]
 
     runs-on: ubuntu-latest
 
@@ -65,10 +65,12 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
-          script: |
-            adb logcat -c
-            adb logcat &
-            gradle -is connectedCheck
+          script: ./gradlew -is connectedCheck
+  # Uncomment to enable logs
+  #          script: |
+  #            adb logcat -c
+  #            adb logcat &
+  #            gradle -is connectedCheck
 
   build-server:
     runs-on: ubuntu-latest

app/src/androidTest/java/com/pcapplusplus/toyvpn/ToyVpnServiceManagerTest.kt

@@ -137,15 +137,15 @@ class ToyVpnServiceManagerTest {
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "Before sending first broadcast")
             context.sendBroadcast(intent)
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "After sending first broadcast")
-            waitFor(timeoutMillis = 20000L) { serviceManager.vpnServiceState.value == VpnConnectionState.CONNECTED }
+            waitFor { serviceManager.vpnServiceState.value == VpnConnectionState.CONNECTED }
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "Passed first waitFor")
-            waitFor(timeoutMillis = 20000L) { serviceManager.clientAddress.value == "10.0.0.1" }
+            waitFor { serviceManager.clientAddress.value == "10.0.0.1" }
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "Passed second waitFor")
 
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "Before sending second broadcast")
             context.sendBroadcast(Intent(BroadcastActions.VPN_SERVICE_STOPPED))
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "After sending second broadcast")
-            waitFor(timeoutMillis = 20000L) { serviceManager.vpnServiceState.value == VpnConnectionState.DISCONNECTED }
+            waitFor { serviceManager.vpnServiceState.value == VpnConnectionState.DISCONNECTED }
             Log.e("TestReceiveVpnStartedAndStoppedEvent", "Passed third waitFor")
         }