Simplify structure and tests

Author: hsz

README.md

@@ -1,6 +1,15 @@
-# advent-of-code-kotlin-template
-Advent of Code template project for Kotlin
+# Advent of Code Kotlin Template
+
+[Advent of Code][aoc] – an annual event that happens in December since 2015.
+Every year since then, with the first of December, a programming puzzles contest are published every day for twenty-four days.
+A set of Christmas-oriented challenges provide an input you have to use to provide an answer using the language of your choice.
+Within this repository, we offer you a template prepared to use with [Kotlin][kotlin] language.
+
+## Workflow
+**Advent of Code Kotlin Template** is a special type of GitHub repository which lets you speed up the preparation phase and start writing your solutions immediately.
 
 ![file:kotlin]
 
+[aoc]: https://adventofcode.com
+[kotlin]: https://kotlinlang.org
 [file:kotlin]: .github/readme/kotlin.svg

build.gradle.kts

@@ -7,7 +7,6 @@ version = project.property("version").toString()
 
 dependencies {
     testImplementation(kotlin("test"))
-    testImplementation(kotlin("test-junit5"))
 }
 
 repositories {

src/main/kotlin/com/github/hsz/aoc/Day.kt

@@ -1,10 +1,12 @@
 package com.github.hsz.aoc
 
-abstract class Day(year: Number, day: Number) {
+import com.github.hsz.aoc.utils.Resources
 
-    val input = Resources.asString("aoc${year}/day${day.toString().padStart(2, '0')}.txt")
+abstract class Day(val number: Number) {
 
-    abstract fun part1(input: String): Number
+    val input = Resources.asString("day${number.toString().padStart(2, '0')}.txt")
 
-    abstract fun part2(input: String): Number
+    abstract fun part1(input: String): Any
+
+    abstract fun part2(input: String): Any
 }

src/main/kotlin/com/github/hsz/aoc/Day01.kt

@@ -0,0 +1,11 @@
+package com.github.hsz.aoc
+
+class Day01 : Day(1) {
+    override fun part1(input: String): Int {
+        return 0
+    }
+
+    override fun part2(input: String): Int {
+        return 0
+    }
+}

src/main/kotlin/com/github/hsz/aoc/aoc2021/Day01.kt

@@ -1,4 +1,4 @@
-package com.github.hsz.aoc
+package com.github.hsz.aoc.utils
 
 internal object Resources {
 

src/main/kotlin/com/github/hsz/aoc/Resources.kt renamed to src/main/kotlin/com/github/hsz/aoc/utils/Resources.kt

@@ -0,0 +1,17 @@
+package com.github.hsz.aoc
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class Day01Test : DayTest(Day01()) {
+    @Test
+    fun part1() {
+        assertEquals(0, day.part1(""))
+    }
+
+    @Test
+    fun part2() {
+        assertEquals(0, day.part2(""))
+        assertEquals(0, day.part2(day.input))
+    }
+}

src/main/kotlin/com/github/hsz/aoc/utils.kt renamed to src/main/kotlin/com/github/hsz/aoc/utils/utils.kt

@@ -1,27 +1,16 @@
 package com.github.hsz.aoc
 
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.DynamicTest
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.TestInstance
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 abstract class DayTest(val day: Day) {
-
-    fun test(
-        function: (String) -> Number,
-        answer: Number,
-        testData: Collection<Pair<String, Number>> = emptyList(),
-        asserts: Collection<Pair<Number, Number>> = emptyList(),
-    ) =
-        testData.mapIndexed { index, (testInput, expected) ->
-            DynamicTest.dynamicTest("Test case #${index + 1}") {
-                Assertions.assertEquals(expected, function(testInput.trimIndent()))
-            }
-        } +
-            asserts.mapIndexed { index, (testValue, expected) ->
-                DynamicTest.dynamicTest("Test case #${index + 1 + testData.size}") {
-                    Assertions.assertEquals(expected, testValue)
-                }
-            } +
-            DynamicTest.dynamicTest("Solution") {
-                Assertions.assertEquals(answer, function(day.input))
-            }
+    @AfterAll
+    fun solve() {
+        with(day) {
+            println("Solutions for Day $number:")
+            println("Part 1: ${part1(input)}")
+            println("Part 2: ${part2(input)}")
+        }
+    }
 }