From cbdfa67d075ec1f8ceec0f3559498cbca01783a0 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 2 Aug 2022 23:53:46 +0530 Subject: [PATCH] paparazzi-tests: move to common module --- common/build.gradle.kts | 7 +++++ .../claw/android/tests/BasePaparazziTest.kt | 0 .../claw/android/tests/LobstersCardTest.kt | 0 .../claw/android/tests/MonthHeaderTest.kt | 0 .../dev/msfjarvis/claw/android/tests/Theme.kt | 0 ...id.tests_LobstersCardTest_verify[Dark].png | Bin ...d.tests_LobstersCardTest_verify[Light].png | Bin ...oid.tests_MonthHeaderTest_verify[Dark].png | Bin ...id.tests_MonthHeaderTest_verify[Light].png | Bin paparazzi-tests/README.md | 7 ----- paparazzi-tests/build.gradle.kts | 29 ------------------ 11 files changed, 7 insertions(+), 36 deletions(-) rename {paparazzi-tests => common}/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt (100%) rename {paparazzi-tests => common}/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt (100%) rename {paparazzi-tests => common}/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt (100%) rename {paparazzi-tests => common}/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt (100%) rename {paparazzi-tests => common}/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Dark].png (100%) rename {paparazzi-tests => common}/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Light].png (100%) rename {paparazzi-tests => common}/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Dark].png (100%) rename {paparazzi-tests => common}/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Light].png (100%) delete mode 100644 paparazzi-tests/README.md delete mode 100644 paparazzi-tests/build.gradle.kts diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 5a95f5cb..0d9790aa 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -8,6 +8,7 @@ plugins { id("dev.msfjarvis.claw.kotlin-common") id("dev.msfjarvis.claw.android-library") alias(libs.plugins.aurora.svg.transcoder) + alias(libs.plugins.paparazzi) } val transcodeTask = @@ -38,6 +39,12 @@ dependencies { implementation(libs.compose.richtext.ui) implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.datetime) + testImplementation(kotlin("test-junit")) + testImplementation(libs.testparameterinjector) +} + +tasks.withType().configureEach { + javaLauncher.set(javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(11)) }) } android { diff --git a/paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt similarity index 100% rename from paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt rename to common/src/test/kotlin/dev/msfjarvis/claw/android/tests/BasePaparazziTest.kt diff --git a/paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt similarity index 100% rename from paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt rename to common/src/test/kotlin/dev/msfjarvis/claw/android/tests/LobstersCardTest.kt diff --git a/paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt similarity index 100% rename from paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt rename to common/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt diff --git a/paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt b/common/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt similarity index 100% rename from paparazzi-tests/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt rename to common/src/test/kotlin/dev/msfjarvis/claw/android/tests/Theme.kt diff --git a/paparazzi-tests/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 similarity index 100% rename from paparazzi-tests/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Dark].png rename to common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Dark].png diff --git a/paparazzi-tests/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 similarity index 100% rename from paparazzi-tests/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Light].png rename to common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_LobstersCardTest_verify[Light].png diff --git a/paparazzi-tests/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 similarity index 100% rename from paparazzi-tests/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Dark].png rename to common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Dark].png diff --git a/paparazzi-tests/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 similarity index 100% rename from paparazzi-tests/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Light].png rename to common/src/test/snapshots/images/dev.msfjarvis.claw.android.tests_MonthHeaderTest_verify[Light].png diff --git a/paparazzi-tests/README.md b/paparazzi-tests/README.md deleted file mode 100644 index 0f90f36b..00000000 --- a/paparazzi-tests/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# paparazzi-tests - -[Paparazzi](https://github.com/cashapp/paparazzi) is a Gradle plugin and library that allows writing -Android UI tests that run on the JVM. However, it does not support Kotlin Multiplatform so we're -using this Android library module to hide the Multiplatform aspect of the project from Paparazzi. In -the future this will be natively supported and we can disperse the tests contained in this module -into existing ones. diff --git a/paparazzi-tests/build.gradle.kts b/paparazzi-tests/build.gradle.kts deleted file mode 100644 index 58abf06d..00000000 --- a/paparazzi-tests/build.gradle.kts +++ /dev/null @@ -1,29 +0,0 @@ -@file:Suppress("DSL_SCOPE_VIOLATION") - -plugins { - id("dev.msfjarvis.claw.android-library") - id("dev.msfjarvis.claw.kotlin-android") - alias(libs.plugins.paparazzi) -} - -androidComponents { beforeVariants(selector().all()) { it.enable = it.buildType == "debug" } } - -android { - namespace = "dev.msfjarvis.claw.android.tests" - buildFeatures { compose = true } - composeOptions { - useLiveLiterals = false - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } -} - -dependencies { - testImplementation(kotlin("test-junit")) - testImplementation(libs.kotlinx.datetime) - testImplementation(libs.testparameterinjector) - testImplementation(projects.common) -} - -tasks.withType().configureEach { - javaLauncher.set(javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(11)) }) -}