Bump targetSdk to 32

Also fix some warnings, e.g. shadowed variables.

uhabits-android/build.gradle.kts

@@ -38,7 +38,7 @@ android {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 31
+        targetSdk = 32
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt

@@ -20,7 +20,6 @@ package org.isoron.uhabits.acceptance.steps
 
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES
 import androidx.annotation.StringRes
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso
@@ -33,11 +32,11 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers
 import org.isoron.uhabits.BaseUserInterfaceTest
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.habits.list.ListHabitsActivity
+import org.junit.Assert.assertTrue
 
 object CommonSteps : BaseUserInterfaceTest() {
     fun pressBack() {
@@ -148,15 +147,19 @@ object CommonSteps : BaseUserInterfaceTest() {
             Screen.LIST_HABITS ->
                 Espresso.onView(ViewMatchers.withClassName(CoreMatchers.endsWith("ListHabitsRootView")))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             Screen.SHOW_HABIT ->
                 Espresso.onView(ViewMatchers.withId(R.id.subtitleCard))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             Screen.EDIT_HABIT ->
                 Espresso.onView(ViewMatchers.withId(R.id.questionInput))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             Screen.SELECT_HABIT_TYPE ->
                 Espresso.onView(ViewMatchers.withText(R.string.yes_or_no_example))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             else -> throw IllegalStateException()
         }
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt

@@ -21,9 +21,9 @@ package org.isoron.uhabits.acceptance.steps
 import android.os.Build.VERSION.SDK_INT
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.isoron.uhabits.BaseUserInterfaceTest
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 
 object WidgetSteps {
     @Throws(Exception::class)

uhabits-core/build.gradle.kts

@@ -62,6 +62,7 @@ kotlin {
                 implementation("org.hamcrest:hamcrest:2.2")
                 implementation("org.apache.commons:commons-io:1.3.2")
                 implementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
+                implementation("org.junit.jupiter:junit-jupiter:5.8.1")
             }
         }
     }

uhabits-core/src/jvmMain/java/org/isoron/platform/io/JavaFiles.kt

@@ -82,8 +82,8 @@ class JavaUserFile(val path: Path) : UserFile {
 @Suppress("NewApi")
 class JavaFileOpener : FileOpener {
     override fun openUserFile(path: String): UserFile {
-        val path = Paths.get("/tmp/$path")
-        return JavaUserFile(path)
+        val resolvedPath = Paths.get("/tmp/$path")
+        return JavaUserFile(resolvedPath)
     }
 
     override fun openResourceFile(path: String): ResourceFile {

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/SQLParser.kt

@@ -45,14 +45,14 @@ internal class Tokenizer(
         if (s == null || s.isEmpty()) {
             return false
         }
-        if (s[0].toInt() != mCurrent) {
+        if (s[0].code != mCurrent) {
             return false
         }
         val len = s.length
         mStream.mark(len - 1)
         for (n in 1 until len) {
             val value = mStream.read()
-            if (value != s[n].toInt()) {
+            if (value != s[n].code) {
                 mStream.reset()
                 return false
             }
@@ -68,10 +68,9 @@ object SQLParser {
     private const val STATE_COMMENT_BLOCK = 3
 
     fun parse(stream: InputStream): List<String> {
-        val buffer = BufferedInputStream(stream)
         val commands: MutableList<String> = ArrayList()
         val sb = StringBuffer()
-        buffer.use { buffer ->
+        BufferedInputStream(stream).use { buffer ->
             val tokenizer = Tokenizer(buffer)
             var state = STATE_NONE
             while (tokenizer.hasNext()) {

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/Task.kt

@@ -25,5 +25,5 @@ fun interface Task {
     fun onAttached(runner: TaskRunner) {}
     fun onPostExecute() {}
     fun onPreExecute() {}
-    fun onProgressUpdate(value: Int) {}
+    fun onProgressUpdate(currentPosition: Int) {}
 }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HabitListHeader.kt

@@ -49,7 +49,7 @@ class HabitListHeader(
 
         repeat(nButtons) { index ->
             val date = today.minus(nButtons - index - 1)
-            val name = fmt.shortWeekdayName(date).toUpperCase()
+            val name = fmt.shortWeekdayName(date).uppercase()
             val number = date.day.toString()
 
             val x = width - (index + 1) * buttonSize + buttonSize / 2

uhabits-core/src/jvmTest/java/org/isoron/platform/gui/JavaCanvasTest.kt

@@ -19,9 +19,9 @@
 
 package org.isoron.platform.gui
 
-import junit.framework.Assert.fail
 import kotlinx.coroutines.runBlocking
 import org.isoron.platform.io.JavaFileOpener
+import org.junit.Assert.fail
 import org.junit.Test
 import java.awt.image.BufferedImage
 import java.awt.image.BufferedImage.TYPE_INT_ARGB

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.kt

@@ -18,12 +18,12 @@
  */
 package org.isoron.uhabits.core.commands
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Habit
 import org.junit.Before
 import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class ArchiveHabitsCommandTest : BaseUnitTest() {
     private lateinit var command: ArchiveHabitsCommand

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.commands
 
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
@@ -27,6 +26,7 @@ import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.models.WeekdayList
 import org.junit.Before
 import org.junit.Test
+import kotlin.test.assertTrue
 
 class CreateHabitCommandTest : BaseUnitTest() {
     private lateinit var command: CreateHabitCommand

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.commands
 
-import junit.framework.Assert.assertEquals
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Habit
@@ -26,6 +25,7 @@ import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.junit.Before
 import org.junit.Test
+import kotlin.test.assertEquals
 
 class CreateRepetitionCommandTest : BaseUnitTest() {
     private lateinit var command: CreateRepetitionCommand

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.kt

@@ -23,18 +23,13 @@ import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Habit
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.ExpectedException
-import java.util.LinkedList
+import java.util.*
 
 class DeleteHabitsCommandTest : BaseUnitTest() {
     private lateinit var command: DeleteHabitsCommand
     private lateinit var selected: LinkedList<Habit>
 
-    @get:Rule
-    var thrown = ExpectedException.none()!!
-
     @Before
     @Throws(Exception::class)
     override fun setUp() {

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.kt

@@ -18,12 +18,12 @@
  */
 package org.isoron.uhabits.core.commands
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Habit
 import org.junit.Before
 import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class UnarchiveHabitsCommandTest : BaseUnitTest() {
     private lateinit var command: UnarchiveHabitsCommand

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/RepositoryTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.database
 
-import junit.framework.Assert.assertNull
 import org.apache.commons.lang3.builder.EqualsBuilder
 import org.apache.commons.lang3.builder.HashCodeBuilder
 import org.apache.commons.lang3.builder.ToStringBuilder
@@ -27,6 +26,7 @@ import org.hamcrest.core.IsEqual.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
 import org.junit.Before
 import org.junit.Test
+import kotlin.test.assertNull
 
 class RepositoryTest : BaseUnitTest() {
     private lateinit var repository: Repository<ThingRecord>

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/migrations/Version22Test.kt

@@ -27,13 +27,10 @@ import org.isoron.uhabits.core.database.Database
 import org.isoron.uhabits.core.database.MigrationHelper
 import org.isoron.uhabits.core.models.sqlite.SQLModelFactory
 import org.isoron.uhabits.core.test.HabitFixtures
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.ExpectedException
+import org.junit.jupiter.api.Assertions.assertThrows
 
 class Version22Test : BaseUnitTest() {
-    @get:Rule
-    var exception = ExpectedException.none()!!
     private lateinit var db: Database
     private lateinit var helper: MigrationHelper
 
@@ -76,8 +73,8 @@ class Version22Test : BaseUnitTest() {
     @Throws(Exception::class)
     fun testDisallowNewRepsWithInvalidRef() {
         helper.migrateTo(22)
-        exception.expectMessage(Matchers.containsString("SQLITE_CONSTRAINT"))
-        db.execute("insert into Repetitions(habit, timestamp, value) values (99999, 100, 2)")
+        val exception = assertThrows(java.lang.RuntimeException::class.java) { db.execute("insert into Repetitions(habit, timestamp, value) values (99999, 100, 2)") }
+        assertThat(exception.message, Matchers.containsString("SQLITE_CONSTRAINT"))
     }
 
     @Test
@@ -97,8 +94,12 @@ class Version22Test : BaseUnitTest() {
     @Throws(Exception::class)
     fun testDisallowNullTimestamp() {
         helper.migrateTo(22)
-        exception.expectMessage(Matchers.containsString("SQLITE_CONSTRAINT"))
-        db.execute("insert into Repetitions(habit, value) " + "values (0, 2)")
+
+        val exception = assertThrows(java.lang.RuntimeException::class.java) {
+            db.execute("insert into Repetitions(habit, value) " + "values (0, 2)")
+        }
+
+        assertThat(exception.message, Matchers.containsString("SQLITE_CONSTRAINT"))
     }
 
     @Test
@@ -118,8 +119,12 @@ class Version22Test : BaseUnitTest() {
     @Throws(Exception::class)
     fun testDisallowNullHabit() {
         helper.migrateTo(22)
-        exception.expectMessage(Matchers.containsString("SQLITE_CONSTRAINT"))
-        db.execute("insert into Repetitions(timestamp, value) " + "values (5, 2)")
+
+        val exception = assertThrows(java.lang.RuntimeException::class.java) {
+            db.execute("insert into Repetitions(timestamp, value) " + "values (5, 2)")
+        }
+
+        assertThat(exception.message, Matchers.containsString("SQLITE_CONSTRAINT"))
     }
 
     @Test
@@ -142,7 +147,11 @@ class Version22Test : BaseUnitTest() {
     fun testDisallowNewDuplicateTimestamps() {
         helper.migrateTo(22)
         db.execute("insert into repetitions(habit, timestamp, value)values (0, 100, 2)")
-        exception.expectMessage(Matchers.containsString("SQLITE_CONSTRAINT"))
-        db.execute("insert into repetitions(habit, timestamp, value)values (0, 100, 5)")
+
+        val exception = assertThrows(java.lang.RuntimeException::class.java) {
+            db.execute("insert into repetitions(habit, timestamp, value)values (0, 100, 5)")
+        }
+
+        assertThat(exception.message, Matchers.containsString("SQLITE_CONSTRAINT"))
     }
 }

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.io
 
-import junit.framework.Assert.assertTrue
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 import org.isoron.uhabits.core.BaseUnitTest
@@ -29,8 +28,9 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.nio.file.Files
-import java.util.LinkedList
+import java.util.*
 import java.util.zip.ZipFile
+import kotlin.test.assertTrue
 
 class HabitsCSVExporterTest : BaseUnitTest() {
     private lateinit var baseDir: File
@@ -102,9 +102,8 @@ class HabitsCSVExporterTest : BaseUnitTest() {
     private fun assertAbsolutePathExists(s: String) {
         val file = File(s)
         assertTrue(
-            String.format("File %s should exist", file.absolutePath),
-            file.exists()
-        )
+            String.format("File %s should exist", file.absolutePath)
+        ) { file.exists() }
     }
 
     private fun assertFileAndReferenceAreEqual(s: String) {

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt

@@ -18,8 +18,6 @@
  */
 package org.isoron.uhabits.core.io
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.IsEqual.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
@@ -34,6 +32,8 @@ import org.junit.Before
 import org.junit.Test
 import java.io.File
 import java.io.IOException
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class ImportTest : BaseUnitTest() {
     @Before

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt

@@ -18,23 +18,19 @@
  */
 package org.isoron.uhabits.core.models
 
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertNull
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
-import org.junit.Rule
+import org.junit.Assert.assertThrows
 import org.junit.Test
-import org.junit.rules.ExpectedException
 import java.io.IOException
 import java.io.StringWriter
-import java.util.ArrayList
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
 
 class HabitListTest : BaseUnitTest() {
-    @get:Rule
-    var thrown = ExpectedException.none()!!
     private lateinit var habitsArray: ArrayList<Habit>
     private lateinit var activeHabits: HabitList
     private lateinit var reminderHabits: HabitList
@@ -173,8 +169,9 @@ class HabitListTest : BaseUnitTest() {
     fun testReorder_withInvalidArguments() {
         val h1 = habitsArray[0]
         val h2 = fixtures.createEmptyHabit()
-        thrown.expect(IllegalArgumentException::class.java)
-        habitList.reorder(h1, h2)
+        assertThrows(IllegalArgumentException::class.java) {
+            habitList.reorder(h1, h2)
+        }
     }
 
     @Test
@@ -235,15 +232,17 @@ class HabitListTest : BaseUnitTest() {
     @Test
     @Throws(Exception::class)
     fun testAdd_withFilteredList() {
-        thrown.expect(IllegalStateException::class.java)
-        activeHabits.add(fixtures.createEmptyHabit())
+        assertThrows(IllegalStateException::class.java) {
+            activeHabits.add(fixtures.createEmptyHabit())
+        }
     }
 
     @Test
     @Throws(Exception::class)
     fun testRemove_onFilteredList() {
-        thrown.expect(IllegalStateException::class.java)
-        activeHabits.remove(fixtures.createEmptyHabit())
+        assertThrows(IllegalStateException::class.java) {
+            activeHabits.remove(fixtures.createEmptyHabit())
+        }
     }
 
     @Test
@@ -251,8 +250,9 @@ class HabitListTest : BaseUnitTest() {
     fun testReorder_onFilteredList() {
         val h1 = fixtures.createEmptyHabit()
         val h2 = fixtures.createEmptyHabit()
-        thrown.expect(IllegalStateException::class.java)
-        activeHabits.reorder(h1, h2)
+        assertThrows(IllegalStateException::class.java) {
+            activeHabits.reorder(h1, h2)
+        }
     }
 
     @Test
@@ -261,7 +261,8 @@ class HabitListTest : BaseUnitTest() {
         habitList.primaryOrder = HabitList.Order.BY_SCORE_DESC
         val h1 = habitsArray[1]
         val h2 = habitsArray[2]
-        thrown.expect(IllegalStateException::class.java)
-        habitList.reorder(h1, h2)
+        assertThrows(IllegalStateException::class.java) {
+            habitList.reorder(h1, h2)
+        }
     }
 }

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt

@@ -18,21 +18,18 @@
  */
 package org.isoron.uhabits.core.models
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.IsEqual.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertThat
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.ExpectedException
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class HabitTest : BaseUnitTest() {
-    @get:Rule
-    val exception = ExpectedException.none()!!
 
     @Throws(Exception::class)
     override fun setUp() {
@@ -55,7 +52,7 @@ class HabitTest : BaseUnitTest() {
         model.reminder = Reminder(8, 30, WeekdayList(1))
         val habit = modelFactory.buildHabit()
         habit.copyFrom(model)
-        assertTrue(habit.isArchived == model.isArchived)
+        assertEquals(habit.isArchived, model.isArchived)
         assertThat(habit.isArchived, `is`(model.isArchived))
         assertThat(habit.color, `is`(model.color))
         assertThat(habit.frequency, equalTo(model.frequency))

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.models
 
-import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.number.IsCloseTo
 import org.hamcrest.number.OrderingComparison
@@ -28,6 +27,7 @@ import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.junit.Before
 import org.junit.Test
 import java.util.ArrayList
+import kotlin.test.assertTrue
 
 open class BaseScoreListTest : BaseUnitTest() {
     protected lateinit var habit: Habit

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/TimestampTest.kt

@@ -18,8 +18,6 @@
  */
 package org.isoron.uhabits.core.models
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThan
@@ -27,6 +25,8 @@ import org.hamcrest.Matchers.lessThan
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class TimestampTest : BaseUnitTest() {
     @Test

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/WeekdayListTest.kt

@@ -18,12 +18,12 @@
  */
 package org.isoron.uhabits.core.models
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
 import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class WeekdayListTest : BaseUnitTest() {
     @Test

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt

@@ -19,8 +19,6 @@
 
 package org.isoron.uhabits.core.models.sqlite
 
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertNull
 import org.isoron.uhabits.core.BaseUnitTest.Companion.buildMemoryDatabase
 import org.isoron.uhabits.core.database.Repository
 import org.isoron.uhabits.core.models.Entry
@@ -30,6 +28,8 @@ import org.isoron.uhabits.core.models.sqlite.records.EntryRecord
 import org.isoron.uhabits.core.utils.DateUtils
 import org.junit.Before
 import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 class SQLiteEntryListTest {
 

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.models.sqlite
 
-import junit.framework.Assert.assertNull
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
@@ -32,16 +31,14 @@ import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.core.models.sqlite.records.HabitRecord
 import org.isoron.uhabits.core.test.HabitFixtures
-import org.junit.Rule
+import org.junit.Assert.assertThrows
 import org.junit.Test
-import org.junit.rules.ExpectedException
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import java.util.ArrayList
+import kotlin.test.assertNull
 
 class SQLiteHabitListTest : BaseUnitTest() {
-    @get:Rule
-    var exception = ExpectedException.none()!!
     private lateinit var repository: Repository<HabitRecord>
     private var listener: ModelObservable.Listener = mock()
     private lateinit var habitsArray: ArrayList<Habit>
@@ -90,8 +87,9 @@ class SQLiteHabitListTest : BaseUnitTest() {
         val habit = modelFactory.buildHabit()
         habitList.add(habit)
         verify(listener).onModelChange()
-        exception.expect(IllegalArgumentException::class.java)
-        habitList.add(habit)
+        assertThrows(IllegalArgumentException::class.java) {
+            habitList.add(habit)
+        }
     }
 
     @Test

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt

@@ -18,9 +18,6 @@
  */
 package org.isoron.uhabits.core.preferences
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertNull
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
@@ -31,6 +28,9 @@ import org.junit.Before
 import org.junit.Test
 import org.mockito.kotlin.mock
 import java.io.File
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 class PreferencesTest : BaseUnitTest() {
     private lateinit var prefs: Preferences

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.kt

@@ -18,9 +18,6 @@
  */
 package org.isoron.uhabits.core.preferences
 
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
@@ -28,6 +25,9 @@ import org.junit.Before
 import org.junit.Test
 import java.io.File
 import java.util.Arrays
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class PropertiesStorageTest : BaseUnitTest() {
     private lateinit var storage: PropertiesStorage

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt

@@ -18,9 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertNull
-import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
@@ -31,6 +28,9 @@ import org.junit.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 class HintListTest : BaseUnitTest() {
     private lateinit var hintList: HintList

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt

@@ -18,8 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.apache.commons.io.FileUtils
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.IsEqual.equalTo
@@ -41,6 +39,8 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import java.io.IOException
 import java.nio.file.Files
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class ListHabitsBehaviorTest : BaseUnitTest() {
     private val dirFinder: ListHabitsBehavior.DirFinder = mock()

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt

@@ -18,8 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
@@ -37,6 +35,8 @@ import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
 import org.mockito.kotlin.whenever
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class ListHabitsMenuBehaviorTest : BaseUnitTest() {
     private lateinit var behavior: ListHabitsMenuBehavior

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt

@@ -18,9 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertNull
-import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
@@ -35,6 +32,9 @@ import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 class ListHabitsSelectionMenuBehaviorTest : BaseUnitTest() {
     private val screen: ListHabitsSelectionMenuBehavior.Screen = mock()

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt

@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.utils
 
-import junit.framework.Assert.assertEquals
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.IsEqual.equalTo
 import org.isoron.uhabits.core.BaseUnitTest
@@ -40,6 +39,7 @@ import java.util.Calendar
 import java.util.GregorianCalendar
 import java.util.Locale
 import java.util.TimeZone
+import kotlin.test.assertEquals
 
 class DateUtilsTest : BaseUnitTest() {
     var firstWeekday = Calendar.SUNDAY