@@ -122,8 +122,10 @@ class DatabaseMigrationTest {
122122 )
123123
124124 testHelper.runMigrationsAndValidate(
125- AppDatabase .DATABASE_NAME , Migrations .DB_VER_6 ,
126- true , Migrations .MIGRATION_5_6
125+ AppDatabase .DATABASE_NAME ,
126+ Migrations .DB_VER_9 ,
127+ true ,
128+ Migrations .MIGRATION_8_9
127129 )
128130
129131 val migratedDatabaseV3 = getMigratedDatabase()
@@ -209,6 +211,11 @@ class DatabaseMigrationTest {
209211 true , Migrations .MIGRATION_7_8
210212 )
211213
214+ testHelper.runMigrationsAndValidate(
215+ AppDatabase .DATABASE_NAME , Migrations .DB_VER_9 ,
216+ true , Migrations .MIGRATION_8_9
217+ )
218+
212219 val migratedDatabaseV8 = getMigratedDatabase()
213220 val listFromDB = migratedDatabaseV8.searchHistoryDAO().all.blockingFirst()
214221
@@ -220,25 +227,27 @@ class DatabaseMigrationTest {
220227
221228 @Test
222229 fun migrateDatabaseFrom8to9 () {
223- val databaseInV5 = testHelper.createDatabase(AppDatabase .DATABASE_NAME , Migrations .DB_VER_5 )
230+ val databaseInV8 = testHelper.createDatabase(AppDatabase .DATABASE_NAME , Migrations .DB_VER_8 )
224231
225232 val localUid1: Long
226233 val localUid2: Long
227234 val remoteUid1: Long
228235 val remoteUid2: Long
229- databaseInV5 .run {
236+ databaseInV8 .run {
230237 localUid1 = insert(
231238 " playlists" , SQLiteDatabase .CONFLICT_FAIL ,
232239 ContentValues ().apply {
233240 put(" name" , DEFAULT_NAME + " 1" )
234- put(" thumbnail_url" , DEFAULT_THUMBNAIL )
241+ put(" is_thumbnail_permanent" , false )
242+ put(" thumbnail_stream_id" , - 1 )
235243 }
236244 )
237245 localUid2 = insert(
238246 " playlists" , SQLiteDatabase .CONFLICT_FAIL ,
239247 ContentValues ().apply {
240248 put(" name" , DEFAULT_NAME + " 2" )
241- put(" thumbnail_url" , DEFAULT_THUMBNAIL )
249+ put(" is_thumbnail_permanent" , false )
250+ put(" thumbnail_stream_id" , - 1 )
242251 }
243252 )
244253 delete(
@@ -267,33 +276,35 @@ class DatabaseMigrationTest {
267276 }
268277
269278 testHelper.runMigrationsAndValidate(
270- AppDatabase .DATABASE_NAME , Migrations .DB_VER_6 ,
271- true , Migrations .MIGRATION_5_6
279+ AppDatabase .DATABASE_NAME ,
280+ Migrations .DB_VER_9 ,
281+ true ,
282+ Migrations .MIGRATION_8_9
272283 )
273284
274- val migratedDatabaseV6 = getMigratedDatabase()
275- var localListFromDB = migratedDatabaseV6 .playlistDAO().all.blockingFirst()
276- var remoteListFromDB = migratedDatabaseV6 .playlistRemoteDAO().all.blockingFirst()
285+ val migratedDatabaseV9 = getMigratedDatabase()
286+ var localListFromDB = migratedDatabaseV9 .playlistDAO().all.blockingFirst()
287+ var remoteListFromDB = migratedDatabaseV9 .playlistRemoteDAO().all.blockingFirst()
277288
278289 assertEquals(1 , localListFromDB.size)
279290 assertEquals(localUid2, localListFromDB[0 ].uid)
280- assertEquals(0 , localListFromDB[0 ].displayIndex)
291+ assertEquals(- 1 , localListFromDB[0 ].displayIndex)
281292 assertEquals(1 , remoteListFromDB.size)
282293 assertEquals(remoteUid1, remoteListFromDB[0 ].uid)
283- assertEquals(0 , remoteListFromDB[0 ].displayIndex)
294+ assertEquals(- 1 , remoteListFromDB[0 ].displayIndex)
284295
285- val localUid3 = migratedDatabaseV6 .playlistDAO().insert(
286- PlaylistEntity (DEFAULT_NAME + " 3" , DEFAULT_THUMBNAIL , - 1 )
296+ val localUid3 = migratedDatabaseV9 .playlistDAO().insert(
297+ PlaylistEntity (DEFAULT_NAME + " 3" , false , - 1 , - 1 )
287298 )
288- val remoteUid3 = migratedDatabaseV6 .playlistRemoteDAO().insert(
299+ val remoteUid3 = migratedDatabaseV9 .playlistRemoteDAO().insert(
289300 PlaylistRemoteEntity (
290301 DEFAULT_THIRD_SERVICE_ID , DEFAULT_NAME , DEFAULT_THIRD_URL ,
291302 DEFAULT_THUMBNAIL , DEFAULT_UPLOADER_NAME , - 1 , 10
292303 )
293304 )
294305
295- localListFromDB = migratedDatabaseV6 .playlistDAO().all.blockingFirst()
296- remoteListFromDB = migratedDatabaseV6 .playlistRemoteDAO().all.blockingFirst()
306+ localListFromDB = migratedDatabaseV9 .playlistDAO().all.blockingFirst()
307+ remoteListFromDB = migratedDatabaseV9 .playlistRemoteDAO().all.blockingFirst()
297308 assertEquals(2 , localListFromDB.size)
298309 assertEquals(localUid3, localListFromDB[1 ].uid)
299310 assertEquals(- 1 , localListFromDB[1 ].displayIndex)
0 commit comments