Clean

2021/src/test/kotlin/BaseDayTest.kt

@@ -32,7 +32,7 @@ class Condition : ExecutionCondition {
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExtendWith(Condition::class)
-abstract class BaseDayTest(day: Int) {
+abstract class BaseDayTest() {
 
     abstract val example: String
 
@@ -46,7 +46,11 @@ abstract class BaseDayTest(day: Int) {
         BeanContext.run()
     }
 
-    val instance by lazy { ctx.value.getBean(ctx.value.findDayDefinition(day)) }
+    private val day by lazy(LazyThreadSafetyMode.NONE) {
+        this::class.java.simpleName.replace("Day", "").replace("Test", "").toInt()
+    }
+
+    val instance by lazy { ctx.value.getBean(ctx.value.findDayDefinition(day)!!) }
 
     private val exampleCtx = lazy {
         BeanContext.build()
@@ -54,7 +58,7 @@ abstract class BaseDayTest(day: Int) {
             .start()
     }
 
-    val exampleInstance by lazy { exampleCtx.value.getBean(exampleCtx.value.findDayDefinition(day)) }
+    val exampleInstance by lazy { exampleCtx.value.getBean(exampleCtx.value.findDayDefinition(day)!!) }
 
     @AfterAll
     fun `after all`() {

2021/src/test/kotlin/Day01Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day01Test : BaseDayTest(1) {
+class Day01Test : BaseDayTest() {
     override val example = """
         199
         200

2021/src/test/kotlin/Day02Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day02Test : BaseDayTest(2) {
+class Day02Test : BaseDayTest() {
     override val example = """
         forward 5
         down 5

2021/src/test/kotlin/Day03Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day03Test : BaseDayTest(3) {
+class Day03Test : BaseDayTest() {
     override val example = """
         00100
         11110

2021/src/test/kotlin/Day04Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day04Test : BaseDayTest(4) {
+class Day04Test : BaseDayTest() {
     override val example = """
         7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
 

2021/src/test/kotlin/Day05Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day05Test : BaseDayTest(5) {
+class Day05Test : BaseDayTest() {
     override val example = """
         0,9 -> 5,9
         8,0 -> 0,8

2021/src/test/kotlin/Day06Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day06Test : BaseDayTest(6) {
+class Day06Test : BaseDayTest() {
     override val example = """
         3,4,3,1,2
     """.trimIndent()

2021/src/test/kotlin/Day07Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day07Test : BaseDayTest(7) {
+class Day07Test : BaseDayTest() {
     override val example = """
         16,1,2,0,4,2,7,1,2,14
     """.trimIndent()

2021/src/test/kotlin/Day08Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day08Test : BaseDayTest(8) {
+class Day08Test : BaseDayTest() {
     override val example = """
         be cfbegad cbdgef fgaecd cgeb fdcge agebfd fecdb fabcd edb | fdgacbe cefdb cefbgd gcbe
         edbfga begcd cbg gc gcadebf fbgde acbgfd abcde gfcbed gfec | fcgedb cgb dgebacf gc

2021/src/test/kotlin/Day09Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day09Test : BaseDayTest(9) {
+class Day09Test : BaseDayTest() {
     override val example = """
         2199943210
         3987894921

2021/src/test/kotlin/Day10Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day10Test : BaseDayTest(10) {
+class Day10Test : BaseDayTest() {
     override val example = """
         [({(<(())[]>[[{[]{<()<>>
         [(()[<>])]({[<{<<[]>>(

2021/src/test/kotlin/Day11Test.kt

@@ -1,6 +1,6 @@
 package be.vandewalleh.aoc.days
 
-class Day11Test : BaseDayTest(11) {
+class Day11Test : BaseDayTest() {
     override val example = """
         5483143223
         2745854711