stud203990/Treker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move test sources from jvmTest to commonTest

Browse Source
This commit is contained in:
Alinson S. Xavier 2026-04-08 04:04:17 -05:00
parent a527389b96
commit b37af7949c
6 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt → uhabits-core/src/commonTest/kotlin/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt
View File

@ -21,13 +21,10 @@ package org.isoron.uhabits.core.tasks
import dev.mokkery.mock
import dev.mokkery.verify
import dev.mokkery.verify.VerifyMode.Companion.order
import org.isoron.uhabits.core.JvmBaseUnitTest
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
import org.isoron.uhabits.core.BaseUnitTest
import kotlin.test.Test
@RunWith(JUnit4::class)
class SingleThreadTaskRunnerTest : JvmBaseUnitTest() {
class SingleThreadTaskRunnerTest : BaseUnitTest() {
private lateinit var runner: SingleThreadTaskRunner
private var task: Task = mock()

40
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt → uhabits-core/src/commonTest/kotlin/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt
View File

@ -22,16 +22,16 @@ import dev.mokkery.mock
import dev.mokkery.resetCalls
import dev.mokkery.verify
import dev.mokkery.verifyNoMoreCalls
import org.hamcrest.CoreMatchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.isoron.platform.time.LocalDate
import org.isoron.uhabits.core.JvmBaseUnitTest
import org.isoron.uhabits.core.BaseUnitTest
import org.isoron.uhabits.core.commands.CreateRepetitionCommand
import org.isoron.uhabits.core.commands.DeleteHabitsCommand
import org.isoron.uhabits.core.models.Entry
import org.junit.Test
import kotlin.test.Test
import kotlin.test.assertContentEquals
import kotlin.test.assertEquals
class HabitCardListCacheTest : JvmBaseUnitTest() {
class HabitCardListCacheTest : BaseUnitTest() {
private lateinit var cache: HabitCardListCache
private lateinit var listener: HabitCardListCache.Listener
var today = LocalDate(2015, 1, 25)
@ -57,14 +57,14 @@ class HabitCardListCacheTest : JvmBaseUnitTest() {
@Test
fun testCommandListener_all() {
assertThat(cache.habitCount, equalTo(10))
assertEquals(10, cache.habitCount)
val h = habitList.getByPosition(0)
commandRunner.run(
DeleteHabitsCommand(habitList, listOf(h))
)
verify { listener.onItemRemoved(0) }
verify { listener.onRefreshFinished() }
assertThat(cache.habitCount, equalTo(9))
assertEquals(9, cache.habitCount)
}
@Test
@ -78,18 +78,18 @@ class HabitCardListCacheTest : JvmBaseUnitTest() {
@Test
fun testGet() {
assertThat(cache.habitCount, equalTo(10))
assertEquals(10, cache.habitCount)
val h = habitList.getByPosition(3)
val score = h.scores[today].value
assertThat(cache.getHabitByPosition(3), equalTo(h))
assertThat(cache.getScore(h.id!!), equalTo(score))
assertEquals(h, cache.getHabitByPosition(3))
assertEquals(score, cache.getScore(h.id!!))
val actualCheckmarks = cache.getCheckmarks(h.id!!)
val expectedCheckmarks = h
.computedEntries
.getByInterval(today.minus(9), today)
.map { it.value }.toIntArray()
assertThat(actualCheckmarks, equalTo(expectedCheckmarks))
assertContentEquals(expectedCheckmarks, actualCheckmarks)
}
@Test
@ -100,7 +100,7 @@ class HabitCardListCacheTest : JvmBaseUnitTest() {
verify { listener.onItemRemoved(0) }
verify { listener.onItemRemoved(3) }
verify { listener.onRefreshFinished() }
assertThat(cache.habitCount, equalTo(8))
assertEquals(8, cache.habitCount)
}
@Test
@ -116,9 +116,9 @@ class HabitCardListCacheTest : JvmBaseUnitTest() {
val h3 = cache.getHabitByPosition(3)
val h7 = cache.getHabitByPosition(7)
cache.reorder(2, 7)
assertThat(cache.getHabitByPosition(2), equalTo(h3))
assertThat(cache.getHabitByPosition(7), equalTo(h2))
assertThat(cache.getHabitByPosition(6), equalTo(h7))
assertEquals(h3, cache.getHabitByPosition(2))
assertEquals(h2, cache.getHabitByPosition(7))
assertEquals(h7, cache.getHabitByPosition(6))
verify { listener.onItemMoved(2, 7) }
verifyNoMoreCalls(listener)
}
@ -128,14 +128,14 @@ class HabitCardListCacheTest : JvmBaseUnitTest() {
val h2 = habitList.getByPosition(2)
val h3 = habitList.getByPosition(3)
val h7 = habitList.getByPosition(7)
assertThat(cache.getHabitByPosition(2), equalTo(h2))
assertThat(cache.getHabitByPosition(7), equalTo(h7))
assertEquals(h2, cache.getHabitByPosition(2))
assertEquals(h7, cache.getHabitByPosition(7))
resetCalls(listener)
habitList.reorder(h2, h7)
cache.refreshAllHabits()
assertThat(cache.getHabitByPosition(2), equalTo(h3))
assertThat(cache.getHabitByPosition(7), equalTo(h2))
assertThat(cache.getHabitByPosition(6), equalTo(h7))
assertEquals(h3, cache.getHabitByPosition(2))
assertEquals(h2, cache.getHabitByPosition(7))
assertEquals(h7, cache.getHabitByPosition(6))
verify { listener.onItemMoved(3, 2) }
verify { listener.onItemMoved(4, 3) }
verify { listener.onItemMoved(5, 4) }

11
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt → uhabits-core/src/commonTest/kotlin/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt
View File

@ -22,18 +22,17 @@ import dev.mokkery.answering.returns
import dev.mokkery.every
import dev.mokkery.mock
import dev.mokkery.verify
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.isoron.platform.time.LocalDate
import org.isoron.platform.time.getToday
import org.isoron.uhabits.core.JvmBaseUnitTest
import org.isoron.uhabits.core.BaseUnitTest
import org.isoron.uhabits.core.preferences.Preferences
import org.junit.Test
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
class HintListTest : JvmBaseUnitTest() {
class HintListTest : BaseUnitTest() {
private lateinit var hintList: HintList
private lateinit var hints: Array<String>
@ -54,7 +53,7 @@ class HintListTest : JvmBaseUnitTest() {
@Throws(Exception::class)
fun pop() {
every { prefs.lastHintNumber } returns -1
assertThat(hintList.pop(), equalTo("hint1"))
assertEquals("hint1", hintList.pop())
verify { prefs.updateLastHint(0, today) }
every { prefs.lastHintNumber } returns 2
assertNull(hintList.pop())

6
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt → uhabits-core/src/commonTest/kotlin/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt
View File

@ -25,15 +25,15 @@ import dev.mokkery.mock
import dev.mokkery.resetCalls
import dev.mokkery.verify
import dev.mokkery.verifyNoMoreCalls
import org.isoron.uhabits.core.JvmBaseUnitTest
import org.isoron.uhabits.core.BaseUnitTest
import org.isoron.uhabits.core.models.HabitList
import org.isoron.uhabits.core.models.HabitMatcher
import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.core.ui.ThemeSwitcher
import org.junit.Test
import kotlin.test.Test
import dev.mokkery.verify.VerifyMode.Companion.not as notCalled
class ListHabitsMenuBehaviorTest : JvmBaseUnitTest() {
class ListHabitsMenuBehaviorTest : BaseUnitTest() {
private lateinit var behavior: ListHabitsMenuBehavior
private val screen: ListHabitsMenuBehavior.Screen = mock()

15
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt → uhabits-core/src/commonTest/kotlin/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt
View File

@ -24,19 +24,18 @@ import dev.mokkery.every
import dev.mokkery.matcher.any
import dev.mokkery.mock
import dev.mokkery.verify
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.isoron.uhabits.core.JvmBaseUnitTest
import org.isoron.uhabits.core.BaseUnitTest
import org.isoron.uhabits.core.models.Habit
import org.isoron.uhabits.core.models.PaletteColor
import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback
import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
import org.junit.Test
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
class ListHabitsSelectionMenuBehaviorTest : JvmBaseUnitTest() {
class ListHabitsSelectionMenuBehaviorTest : BaseUnitTest() {
private val screen: ListHabitsSelectionMenuBehavior.Screen = mock()
private val adapter: ListHabitsSelectionMenuBehavior.Adapter = mock()
@ -84,8 +83,8 @@ class ListHabitsSelectionMenuBehaviorTest : JvmBaseUnitTest() {
@Test
@Throws(Exception::class)
fun onChangeColor() {
assertThat(habit1.color, equalTo(PaletteColor(8)))
assertThat(habit2.color, equalTo(PaletteColor(8)))
assertEquals(PaletteColor(8), habit1.color)
assertEquals(PaletteColor(8), habit2.color)
every { adapter.getSelected() } returns listOf(habit1, habit2)
every {
screen.showColorPicker(any(), any())
@ -94,7 +93,7 @@ class ListHabitsSelectionMenuBehaviorTest : JvmBaseUnitTest() {
callback.onColorPicked(PaletteColor(30))
}
behavior.onChangeColor()
assertThat(habit1.color, equalTo(PaletteColor(30)))
assertEquals(PaletteColor(30), habit1.color)
}
@Test

10
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt → uhabits-core/src/commonTest/kotlin/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt
View File

@ -25,25 +25,25 @@ import dev.mokkery.resetCalls
import dev.mokkery.verify
import org.isoron.platform.time.LocalDate
import org.isoron.platform.time.getToday
import org.isoron.uhabits.core.JvmBaseUnitTest
import org.isoron.uhabits.core.BaseUnitTest
import org.isoron.uhabits.core.commands.CreateRepetitionCommand
import org.isoron.uhabits.core.models.Entry
import org.isoron.uhabits.core.models.Entry.Companion.nextToggleValue
import org.isoron.uhabits.core.models.Habit
import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.core.ui.NotificationTray
import org.junit.Before
import org.junit.Test
import kotlin.test.BeforeTest
import kotlin.test.Test
import dev.mokkery.verify.VerifyMode.Companion.not as notCalled
class WidgetBehaviorTest : JvmBaseUnitTest() {
class WidgetBehaviorTest : BaseUnitTest() {
private lateinit var notificationTray: NotificationTray
private lateinit var preferences: Preferences
private lateinit var behavior: WidgetBehavior
private lateinit var habit: Habit
private lateinit var today: LocalDate
@Before
@BeforeTest
@Throws(Exception::class)
override fun setUp() {
super.setUp()