From 14ffc7023b4d8e62e555ca9a325fcdcd68f2dce6 Mon Sep 17 00:00:00 2001
From: Tobias_Groza <304016-Tobias_Groza@noreply.gitlab.com>
Date: Fri, 9 Aug 2024 13:41:53 +0200
Subject: [PATCH] Update tests to use new db schema and migrations

---
 .../java/org/fdroid/database/MultiRepoMigrationTest.kt      | 6 +++---
 .../org/fdroid/database/RepoCertNonNullMigrationTest.kt     | 2 +-
 .../main/java/org/fdroid/database/FDroidDatabaseHolder.kt   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/database/src/dbTest/java/org/fdroid/database/MultiRepoMigrationTest.kt b/libs/database/src/dbTest/java/org/fdroid/database/MultiRepoMigrationTest.kt
index ce162ab9e..696bb05a5 100644
--- a/libs/database/src/dbTest/java/org/fdroid/database/MultiRepoMigrationTest.kt
+++ b/libs/database/src/dbTest/java/org/fdroid/database/MultiRepoMigrationTest.kt
@@ -232,7 +232,7 @@ internal class MultiRepoMigrationTest {
 
         // now get the Room DB, so we can use our DAOs for verifying the migration
         databaseBuilder(getApplicationContext(), FDroidDatabaseInt::class.java, TEST_DB)
-            .addMigrations(MIGRATION_2_3)
+            .addMigrations(MIGRATION_2_3, MIGRATION_5_6)
             .allowMainThreadQueries()
             .build()
             .use { db ->
@@ -275,7 +275,7 @@ internal class MultiRepoMigrationTest {
 
         // now get the Room DB, so we can use our DAOs for verifying the migration
         databaseBuilder(getApplicationContext(), FDroidDatabaseInt::class.java, TEST_DB)
-            .addMigrations(MIGRATION_2_3)
+            .addMigrations(MIGRATION_2_3, MIGRATION_5_6)
             .allowMainThreadQueries()
             .build().use { db ->
                 // repo without cert did not get migrated, because we auto-migrate to latest version
@@ -311,7 +311,7 @@ internal class MultiRepoMigrationTest {
 
         // now get the Room DB, so we can use our DAOs for verifying the migration
         databaseBuilder(getApplicationContext(), FDroidDatabaseInt::class.java, TEST_DB)
-            .addMigrations(MIGRATION_2_3)
+            .addMigrations(MIGRATION_2_3, MIGRATION_5_6)
             .allowMainThreadQueries()
             .build().use { db ->
                 check(db)
diff --git a/libs/database/src/dbTest/java/org/fdroid/database/RepoCertNonNullMigrationTest.kt b/libs/database/src/dbTest/java/org/fdroid/database/RepoCertNonNullMigrationTest.kt
index 72d59b7b6..d49eea2fb 100644
--- a/libs/database/src/dbTest/java/org/fdroid/database/RepoCertNonNullMigrationTest.kt
+++ b/libs/database/src/dbTest/java/org/fdroid/database/RepoCertNonNullMigrationTest.kt
@@ -74,7 +74,7 @@ internal class RepoCertNonNullMigrationTest {
 
         // now get the Room DB, so we can use our DAOs for verifying the migration
         Room.databaseBuilder(getApplicationContext(), FDroidDatabaseInt::class.java, TEST_DB)
-            .addMigrations(MIGRATION_2_3)
+            .addMigrations(MIGRATION_2_3, MIGRATION_5_6)
             .allowMainThreadQueries()
             .build().use { db ->
                 // repo without cert did not get migrated, the other one did
diff --git a/libs/database/src/main/java/org/fdroid/database/FDroidDatabaseHolder.kt b/libs/database/src/main/java/org/fdroid/database/FDroidDatabaseHolder.kt
index a8f87c3cf..bbb15f422 100644
--- a/libs/database/src/main/java/org/fdroid/database/FDroidDatabaseHolder.kt
+++ b/libs/database/src/main/java/org/fdroid/database/FDroidDatabaseHolder.kt
@@ -58,7 +58,7 @@ public object FDroidDatabaseHolder {
                 FDroidDatabaseInt::class.java,
                 name,
             ).apply {
-                addMigrations(MIGRATION_2_3)
+                addMigrations(MIGRATION_2_3, MIGRATION_5_6)
                 // We allow destructive migration (if no real migration was provided),
                 // so we have the option to nuke the DB in production (if that will ever be needed).
                 fallbackToDestructiveMigration()