diff --git a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt deleted file mode 100644 index defdaaf0..00000000 --- a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt +++ /dev/null @@ -1,23 +0,0 @@ -package dev.msfjarvis.claw.android.tests - -import app.cash.paparazzi.Paparazzi -import app.cash.paparazzi.androidHome -import app.cash.paparazzi.detectEnvironment -import com.google.testing.junit.testparameterinjector.TestParameter -import com.google.testing.junit.testparameterinjector.TestParameterInjector -import org.junit.Rule -import org.junit.runner.RunWith - -/** Base class for Paparazzi based tests that handles parameterization based on [Theme]. */ -@RunWith(TestParameterInjector::class) -abstract class BasePaparazziTest { - @get:Rule - val paparazzi = - Paparazzi( - // https://github.com/cashapp/paparazzi/issues/489 - environment = - detectEnvironment() - .copy(platformDir = "${androidHome()}/platforms/android-32", compileSdkVersion = 32) - ) - @TestParameter lateinit var theme: Theme -} diff --git a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt deleted file mode 100644 index 65ffe37d..00000000 --- a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt +++ /dev/null @@ -1,41 +0,0 @@ -package dev.msfjarvis.claw.android.tests - -import androidx.compose.material3.MaterialTheme -import dev.msfjarvis.claw.common.posts.LobstersCard -import dev.msfjarvis.claw.common.posts.PostActions -import dev.msfjarvis.claw.database.local.SavedPost -import org.junit.Test - -class LobstersCardTest : BasePaparazziTest() { - companion object { - private val post = - SavedPost( - shortId = "shortId", - title = "Title", - url = "/s/shortId", - createdAt = "2021-04-03T16:16:02.000-05:00", - commentCount = 10, - commentsUrl = "/s/shortId", - submitterName = "msfjarvis", - submitterAvatarUrl = "/msfjarvis.png", - tags = listOf("science", "technology"), - ) - private val postActions = - object : PostActions { - override fun viewPost(postUrl: String, commentsUrl: String) {} - - override fun viewComments(postId: String) {} - - override fun viewCommentsPage(commentsUrl: String) {} - - override fun toggleSave(post: SavedPost) {} - } - } - - @Test - fun verify() { - paparazzi.snapshot { - MaterialTheme(colorScheme = theme.colors) { LobstersCard(post, false, postActions) } - } - } -} diff --git a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt deleted file mode 100644 index 436792c6..00000000 --- a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt +++ /dev/null @@ -1,13 +0,0 @@ -package dev.msfjarvis.claw.android.tests - -import androidx.compose.material3.MaterialTheme -import dev.msfjarvis.claw.common.ui.decorations.MonthHeader -import java.time.Month -import org.junit.Test - -class MonthHeaderTest : BasePaparazziTest() { - @Test - fun verify() { - paparazzi.snapshot { MaterialTheme(colorScheme = theme.colors) { MonthHeader(Month.APRIL) } } - } -} diff --git a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt deleted file mode 100644 index 1450ae46..00000000 --- a/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.msfjarvis.claw.android.tests - -import androidx.compose.material3.ColorScheme -import dev.msfjarvis.claw.common.theme.DarkThemeColors -import dev.msfjarvis.claw.common.theme.LightThemeColors - -enum class Theme(val colors: ColorScheme) { - Light(LightThemeColors), - Dark(DarkThemeColors), -} diff --git a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Dark].png b/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Dark].png deleted file mode 100644 index 6f2a5f7a..00000000 Binary files a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Dark].png and /dev/null differ diff --git a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Light].png b/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Light].png deleted file mode 100644 index 1453bc45..00000000 Binary files a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Light].png and /dev/null differ diff --git a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Dark].png b/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Dark].png deleted file mode 100644 index 45c3d691..00000000 Binary files a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Dark].png and /dev/null differ diff --git a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Light].png b/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Light].png deleted file mode 100644 index 80c58f11..00000000 Binary files a/common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Light].png and /dev/null differ diff --git a/detekt-baselines/common.xml b/detekt-baselines/common.xml index cc22991a..510c3a53 100644 --- a/detekt-baselines/common.xml +++ b/detekt-baselines/common.xml @@ -3,7 +3,6 @@ CompositionLocalAllowlist:HTMLConverter.kt$LocalHTMLConverter - EmptyFunctionBlock:LobstersCardTest.kt$LobstersCardTest.Companion.<no name provided>${} MagicNumber:CommentEntry.kt$16 MagicNumber:LobstersCard.kt$50 MagicNumber:LobstersCard.kt$8 @@ -12,6 +11,5 @@ ModifierReused:LobstersCard.kt$Row( modifier = modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), ) { NetworkImage( url = avatarUrl, placeholder = ClawIcons.Account, contentDescription = contentDescription, modifier = modifier.requiredSize(24.dp).clip(CircleShape), ) Text(text = text, modifier = modifier, style = MaterialTheme.typography.bodyMedium) } ModifierReused:LobstersCard.kt$Text(text = text, modifier = modifier, style = MaterialTheme.typography.bodyMedium) SpreadOperator:Theme.kt$(*providedValues) - UnnecessaryAbstractClass:BasePaparazziTest.kt$BasePaparazziTest$BasePaparazziTest