From 5e490d88ee52da03e003f15b3f853dc42f7eb5fb Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Tue, 25 Jul 2023 20:31:33 +0200 Subject: [PATCH] Migrate junit.framework.Assert.assertEquals to kotlin.test.assertEquals --- .../isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt | 2 +- .../java/org/isoron/uhabits/core/models/HabitListTest.kt | 2 +- .../isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt | 2 +- .../isoron/uhabits/core/preferences/PropertiesStorageTest.kt | 2 +- .../jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt index bc5c234d5..02ec5958a 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt +++ b/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 diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt index 6b591cdb6..8b28419e9 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt @@ -18,7 +18,6 @@ */ 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 @@ -31,6 +30,7 @@ import org.junit.rules.ExpectedException import java.io.IOException import java.io.StringWriter import java.util.ArrayList +import kotlin.test.assertEquals class HabitListTest : BaseUnitTest() { @get:Rule diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt index 9f2457fb6..cdec65353 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt @@ -19,7 +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 @@ -30,6 +29,7 @@ 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 class SQLiteEntryListTest { diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.kt index 65066b916..4d1c7274b 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.kt @@ -18,7 +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 @@ -28,6 +27,7 @@ import org.junit.Before import org.junit.Test import java.io.File import java.util.Arrays +import kotlin.test.assertEquals class PropertiesStorageTest : BaseUnitTest() { private lateinit var storage: PropertiesStorage diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt index 22b6e0057..19534a5bd 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt +++ b/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