Cache test data.

Author: Jadarma

aockt-test/src/main/kotlin/AdventSpec.kt

@@ -2,10 +2,6 @@ package io.github.jadarma.aockt.test
 
 import io.github.jadarma.aockt.core.Solution
 import io.github.jadarma.aockt.test.internal.AdventRootScopeImpl
-import io.github.jadarma.aockt.test.internal.PuzzleTestData
-import io.github.jadarma.aockt.test.internal.TestData
-import io.github.jadarma.aockt.test.internal.adventDay
-import io.github.jadarma.aockt.test.internal.id
 import io.github.jadarma.aockt.test.internal.registerDebug
 import io.github.jadarma.aockt.test.internal.registerTest
 import io.kotest.common.ExperimentalKotest
@@ -50,8 +46,6 @@ public abstract class AdventSpec<T : Solution>(
     body: AdventRootScope.() -> Unit = {},
 ) : FunSpec() {
 
-    internal val testData: PuzzleTestData = TestData.inputFor(this::class.adventDay.id)
-
     init {
         AdventRootScopeImpl(owner = this::class).apply {
             body()

aockt-test/src/main/kotlin/internal/AdventConfig.kt

@@ -20,6 +20,7 @@ internal data class AdventProjectConfig(
     val efficiencyBenchmark: Duration,
     val executionMode: ExecMode,
 ) : AbstractCoroutineContextElement(Key) {
+
     init {
         if (efficiencyBenchmark.isPositive().not()) {
             throw ConfigurationException("Efficiency benchmark must be a positive value, but was: $efficiencyBenchmark")
@@ -37,6 +38,7 @@ internal data class AdventProjectConfig(
 
 @Suppress("BooleanPropertyNaming")
 internal data class AdventTestConfig(
+    val id: AdventDayID,
     val part: AdventDayPart,
     val partFunction: PartFunction,
     val enabled: Boolean,
@@ -53,33 +55,34 @@ internal data class AdventTestConfig(
     )
 
     data class ForInput(
+        val id: AdventDayID,
+        val part: AdventDayPart,
         val enabled: Boolean,
         val partFunction: PartFunction,
         val expensive: Boolean,
         val efficiencyBenchmark: Duration,
-        val input: PuzzleInput?,
-        val correctAnswer: PuzzleAnswer?,
     )
 }
 
 internal data class AdventDebugConfig(
+    val id: AdventDayID,
     val solution: Solution,
     val test: AdventDebugScope.() -> Unit,
 )
 
-internal fun AdventTestConfig.forExamples(defaults: AdventProjectConfig) =
+internal fun AdventTestConfig.forExamples(defaults: AdventProjectConfig): AdventTestConfig.ForExamples =
     AdventTestConfig.ForExamples(
         enabled = (executionMode ?: defaults.executionMode) != ExecMode.SkipExamples,
         partFunction = partFunction,
         examples = examples,
     )
 
-internal fun AdventTestConfig.forInput(defaults: AdventProjectConfig, testData: PuzzleTestData) =
+internal fun AdventTestConfig.forInput(defaults: AdventProjectConfig): AdventTestConfig.ForInput =
     AdventTestConfig.ForInput(
+        id = id,
+        part = part,
         enabled = (executionMode ?: defaults.executionMode) != ExecMode.ExamplesOnly,
         partFunction = partFunction,
         expensive = expensive,
-        efficiencyBenchmark = efficiencyBenchmark ?: defaults.efficiencyBenchmark,
-        input = testData.input,
-        correctAnswer = testData.solutionToPart(part),
+        efficiencyBenchmark = efficiencyBenchmark ?: defaults.efficiencyBenchmark
     )

aockt-test/src/main/kotlin/internal/AdventRootScopeImpl.kt

@@ -28,13 +28,14 @@ internal class AdventRootScopeImpl(
     ) {
         if (partOne != null) throw DuplicateDefinitionException(owner, "partOne")
         partOne = AdventTestConfig(
+            id = owner.adventDay.id,
             part = AdventDayPart.One,
             partFunction = solution.partFunction(AdventDayPart.One),
             enabled = enabled,
             expensive = expensive,
             executionMode = executionMode,
             efficiencyBenchmark = efficiencyBenchmark,
-            examples = AdventPartScopeImpl().apply(examples).testCases
+            examples = AdventPartScopeImpl().apply(examples).testCases,
         )
     }
 
@@ -47,18 +48,23 @@ internal class AdventRootScopeImpl(
     ) {
         if (partTwo != null) throw DuplicateDefinitionException(owner, "partTwo")
         partTwo = AdventTestConfig(
+            id = owner.adventDay.id,
             part = AdventDayPart.Two,
             partFunction = solution.partFunction(AdventDayPart.Two),
             enabled = enabled,
             expensive = expensive,
             executionMode = executionMode,
             efficiencyBenchmark = efficiencyBenchmark,
-            examples = AdventPartScopeImpl().apply(examples).testCases
+            examples = AdventPartScopeImpl().apply(examples).testCases,
         )
     }
 
     override fun debug(test: AdventDebugScope.() -> Unit) {
         if (debug != null) throw DuplicateDefinitionException(owner, "debug")
-        debug = AdventDebugConfig(solution, test)
+        debug = AdventDebugConfig(
+            id = owner.adventDay.id,
+            solution = solution,
+            test = test,
+        )
     }
 }

aockt-test/src/main/kotlin/internal/AdventSpecExt.kt

@@ -58,17 +58,17 @@ internal fun AdventSpec<*>.registerTest(config: AdventTestConfig): Unit = with(c
     ) {
         val projectConfig = currentCoroutineContext()[AdventProjectConfig.Key] ?: AdventProjectConfig.Default
         registerExamples(config.forExamples(projectConfig))
-        registerInput(config.forInput(projectConfig, testData))
+        registerInput(config.forInput(projectConfig))
     }
 }
 
 /**
  * Register a focused root test to help debugging a [Solution].
  * All other tests will be ignored.
  */
-@OptIn(ExperimentalKotest::class)
 internal fun AdventSpec<*>.registerDebug(config: AdventDebugConfig): Unit = with(config) {
     test(name = "f:Debug") {
+        val testData = TestData.inputFor(config.id)
         withClue("Debug run completed exceptionally.") {
             shouldNotThrowAnyUnit {
                 AdventDebugScopeImpl(solution, testData.input).run(test)
@@ -105,7 +105,10 @@ private suspend fun FunSpecContainerScope.registerExamples(config: AdventTestCon
 @OptIn(ExperimentalKotest::class)
 @Suppress("SuspendFunWithCoroutineScopeReceiver", "CognitiveComplexMethod")
 private suspend fun FunSpecContainerScope.registerInput(config: AdventTestConfig.ForInput): Unit = with(config) {
-    if (input == null) return
+
+    val data = TestData.inputFor(config.id)
+    val input = data.input ?: return
+    val correctAnswer = data.solutionToPart(config.part)
 
     context("The solution").config(enabled = enabled) {
         val isSolutionKnown = correctAnswer != null

aockt-test/src/main/kotlin/internal/TestData.kt

@@ -1,6 +1,7 @@
 package io.github.jadarma.aockt.test.internal
 
 import io.github.jadarma.aockt.core.Solution
+import java.util.concurrent.ConcurrentHashMap
 
 /**
  * Reads [PuzzleTestData]s from classpath resources.
@@ -21,16 +22,15 @@ import io.github.jadarma.aockt.core.Solution
  */
 internal object TestData {
 
+    private val data: ConcurrentHashMap<AdventDayID, PuzzleTestData> = ConcurrentHashMap()
+
     /** Returns the available [PuzzleTestData] for a given [AdventDayID] by reading it from the resources. */
-    fun inputFor(adventDayID: AdventDayID): PuzzleTestData {
+    fun inputFor(adventDayID: AdventDayID): PuzzleTestData = data.computeIfAbsent(adventDayID) {
         val path = with(adventDayID) { "/aockt/y$year/d${day.toString().padStart(2, '0')}" }
-        return PuzzleTestData(
+        PuzzleTestData(
             input = readResourceAsTextOrNull("$path/input.txt").toPuzzleInput(),
             solutionPartOne = readResourceAsTextOrNull("$path/solution_part1.txt").toPuzzleAnswer(),
-            solutionPartTwo = when(adventDayID.day) {
-                25 -> PuzzleAnswer.NO_SOLUTION
-                else -> readResourceAsTextOrNull("$path/solution_part2.txt").toPuzzleAnswer()
-            },
+            solutionPartTwo = readResourceAsTextOrNull("$path/solution_part2.txt").toPuzzleAnswer(),
         )
     }
 
@@ -41,13 +41,13 @@ internal object TestData {
             ?.use { String(it.readAllBytes()).trimEnd() }
 
     /** Wraps a [String] into a [PuzzleAnswer] type. */
-    private fun String?.toPuzzleAnswer(): PuzzleAnswer? = when(this) {
+    private fun String?.toPuzzleAnswer(): PuzzleAnswer? = when (this) {
         null -> null
         else -> PuzzleAnswer(this)
     }
 
     /** Wraps a [String] into a [PuzzleInput] type. */
-    private fun String?.toPuzzleInput(): PuzzleInput? = when(this) {
+    private fun String?.toPuzzleInput(): PuzzleInput? = when (this) {
         null -> null
         else -> PuzzleInput(this)
     }
@@ -78,9 +78,9 @@ internal value class PuzzleInput(private val input: String) {
 
     /** Formats the input in a printable friendly manner. */
     @Suppress("MagicNumber")
-    fun preview(): String = when(input.count { it == '\n' }) {
+    fun preview(): String = when (input.count { it == '\n' }) {
         0 -> input
-        in 1 .. 5 -> "\n$input\n"
+        in 1..5 -> "\n$input\n"
         else -> buildString {
             val lines = input.lines()
             appendLine()
@@ -95,9 +95,4 @@ internal value class PuzzleInput(private val input: String) {
 @JvmInline
 internal value class PuzzleAnswer(private val answer: String) {
     override fun toString() = answer
-
-    companion object {
-        /** In the case of some days, there is no part two requirement. */
-        val NO_SOLUTION = PuzzleAnswer("=== No Solution ===")
-    }
 }