From 95568d6a1aa5b2db441287b5aeadda18ff6746b2 Mon Sep 17 00:00:00 2001
From: kasamax <kqss.251@gmail.com>
Date: Sun, 26 Jan 2020 18:24:41 +0900
Subject: [PATCH] move unit test to test folder

---
 model/build.gradle                                          | 2 +-
 .../github/droidkaigi/confsched2020/model/DateTimeTest.kt   | 0
 .../io/github/droidkaigi/confsched2020/model/FiltersTest.kt | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename model/src/{jvmTest/kotlin => test/java}/io/github/droidkaigi/confsched2020/model/DateTimeTest.kt (100%)
 rename model/src/{jvmTest/kotlin => test/java}/io/github/droidkaigi/confsched2020/model/FiltersTest.kt (97%)

diff --git a/model/build.gradle b/model/build.gradle
index 5720c1027..fc188de26 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -70,7 +70,7 @@ kotlin {
             implementation Dep.Test.KotlinMultiPlatform.commonModuleTestAnnotations
             implementation Dep.MockK.common
         }
-        jvmTest {
+        test {
             dependsOn jvmMain
             dependencies {
                 implementation Dep.Test.KotlinMultiPlatform.jvmModuleTest
diff --git a/model/src/jvmTest/kotlin/io/github/droidkaigi/confsched2020/model/DateTimeTest.kt b/model/src/test/java/io/github/droidkaigi/confsched2020/model/DateTimeTest.kt
similarity index 100%
rename from model/src/jvmTest/kotlin/io/github/droidkaigi/confsched2020/model/DateTimeTest.kt
rename to model/src/test/java/io/github/droidkaigi/confsched2020/model/DateTimeTest.kt
diff --git a/model/src/jvmTest/kotlin/io/github/droidkaigi/confsched2020/model/FiltersTest.kt b/model/src/test/java/io/github/droidkaigi/confsched2020/model/FiltersTest.kt
similarity index 97%
rename from model/src/jvmTest/kotlin/io/github/droidkaigi/confsched2020/model/FiltersTest.kt
rename to model/src/test/java/io/github/droidkaigi/confsched2020/model/FiltersTest.kt
index 588648196..5f0dbe469 100644
--- a/model/src/jvmTest/kotlin/io/github/droidkaigi/confsched2020/model/FiltersTest.kt
+++ b/model/src/test/java/io/github/droidkaigi/confsched2020/model/FiltersTest.kt
@@ -14,8 +14,8 @@ import org.junit.runners.Parameterized
 class FiltersTest {
 
     private companion object {
-        val room1 = Room(10, "room1")
-        val room2 = Room(11, "room2")
+        val room1 = Room(10, LocaledString("room1", "room1"), 1)
+        val room2 = Room(11, LocaledString("room2", "room2"), 2)
         val category1 = Category(10, LocaledString("ツール1", "Tool1"))
         val category2 = Category(11, LocaledString("ツール2", "Tool2"))
     }
@@ -237,7 +237,7 @@ data class Param<T>(
             title = title,
             filters = Filters(audienceCategories = filterItem),
             sessionSetup = {
-                every { forBeginners } returns isForBeginners
+                every { isForBeginners } returns isForBeginners
             },
             expected = expected
         )