Fix import

DroidKaigi · Aug 8, 2024 · 0a15d6b · 0a15d6b
1 parent 2df87ec
commit 0a15d6b
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 64 deletions.
diff --git a/...esting/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt b/...esting/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt
@@ -3,12 +3,14 @@ package io.github.droidkaigi.confsched.testing
 import com.github.takahirom.roborazzi.ComposePreviewTester
 import com.github.takahirom.roborazzi.ComposePreviewTester.Options
 import com.github.takahirom.roborazzi.ComposePreviewTester.Options.JUnit4TestLifecycleOptions
+import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.github.droidkaigi.confsched.testing.rules.CoilRule
 import sergio.sastre.composable.preview.scanner.core.preview.ComposablePreview
 import sergio.sastre.composable.preview.scanner.jvm.JvmAnnotationScanner
 import sergio.sastre.composable.preview.scanner.jvm.JvmAnnotationScanner.DesktopPreviewInfo
 
+@OptIn(ExperimentalRoborazziApi::class)
 class DroidKaigiKmpPreviewTester : ComposePreviewTester<JvmAnnotationScanner.DesktopPreviewInfo> {
     override fun options(): Options {
         return super.options().copy(

diff --git a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/AboutScreenRobot.kt b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/AboutScreenRobot.kt
@@ -8,8 +8,6 @@ import io.github.droidkaigi.confsched.about.section.AboutDetailSectionTestTag
 import io.github.droidkaigi.confsched.about.section.AboutFooterLinksSectionTestTag
 import io.github.droidkaigi.confsched.about.section.AboutOthersSectionTestTag
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
 import javax.inject.Inject
 
 class AboutScreenRobot @Inject constructor(

diff --git a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/KaigiAppRobot.kt b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/KaigiAppRobot.kt
@@ -3,8 +3,6 @@ package io.github.droidkaigi.confsched.testing.robot
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.performClick
 import io.github.droidkaigi.confsched.main.MainScreenTab
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
 import javax.inject.Inject
 
 class KaigiAppRobot @Inject constructor(

diff --git a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/MiniRobots.kt b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/MiniRobots.kt
@@ -13,9 +13,9 @@ import io.github.droidkaigi.confsched.data.sponsors.FakeSponsorsApiClient
 import io.github.droidkaigi.confsched.data.sponsors.SponsorsApiClient
 import io.github.droidkaigi.confsched.data.staff.FakeStaffApiClient
 import io.github.droidkaigi.confsched.data.staff.StaffApiClient
-import io.github.droidkaigi.confsched.testing.SponsorsServerRobot.ServerStatus
-import io.github.droidkaigi.confsched.testing.SponsorsServerRobot.ServerStatus.Operational
 import io.github.droidkaigi.confsched.testing.coroutines.runTestWithLogging
+import io.github.droidkaigi.confsched.testing.robot.SponsorsServerRobot.ServerStatus
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import kotlinx.coroutines.test.TestDispatcher
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.shadows.ShadowLooper
@@ -238,8 +238,8 @@ class DefaultSponsorsServerRobot @Inject constructor(sponsorsApiClient: Sponsors
     override fun setupSponsorsServer(sererStatus: ServerStatus) {
         fakeSponsorsApiClient.setup(
             when (sererStatus) {
-                Operational -> FakeSponsorsApiClient.Status.Operational
-                Error -> FakeSponsorsApiClient.Status.Error
+                ServerStatus.Operational -> FakeSponsorsApiClient.Status.Operational
+                ServerStatus.Error -> FakeSponsorsApiClient.Status.Error
             },
         )
     }

diff --git a/...ting/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt b/...ting/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt
@@ -5,8 +5,6 @@ import androidx.compose.ui.test.hasTestTag
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.profilecard.ProfileCardScreen
 import io.github.droidkaigi.confsched.profilecard.ProfileCardTestTag
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
 import javax.inject.Inject
 
 class ProfileCardScreenRobot @Inject constructor(

diff --git a/...testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/SponsorsScreenRobot.kt b/...testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/SponsorsScreenRobot.kt
@@ -2,10 +2,6 @@ package io.github.droidkaigi.confsched.testing.robot
 
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.sponsors.SponsorsScreen
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.DefaultSponsorsServerRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
-import io.github.droidkaigi.confsched.testing.SponsorsServerRobot
 import javax.inject.Inject
 
 class SponsorsScreenRobot @Inject constructor(

diff --git a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/StaffScreenRobot.kt b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/StaffScreenRobot.kt
@@ -2,10 +2,6 @@ package io.github.droidkaigi.confsched.testing.robot
 
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.staff.StaffScreen
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.DefaultStaffServerRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
-import io.github.droidkaigi.confsched.testing.StaffServerRobot
 import javax.inject.Inject
 
 class StaffScreenRobot @Inject constructor(

diff --git a/.../main/java/io/github/droidkaigi/confsched/testing/robot/TimetableItemDetailScreenRobot.kt b/.../main/java/io/github/droidkaigi/confsched/testing/robot/TimetableItemDetailScreenRobot.kt
@@ -15,12 +15,6 @@ import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.sessions.TimetableItemDetailBookmarkIconTestTag
 import io.github.droidkaigi.confsched.sessions.TimetableItemDetailScreen
 import io.github.droidkaigi.confsched.sessions.timetableItemDetailScreenRoute
-import io.github.droidkaigi.confsched.testing.DefaultFontScaleRobot
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.DefaultTimetableServerRobot
-import io.github.droidkaigi.confsched.testing.FontScaleRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
-import io.github.droidkaigi.confsched.testing.TimetableServerRobot
 import javax.inject.Inject
 
 class TimetableItemDetailScreenRobot @Inject constructor(

diff --git a/...esting/src/main/java/io/github/droidkaigi/confsched/testing/robot/TimetableScreenRobot.kt b/...esting/src/main/java/io/github/droidkaigi/confsched/testing/robot/TimetableScreenRobot.kt
@@ -17,10 +17,6 @@ import io.github.droidkaigi.confsched.sessions.TimetableScreen
 import io.github.droidkaigi.confsched.sessions.TimetableScreenTestTag
 import io.github.droidkaigi.confsched.sessions.TimetableUiTypeChangeButtonTestTag
 import io.github.droidkaigi.confsched.sessions.section.TimetableTabTestTag
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
-import io.github.droidkaigi.confsched.testing.DefaultTimetableServerRobot
-import io.github.droidkaigi.confsched.testing.ScreenRobot
-import io.github.droidkaigi.confsched.testing.TimetableServerRobot
 import io.github.droidkaigi.confsched.ui.component.TimetableItemCardBookmarkIconTestTag
 import io.github.droidkaigi.confsched.ui.component.TimetableItemCardTestTag
 import io.github.droidkaigi.confsched.ui.compositionlocal.FakeClock

diff --git a/.../about/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/about/AboutScreenTest.kt b/.../about/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/about/AboutScreenTest.kt
@@ -3,11 +3,11 @@ package io.github.droidkaigi.confsched.about
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
 import io.github.droidkaigi.confsched.testing.robot.AboutScreenRobot
-import io.github.droidkaigi.confsched.testing.runRobot
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/...roidUnitTest/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreenTest.kt b/...roidUnitTest/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreenTest.kt
@@ -2,16 +2,16 @@ package io.github.droidkaigi.confsched.contributors
 
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
-import io.github.droidkaigi.confsched.testing.ContributorsServerRobot
-import io.github.droidkaigi.confsched.testing.DefaultContributorsServerRobot
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
-import io.github.droidkaigi.confsched.testing.ScreenRobot
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
-import io.github.droidkaigi.confsched.testing.runRobot
-import io.github.droidkaigi.confsched.testing.todoChecks
+import io.github.droidkaigi.confsched.testing.robot.ContributorsServerRobot
+import io.github.droidkaigi.confsched.testing.robot.DefaultContributorsServerRobot
+import io.github.droidkaigi.confsched.testing.robot.DefaultScreenRobot
+import io.github.droidkaigi.confsched.testing.robot.ScreenRobot
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.robot.todoChecks
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/.../src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/eventmap/EventMapScreenTest.kt b/.../src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/eventmap/EventMapScreenTest.kt
@@ -2,17 +2,17 @@ package io.github.droidkaigi.confsched.eventmap
 
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
-import io.github.droidkaigi.confsched.testing.DefaultEventMapServerRobot
-import io.github.droidkaigi.confsched.testing.DefaultScreenRobot
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.EventMapServerRobot
-import io.github.droidkaigi.confsched.testing.EventMapServerRobot.ServerStatus.Operational
-import io.github.droidkaigi.confsched.testing.RobotTestRule
-import io.github.droidkaigi.confsched.testing.ScreenRobot
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
-import io.github.droidkaigi.confsched.testing.runRobot
-import io.github.droidkaigi.confsched.testing.todoChecks
+import io.github.droidkaigi.confsched.testing.robot.DefaultEventMapServerRobot
+import io.github.droidkaigi.confsched.testing.robot.DefaultScreenRobot
+import io.github.droidkaigi.confsched.testing.robot.EventMapServerRobot
+import io.github.droidkaigi.confsched.testing.robot.EventMapServerRobot.ServerStatus
+import io.github.droidkaigi.confsched.testing.robot.ScreenRobot
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.robot.todoChecks
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -41,7 +41,7 @@ class EventMapScreenTest(val behavior: DescribedBehavior<EventMapScreenRobot>) {
             return describeBehaviors<EventMapScreenRobot>(name = "EventMapScreenRobot") {
                 describe("when server is operational") {
                     run {
-                        setupEventMapServer(Operational)
+                        setupEventMapServer(ServerStatus.Operational)
                         setupScreenContent()
                     }
                     itShould("show event map items") {

diff --git a/...ndroidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt b/...ndroidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt
@@ -3,11 +3,11 @@ package io.github.droidkaigi.confsched.profilecard
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
 import io.github.droidkaigi.confsched.testing.robot.ProfileCardScreenRobot
-import io.github.droidkaigi.confsched.testing.runRobot
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/...dUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableItemDetailScreenTest.kt b/...dUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableItemDetailScreenTest.kt
@@ -4,12 +4,12 @@ import android.os.Bundle
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
-import io.github.droidkaigi.confsched.testing.TimetableServerRobot.ServerStatus
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
 import io.github.droidkaigi.confsched.testing.robot.TimetableItemDetailScreenRobot
-import io.github.droidkaigi.confsched.testing.runRobot
+import io.github.droidkaigi.confsched.testing.robot.TimetableServerRobot.ServerStatus
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/...src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenTest.kt b/...src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenTest.kt
@@ -3,13 +3,13 @@ package io.github.droidkaigi.confsched.sessions
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
-import io.github.droidkaigi.confsched.testing.TimetableServerRobot.ServerStatus
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
 import io.github.droidkaigi.confsched.testing.robot.TimetableScreenRobot
-import io.github.droidkaigi.confsched.testing.runRobot
-import io.github.droidkaigi.confsched.testing.todoChecks
+import io.github.droidkaigi.confsched.testing.robot.TimetableServerRobot.ServerStatus
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.robot.todoChecks
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/.../src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sponsors/SponsorsScreenTest.kt b/.../src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sponsors/SponsorsScreenTest.kt
@@ -3,13 +3,13 @@ package io.github.droidkaigi.confsched.sponsors
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
-import io.github.droidkaigi.confsched.testing.SponsorsServerRobot.ServerStatus
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
 import io.github.droidkaigi.confsched.testing.robot.SponsorsScreenRobot
-import io.github.droidkaigi.confsched.testing.runRobot
-import io.github.droidkaigi.confsched.testing.todoChecks
+import io.github.droidkaigi.confsched.testing.robot.SponsorsServerRobot.ServerStatus
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.robot.todoChecks
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/.../staff/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/staff/StaffScreenTest.kt b/.../staff/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/staff/StaffScreenTest.kt
@@ -3,14 +3,14 @@ package io.github.droidkaigi.confsched.staff
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.github.droidkaigi.confsched.testing.DescribedBehavior
-import io.github.droidkaigi.confsched.testing.RobotTestRule
-import io.github.droidkaigi.confsched.testing.StaffServerRobot.ServerStatus.Error
-import io.github.droidkaigi.confsched.testing.StaffServerRobot.ServerStatus.Operational
 import io.github.droidkaigi.confsched.testing.describeBehaviors
 import io.github.droidkaigi.confsched.testing.execute
 import io.github.droidkaigi.confsched.testing.robot.StaffScreenRobot
-import io.github.droidkaigi.confsched.testing.runRobot
-import io.github.droidkaigi.confsched.testing.todoChecks
+import io.github.droidkaigi.confsched.testing.robot.StaffServerRobot.ServerStatus.Error
+import io.github.droidkaigi.confsched.testing.robot.StaffServerRobot.ServerStatus.Operational
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.robot.todoChecks
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith