From 524647ccebd185886f8dcabfd0bb45dce6fdd14d Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 16 Feb 2023 10:40:09 +0100 Subject: [PATCH] refactor --- .../equipment/EquipmentOverviewViewModelTest.kt | 2 -- .../habitica/utils/DateDeserializerTest.kt | 8 +------- .../android/habitica/utils/SerializerSpec.kt | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/utils/SerializerSpec.kt diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt index 7bca972d5..0dc572e08 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt @@ -47,7 +47,5 @@ class EquipmentOverviewViewModelTest : WordSpec({ } } - "getGear" should { } - afterEach { clearMocks(mainUserViewmodel.user) } }) diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt index 73eae5a80..d3edbe16d 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt @@ -1,18 +1,12 @@ package com.habitrpg.android.habitica.utils -import com.google.gson.JsonDeserializationContext import com.google.gson.JsonElement import com.google.gson.JsonPrimitive -import com.google.gson.JsonSerializationContext -import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.shouldBe -import io.mockk.mockk import java.util.Date -class DateDeserializerTest : WordSpec({ +class DateDeserializerTest : SerializerSpec({ val deserializer = DateDeserializer() - val deserializationContext: JsonDeserializationContext = mockk(relaxed = true) - val serializationContext: JsonSerializationContext = mockk(relaxed = true) val referenceTimestamp: Long = 1443445200000 "deserialize" should { diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/SerializerSpec.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/SerializerSpec.kt new file mode 100644 index 000000000..4d7060a99 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/SerializerSpec.kt @@ -0,0 +1,17 @@ +package com.habitrpg.android.habitica.utils + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonSerializationContext +import io.kotest.core.spec.DslDrivenSpec +import io.kotest.core.spec.style.scopes.WordSpecRootScope +import io.mockk.mockk + +open class SerializerSpec(body: SerializerSpec.() -> Unit = {}): DslDrivenSpec(), + WordSpecRootScope { + val deserializationContext: JsonDeserializationContext = mockk(relaxed = true) + val serializationContext: JsonSerializationContext = mockk(relaxed = true) + + init { + body() + } +}