Fix tests

.github/scripts/run_tests.sh

@@ -1,42 +1,29 @@
-#
-# SPDX-FileCopyrightText: 2023 The Calyx Institute
-# SPDX-License-Identifier: Apache-2.0
-#
+echo "Settings transport to Seedvault..."
+index=0
 
-adb root
-sleep 5
-adb remount
-
-echo "Installing Seedvault app..."
-adb shell mkdir -p /system/priv-app/Seedvault
-adb push app/build/outputs/apk/release/app-release.apk /system/priv-app/Seedvault/Seedvault.apk
-
-echo "Installing Seedvault permissions..."
-adb push permissions_com.stevesoltys.seedvault.xml /system/etc/permissions/privapp-permissions-seedvault.xml
-adb push allowlist_com.stevesoltys.seedvault.xml /system/etc/sysconfig/allowlist-seedvault.xml
-
-echo "Setting Seedvault transport..."
-sleep 10
-adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
+adb shell bmgr autorestore false
+./gradlew --stacktrace :app:installDebugAndroidTest
+sleep 60
 
 D2D_BACKUP_TEST=$1
 
 large_test_exit_code=0
+#adb shell am instrument -w -e package com.stevesoltys.seedvault.e2e com.stevesoltys.seedvault.test/com.stevesoltys.seedvault.KoinInstrumentationTestRunner || large_test_exit_code=$?
 ./gradlew --stacktrace -Pinstrumented_test_size=large -Pd2d_backup_test="$D2D_BACKUP_TEST" :app:connectedAndroidTest || large_test_exit_code=$?
 
 adb pull /sdcard/seedvault_test_results
 
 if [ "$large_test_exit_code" -ne 0 ]; then
-    echo 'Large tests failed.'
-    exit 1
+  echo 'Large tests failed.'
+  exit 1
 fi
 
 medium_test_exit_code=0
 ./gradlew --stacktrace -Pinstrumented_test_size=medium :app:connectedAndroidTest || medium_test_exit_code=$?
 
 if [ "$medium_test_exit_code" -ne 0 ]; then
-    echo 'Medium tests failed.'
-    exit 1
+  echo 'Medium tests failed.'
+  exit 1
 fi
 
 exit 0

README.md

@@ -4,7 +4,7 @@
 A backup application for the [Android Open Source Project](https://source.android.com/).
 
 If you are having an issue/question, please look at our [FAQ](https://github.com/seedvault-app/seedvault/wiki/FAQ).
-
+ 
 ## Components
 
 * [Local Contacts Backup](contactsbackup) - an app that backs up local on-device contacts

app/development/scripts/install_app.sh

@@ -34,8 +34,6 @@ $ADB push $ROOT_PROJECT_DIR/app/build/outputs/apk/release/app-release.apk /syste
 echo "Installing Seedvault permissions..."
 $ADB push $ROOT_PROJECT_DIR/permissions_com.stevesoltys.seedvault.xml /system/etc/permissions/privapp-permissions-seedvault.xml
 $ADB push $ROOT_PROJECT_DIR/allowlist_com.stevesoltys.seedvault.xml /system/etc/sysconfig/allowlist-seedvault.xml
-$ADB shell am force-stop com.stevesoltys.seedvault
-$ADB shell am broadcast -a android.intent.action.BOOT_COMPLETED
 
-echo "Setting Seedvault transport..."
-$ADB shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
+#echo "Setting Seedvault transport..."
+#$ADB shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport

app/development/scripts/provision_emulator.sh

@@ -79,10 +79,10 @@ echo "Rebooting emulator..."
 $ADB reboot
 $ADB wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;'
 
-echo "Setting backup transport to Seedvault..."
-$ADB shell bmgr enable true
-sleep 5
-$ADB shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
+#echo "Setting backup transport to Seedvault..."
+$ADB shell bmgr enable false
+#sleep 5
+#$ADB shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
 
 echo "Downloading and extracting test backup to '/sdcard/seedvault_baseline'..."
 

app/src/androidTest/java/com/stevesoltys/seedvault/e2e/SeedvaultLargeTest.kt

@@ -16,6 +16,7 @@ import org.junit.rules.TestName
 import org.junit.runner.RunWith
 import org.koin.core.component.KoinComponent
 import java.io.File
+import java.lang.Thread.sleep
 import java.util.concurrent.atomic.AtomicBoolean
 
 @RunWith(AndroidJUnit4::class)
@@ -44,6 +45,11 @@ internal abstract class SeedvaultLargeTest :
         resetApplicationState()
         clearTestBackups()
 
+        runCommand("bmgr enable true")
+        sleep(60000)
+        runCommand("bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport")
+        sleep(60000)
+
         startRecordingTest(keepRecordingScreen, name.methodName)
         restoreBaselineBackup()
 

app/src/androidTest/java/com/stevesoltys/seedvault/e2e/impl/BackupRestoreTest.kt

@@ -6,6 +6,7 @@
 package com.stevesoltys.seedvault.e2e.impl
 
 import androidx.test.filters.LargeTest
+import com.stevesoltys.seedvault.MAGIC_PACKAGE_MANAGER
 import com.stevesoltys.seedvault.e2e.SeedvaultLargeTest
 import com.stevesoltys.seedvault.e2e.SeedvaultLargeTestResult
 import com.stevesoltys.seedvault.metadata.PackageState
@@ -127,17 +128,19 @@ internal class BackupRestoreTest : SeedvaultLargeTest() {
     ) {
         // Assert all "key/value" restored data matches the backup data.
         restore.kv.forEach { (pkg, kvData) ->
-            assert(backup.kv.containsKey(pkg)) {
-                "KV data for $pkg missing from backup."
-            }
-
-            kvData.forEach { (key, value) ->
-                assert(backup.kv[pkg]!!.containsKey(key)) {
-                    "KV data for $pkg/$key exists in restore but is missing from backup."
+            if (pkg != MAGIC_PACKAGE_MANAGER) {
+                assert(backup.kv.containsKey(pkg)) {
+                    "KV data for $pkg missing from backup."
                 }
 
-                assert(value.contentEquals(backup.kv[pkg]!![key]!!)) {
-                    "KV data for $pkg/$key does not match."
+                kvData.forEach { (key, value) ->
+                    assert(backup.kv[pkg]!!.containsKey(key)) {
+                        "KV data for $pkg/$key exists in restore but is missing from backup."
+                    }
+
+                    assert(value.contentEquals(backup.kv[pkg]!![key]!!)) {
+                        "KV data for $pkg/$key does not match."
+                    }
                 }
             }
         }

app/src/main/res/values/colors.xml

@@ -19,7 +19,7 @@
     <color name="statusBarColor">@color/primary</color>
     <!-- https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-14.0.0_r1/core/res/res/values/colors_device_defaults.xml#69 -->
     <!-- private resource, access it from colorError attribute instead -->
-    <color name="red">?android:attr/colorError</color>
+    <color name="red">@*android:color/error_color_device_default_dark</color>
     <!-- https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-14.0.0_r1/core/res/res/values/colors_device_defaults.xml#35 -->
     <color name="ic_launcher_background">@color/accent</color>