[2019] Use private inputs

kfarnung · kfarnung · commit 4d3f21e679ba · 2024-11-29T22:34:31.000-08:00
diff --git a/2019/tests/day01.rs b/2019/tests/day01.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day01::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day01");
+    let content = std::include_str!("../../private/inputs/2019/day01.txt");
     assert_eq!(part1(&content), 3497399);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day01");
+    let content = std::include_str!("../../private/inputs/2019/day01.txt");
     assert_eq!(part2(&content), 5243207);
 }
diff --git a/2019/tests/day02.rs b/2019/tests/day02.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day02::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day02");
+    let content = std::include_str!("../../private/inputs/2019/day02.txt");
     assert_eq!(part1(&content), 8017076);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day02");
+    let content = std::include_str!("../../private/inputs/2019/day02.txt");
     assert_eq!(part2(&content), 3146);
 }
diff --git a/2019/tests/day03.rs b/2019/tests/day03.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day03::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day03");
+    let content = std::include_str!("../../private/inputs/2019/day03.txt");
     assert_eq!(part1(&content), 1211);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day03");
+    let content = std::include_str!("../../private/inputs/2019/day03.txt");
     assert_eq!(part2(&content), 101386);
 }
diff --git a/2019/tests/day04.rs b/2019/tests/day04.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day04::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day04");
+    let content = std::include_str!("../../private/inputs/2019/day04.txt");
     assert_eq!(part1(&content), 889);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day04");
+    let content = std::include_str!("../../private/inputs/2019/day04.txt");
     assert_eq!(part2(&content), 589);
 }
diff --git a/2019/tests/day05.rs b/2019/tests/day05.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day05::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day05");
+    let content = std::include_str!("../../private/inputs/2019/day05.txt");
     assert_eq!(part1(&content), 7157989);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day05");
+    let content = std::include_str!("../../private/inputs/2019/day05.txt");
     assert_eq!(part2(&content), 7873292);
 }
diff --git a/2019/tests/day06.rs b/2019/tests/day06.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day06::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day06");
+    let content = std::include_str!("../../private/inputs/2019/day06.txt");
     assert_eq!(part1(&content), 621125);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day06");
+    let content = std::include_str!("../../private/inputs/2019/day06.txt");
     assert_eq!(part2(&content), 550);
 }
diff --git a/2019/tests/day07.rs b/2019/tests/day07.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day07::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day07");
+    let content = std::include_str!("../../private/inputs/2019/day07.txt");
     assert_eq!(part1(&content), 368584);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day07");
+    let content = std::include_str!("../../private/inputs/2019/day07.txt");
     assert_eq!(part2(&content), 35993240);
 }
diff --git a/2019/tests/day08.rs b/2019/tests/day08.rs
@@ -9,12 +9,12 @@ const PART2_EXPECTED: &'static str = r"###   ##  #  # #     ##
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day08");
+    let content = std::include_str!("../../private/inputs/2019/day08.txt");
     assert_eq!(part1(&content), 1920);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day08");
+    let content = std::include_str!("../../private/inputs/2019/day08.txt");
     assert_eq!(part2(&content), PART2_EXPECTED);
 }
diff --git a/2019/tests/day09.rs b/2019/tests/day09.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day09::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day09");
+    let content = std::include_str!("../../private/inputs/2019/day09.txt");
     assert_eq!(part1(&content), 2789104029);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day09");
+    let content = std::include_str!("../../private/inputs/2019/day09.txt");
     assert_eq!(part2(&content), 32869);
 }
diff --git a/2019/tests/day10.rs b/2019/tests/day10.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day10::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day10");
+    let content = std::include_str!("../../private/inputs/2019/day10.txt");
     assert_eq!(part1(&content), 329);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day10");
+    let content = std::include_str!("../../private/inputs/2019/day10.txt");
     assert_eq!(part2(&content), 512);
 }
diff --git a/2019/tests/day11.rs b/2019/tests/day11.rs
@@ -9,12 +9,12 @@ const PART2_EXPECTED: &'static str = r" #### ####  ##  #  # #  # ####  ##   ##
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day11");
+    let content = std::include_str!("../../private/inputs/2019/day11.txt");
     assert_eq!(part1(&content), 2211);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day11");
+    let content = std::include_str!("../../private/inputs/2019/day11.txt");
     assert_eq!(part2(&content), PART2_EXPECTED);
 }
diff --git a/2019/tests/day12.rs b/2019/tests/day12.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day12::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day12");
+    let content = std::include_str!("../../private/inputs/2019/day12.txt");
     assert_eq!(part1(&content), 12053);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day12");
+    let content = std::include_str!("../../private/inputs/2019/day12.txt");
     assert_eq!(part2(&content), 320380285873116);
 }
diff --git a/2019/tests/day13.rs b/2019/tests/day13.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day13::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day13");
+    let content = std::include_str!("../../private/inputs/2019/day13.txt");
     assert_eq!(part1(&content), 270);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day13");
+    let content = std::include_str!("../../private/inputs/2019/day13.txt");
     assert_eq!(part2(&content), 12535);
 }
diff --git a/2019/tests/day14.rs b/2019/tests/day14.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day14::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day14");
+    let content = std::include_str!("../../private/inputs/2019/day14.txt");
     assert_eq!(part1(&content), 301997);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day14");
+    let content = std::include_str!("../../private/inputs/2019/day14.txt");
     assert_eq!(part2(&content), 6216589);
 }
diff --git a/2019/tests/day15.rs b/2019/tests/day15.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day15::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day15");
+    let content = std::include_str!("../../private/inputs/2019/day15.txt");
     assert_eq!(part1(&content), 404);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day15");
+    let content = std::include_str!("../../private/inputs/2019/day15.txt");
     assert_eq!(part2(&content), 406);
 }
diff --git a/2019/tests/day16.rs b/2019/tests/day16.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day16::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day16");
+    let content = std::include_str!("../../private/inputs/2019/day16.txt");
     assert_eq!(part1(&content), 11833188);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day16");
+    let content = std::include_str!("../../private/inputs/2019/day16.txt");
     assert_eq!(part2(&content), 55005000);
 }
diff --git a/2019/tests/day17.rs b/2019/tests/day17.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day17::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day17");
+    let content = std::include_str!("../../private/inputs/2019/day17.txt");
     assert_eq!(part1(&content), 6212);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day17");
+    let content = std::include_str!("../../private/inputs/2019/day17.txt");
     assert_eq!(part2(&content), 1016741);
 }
diff --git a/2019/tests/day18.rs b/2019/tests/day18.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day18::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day18");
+    let content = std::include_str!("../../private/inputs/2019/day18.txt");
     assert_eq!(part1(&content), 3832);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day18");
+    let content = std::include_str!("../../private/inputs/2019/day18.txt");
     assert_eq!(part2(&content), 1724);
 }
diff --git a/2019/tests/day19.rs b/2019/tests/day19.rs
@@ -2,12 +2,12 @@ use aoc2019::days::day19::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day19");
+    let content = std::include_str!("../../private/inputs/2019/day19.txt");
     assert_eq!(part1(&content), 197);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day19");
+    let content = std::include_str!("../../private/inputs/2019/day19.txt");
     assert_eq!(part2(&content), 9181022);
 }
diff --git a/2022/tests/day01.rs b/2022/tests/day01.rs
@@ -2,12 +2,12 @@ use aoc2022::days::day01::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day01.txt");
+    let content = std::include_str!("../../private/inputs/2019/day01.txt.txt");
     assert_eq!(part1(&content), 71780);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day01.txt");
+    let content = std::include_str!("../../private/inputs/2019/day01.txt.txt");
     assert_eq!(part2(&content), 212489);
 }
diff --git a/2022/tests/day02.rs b/2022/tests/day02.rs
@@ -2,12 +2,12 @@ use aoc2022::days::day02::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day02.txt");
+    let content = std::include_str!("../../private/inputs/2019/day02.txt.txt");
     assert_eq!(part1(&content), 12156);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day02.txt");
+    let content = std::include_str!("../../private/inputs/2019/day02.txt.txt");
     assert_eq!(part2(&content), 10835);
 }
diff --git a/2022/tests/day03.rs b/2022/tests/day03.rs
@@ -2,12 +2,12 @@ use aoc2022::days::day03::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day03.txt");
+    let content = std::include_str!("../../private/inputs/2019/day03.txt.txt");
     assert_eq!(part1(&content), 8240);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day03.txt");
+    let content = std::include_str!("../../private/inputs/2019/day03.txt.txt");
     assert_eq!(part2(&content), 2587);
 }
diff --git a/2022/tests/day04.rs b/2022/tests/day04.rs
@@ -2,12 +2,12 @@ use aoc2022::days::day04::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day04.txt");
+    let content = std::include_str!("../../private/inputs/2019/day04.txt.txt");
     assert_eq!(part1(&content), 483);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day04.txt");
+    let content = std::include_str!("../../private/inputs/2019/day04.txt.txt");
     assert_eq!(part2(&content), 874);
 }
diff --git a/2022/tests/day05.rs b/2022/tests/day05.rs
@@ -2,12 +2,12 @@ use aoc2022::days::day05::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day05.txt");
+    let content = std::include_str!("../../private/inputs/2019/day05.txt.txt");
     assert_eq!(part1(&content), "ZBDRNPMVH");
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day05.txt");
+    let content = std::include_str!("../../private/inputs/2019/day05.txt.txt");
     assert_eq!(part2(&content), "WDLPFNNNB");
 }
diff --git a/2022/tests/day06.rs b/2022/tests/day06.rs
@@ -2,12 +2,12 @@ use aoc2022::days::day06::{part1, part2};
 
 #[test]
 fn test_part1() {
-    let content = std::include_str!("../data/day06.txt");
+    let content = std::include_str!("../../private/inputs/2019/day06.txt.txt");
     assert_eq!(part1(&content), 1262);
 }
 
 #[test]
 fn test_part2() {
-    let content = std::include_str!("../data/day06.txt");
+    let content = std::include_str!("../../private/inputs/2019/day06.txt.txt");
     assert_eq!(part2(&content), 3444);
 }

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ use aoc2019::days::day01::{part1, part2};`
`2`	`2`
`3`	`3`	`#[test]`
`4`	`4`	`fn test_part1() {`
`5`		`- let content = std::include_str!("../data/day01");`
	`5`	`+ let content = std::include_str!("../../private/inputs/2019/day01.txt");`
`6`	`6`	`assert_eq!(part1(&content), 3497399);`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`#[test]`
`10`	`10`	`fn test_part2() {`
`11`		`- let content = std::include_str!("../data/day01");`
	`11`	`+ let content = std::include_str!("../../private/inputs/2019/day01.txt");`
`12`	`12`	`assert_eq!(part2(&content), 5243207);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ const PART2_EXPECTED: &'static str = r"### ## # # # ##`
`9`	`9`
`10`	`10`	`#[test]`
`11`	`11`	`fn test_part1() {`
`12`		`- let content = std::include_str!("../data/day08");`
	`12`	`+ let content = std::include_str!("../../private/inputs/2019/day08.txt");`
`13`	`13`	`assert_eq!(part1(&content), 1920);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`#[test]`
`17`	`17`	`fn test_part2() {`
`18`		`- let content = std::include_str!("../data/day08");`
	`18`	`+ let content = std::include_str!("../../private/inputs/2019/day08.txt");`
`19`	`19`	`assert_eq!(part2(&content), PART2_EXPECTED);`
`20`	`20`	`}`