Skip to content

Commit cc716e3

Browse files
fibsifanfibsifan
committed
Restructure Test code
1 parent 23eaa60 commit cc716e3

File tree

7 files changed

+90
-316
lines changed

7 files changed

+90
-316
lines changed

‎src/test/kotlin/de/jball/aoc2021/Tests2021.kt‎

Lines changed: 13 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.jball.aoc2021
22

3+
import de.jball.AdventOfCodeDay
34
import de.jball.aoc2021.day01.Day01
45
import de.jball.aoc2021.day02.Day02
56
import de.jball.aoc2021.day03.Day03
@@ -18,97 +19,17 @@ import de.jball.aoc2021.day15.Day15
1819
import de.jball.aoc2021.day16.Day16
1920
import de.jball.aoc2021.day17.Day17
2021
import de.jball.aoc2021.day18.Day18
21-
import kotlin.test.Ignore
22-
import kotlin.test.Test
23-
24-
class Tests2021 {
25-
@Test
26-
fun day01() {
27-
Day01(true).run()
28-
}
29-
30-
@Test
31-
fun day02() {
32-
Day02(true).run()
33-
}
34-
35-
@Test
36-
fun day03() {
37-
Day03(true).run()
38-
}
39-
40-
@Test
41-
fun day04() {
42-
Day04(true).run()
43-
}
44-
45-
@Test
46-
fun day05() {
47-
Day05(true).run()
48-
}
49-
50-
@Test
51-
fun day06() {
52-
Day06(true).run()
53-
}
54-
55-
@Test
56-
fun day07() {
57-
Day07(true).run()
58-
}
59-
60-
@Test
61-
fun day08() {
62-
Day08(true).run()
63-
}
64-
65-
@Test
66-
fun day09() {
67-
Day09(true).run()
68-
}
69-
70-
@Test
71-
fun day10() {
72-
Day10(true).run()
73-
}
74-
75-
@Test
76-
fun day11() {
77-
Day11(true).run()
78-
}
79-
80-
@Test
81-
fun day12() {
82-
Day12(true).run()
83-
}
84-
85-
@Test
86-
fun day13() {
87-
Day13(true).run()
88-
}
89-
90-
@Test
91-
fun day14() {
92-
Day14(true).run()
93-
}
94-
95-
@Test
96-
fun day15() {
97-
Day15(true).run()
98-
}
99-
100-
@Test
101-
fun day16() {
102-
Day16(true).run()
103-
}
104-
105-
@Test
106-
fun day17() {
107-
Day17(true).run()
108-
}
109-
110-
@Test
111-
fun day18() {
112-
Day18(true).run()
22+
import de.jball.aoctestutils.AdventOfCodeDayTest
23+
import org.junit.jupiter.params.ParameterizedClass
24+
import org.junit.jupiter.params.provider.MethodSource
25+
26+
@ParameterizedClass
27+
@MethodSource("getDays")
28+
class Tests2021<T: AdventOfCodeDay<out Any>>(dayConstructor: (Boolean) -> T):
29+
AdventOfCodeDayTest<T>(dayConstructor) {
30+
companion object {
31+
@JvmStatic
32+
fun getDays() = listOf(::Day01, ::Day02, ::Day03, ::Day04, ::Day05, ::Day06, ::Day07, ::Day08, ::Day09,
33+
::Day10, ::Day11, ::Day12, ::Day13, ::Day14, ::Day15, ::Day16, ::Day17, ::Day18)
11334
}
11435
}

‎src/test/kotlin/de/jball/aoc2022/Tests2022.kt‎

Lines changed: 15 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.jball.aoc2022
22

3+
import de.jball.AdventOfCodeDay
34
import de.jball.aoc2022.day01.Day01
45
import de.jball.aoc2022.day02.Day02
56
import de.jball.aoc2022.day03.Day03
@@ -16,95 +17,19 @@ import de.jball.aoc2022.day13.Day13
1617
import de.jball.aoc2022.day14.Day14
1718
import de.jball.aoc2022.day15.Day15
1819
import de.jball.aoc2022.day16.Day16
19-
import de.jball.aoc2022.day19.Day19
20-
import kotlin.test.Ignore
21-
22-
import kotlin.test.Test
23-
24-
class Tests2022 {
25-
@Test
26-
fun day01() {
27-
Day01(true).run()
28-
}
29-
30-
@Test
31-
fun day02() {
32-
Day02(true).run()
33-
}
34-
35-
@Test
36-
fun day03() {
37-
Day03(true).run()
38-
}
39-
40-
@Test
41-
fun day04() {
42-
Day04(true).run()
43-
}
44-
45-
@Test
46-
fun day05() {
47-
Day05(true).run()
48-
}
49-
50-
@Test
51-
fun day06() {
52-
Day06(true).run()
53-
}
54-
55-
@Test
56-
fun day07() {
57-
Day07(true).run()
58-
}
59-
60-
@Test
61-
fun day08() {
62-
Day08(true).run()
63-
}
64-
65-
@Test
66-
fun day09() {
67-
Day09(true).run()
68-
}
69-
70-
@Test
71-
fun day10() {
72-
Day10(true).run()
73-
}
74-
75-
@Test
76-
fun day11() {
77-
Day11(true).run()
78-
}
79-
80-
@Test
81-
fun day12() {
82-
Day12(true).run()
83-
}
84-
85-
@Test
86-
fun day13() {
87-
Day13(true).run()
88-
}
89-
90-
@Test
91-
fun day14() {
92-
Day14(true).run()
93-
}
94-
95-
@Test
96-
fun day15() {
97-
Day15(true).run()
98-
}
99-
100-
@Test
101-
fun day16() {
102-
Day16(true).run()
103-
}
104-
105-
@Test
106-
@Ignore
107-
fun day19() {
108-
Day19(true).run()
20+
import de.jball.aoctestutils.AdventOfCodeDayTest
21+
import org.junit.jupiter.params.ParameterizedClass
22+
import org.junit.jupiter.params.provider.MethodSource
23+
24+
25+
@ParameterizedClass
26+
@MethodSource("getDays")
27+
class Tests2022<T: AdventOfCodeDay<out Any>>(dayConstructor: (Boolean) -> T):
28+
AdventOfCodeDayTest<T>(dayConstructor) {
29+
companion object {
30+
@JvmStatic
31+
fun getDays() = listOf(::Day01, ::Day02, ::Day03, ::Day04, ::Day05, ::Day06, ::Day07, ::Day08, ::Day09,
32+
::Day10, ::Day11, ::Day12, ::Day13, ::Day14, ::Day15,
33+
::Day16) // Day19
10934
}
11035
}

‎src/test/kotlin/de/jball/aoc2023/Tests2023.kt‎

Lines changed: 16 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.jball.aoc2023
22

3+
import de.jball.AdventOfCodeDay
34
import de.jball.aoc2023.day01.Day01
45
import de.jball.aoc2023.day02.Day02
56
import de.jball.aoc2023.day03.Day03
@@ -15,83 +16,20 @@ import de.jball.aoc2023.day13.Day13
1516
import de.jball.aoc2023.day14.Day14
1617
import de.jball.aoc2023.day15.Day15
1718
import de.jball.aoc2023.day17.Day17
18-
import kotlin.test.Ignore
19-
import kotlin.test.Test
20-
21-
class Tests2023 {
22-
@Test
23-
fun day01() {
24-
Day01(true).run()
25-
}
26-
27-
@Test
28-
fun day02() {
29-
Day02(true).run()
30-
}
31-
32-
@Test
33-
fun day03() {
34-
Day03(true).run()
35-
}
36-
37-
@Test
38-
fun day04() {
39-
Day04(true).run()
40-
}
41-
42-
@Test
43-
fun day05() {
44-
Day05(true).run()
45-
}
46-
47-
@Test
48-
fun day06() {
49-
Day06(true).run()
50-
}
51-
52-
@Test
53-
fun day07() {
54-
Day07(true).run()
55-
}
56-
57-
@Test
58-
fun day08() {
59-
Day08(true).run()
60-
}
61-
62-
@Test
63-
fun day09() {
64-
Day09(true).run()
65-
}
66-
67-
@Test
68-
fun day11() {
69-
Day11(true).run()
70-
}
71-
72-
@Test
73-
fun day12() {
74-
Day12(true).run()
75-
}
76-
77-
@Test
78-
fun day13() {
79-
Day13(true).run()
80-
}
81-
82-
@Test
83-
fun day14() {
84-
Day14(true).run()
85-
}
86-
87-
@Test
88-
fun day15() {
89-
Day15(true).run()
90-
}
91-
92-
@Test
93-
@Ignore
94-
fun day17() {
95-
Day17(true).run()
19+
import de.jball.aoctestutils.AdventOfCodeDayTest
20+
import org.junit.jupiter.params.ParameterizedClass
21+
import org.junit.jupiter.params.provider.MethodSource
22+
23+
@ParameterizedClass
24+
@MethodSource("getDays")
25+
class Tests2023<T: AdventOfCodeDay<out Any>>(dayConstructor: (Boolean) -> T):
26+
AdventOfCodeDayTest<T>(dayConstructor) {
27+
companion object {
28+
@JvmStatic
29+
fun getDays() = listOf(::Day01, ::Day02, ::Day03, ::Day04, ::Day05, ::Day06, ::Day07, ::Day08, ::Day09,
30+
//::Day10,
31+
::Day11, ::Day12, ::Day13, ::Day14)//, ::Day15,
32+
//::Day16,
33+
//::Day17)
9634
}
9735
}

0 commit comments

Comments
 (0)