Skip to content

Commit 1b64e29

Browse files
committed
chore: using using rather than dangling resources
1 parent 81d3912 commit 1b64e29

1 file changed

Lines changed: 23 additions & 16 deletions

File tree

2023/src/test/scala/com/markkovari/adventofcode/Day04Tests.scala

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ import com.markkovari.adventofcode.day04.*
44
import org.scalatest.funsuite.AnyFunSuite
55

66
import scala.io.Source
7+
import scala.util.Using
78

89
class Day04Tests extends AnyFunSuite {
910

1011
test("Card is parsed correctly") {
11-
12-
// Card 6: 31 18 13 56 72 | 74 77 10 23 35 67 36 11
1312
val input = "Card 6: 31 18 13 56 72 | 74 77 10 23 35 67 36 11"
1413
val card = parseCard(input)
1514
assert(card.id == 6)
@@ -18,29 +17,37 @@ class Day04Tests extends AnyFunSuite {
1817
}
1918

2019
test("Card is scored correctly") {
21-
val example = Source.fromFile("./src/test/resources/4/example_1").mkString
22-
val cards = parseCards(example)
23-
val scores = cards.map(_.getScore())
24-
assert(scores == List(8, 2, 2, 1, 0, 0))
20+
Using(Source.fromFile("./src/test/resources/4/example_1")) { source =>
21+
val example = source.mkString
22+
val cards = parseCards(example)
23+
val scores = cards.map(_.getScore())
24+
assert(scores == List(8, 2, 2, 1, 0, 0))
25+
}
2526
}
2627

2728
test("First solution") {
28-
val example = Source.fromFile("./src/test/resources/4/values").mkString
29-
val cards = parseCards(example)
30-
val scores = cards.map(_.getScore())
31-
assert(scores.sum == 22193)
29+
Using(Source.fromFile("./src/test/resources/4/values")) { source =>
30+
val example = source.mkString
31+
val cards = parseCards(example)
32+
val scores = cards.map(_.getScore())
33+
assert(scores.sum == 22193)
34+
}
3235
}
3336

3437
test("Example part2") {
35-
val example = Source.fromFile("./src/test/resources/4/example_1").mkString
36-
val ticketAmount = part2(example)
37-
assert(ticketAmount - 1 == 30)
38+
Using(Source.fromFile("./src/test/resources/4/example_1")) { source =>
39+
val example = source.mkString
40+
val ticketAmount = part2(example)
41+
assert(ticketAmount == 29)
42+
}
3843
}
3944

4045
test("Solution part2") {
41-
val example = Source.fromFile("./src/test/resources/4/values").mkString
42-
val ticketAmount = part2_(example)
43-
assert(ticketAmount == "5625994")
46+
Using(Source.fromFile("./src/test/resources/4/values")) { source =>
47+
val example = source.mkString
48+
val ticketAmount = part2_(example)
49+
assert(ticketAmount == "5625994")
50+
}
4451
}
4552

4653
}

0 commit comments

Comments
 (0)