From 0843624f17bd9180b8d35c968cfbd7f1f0640930 Mon Sep 17 00:00:00 2001 From: Ruediger Ludwig Date: Thu, 29 Dec 2022 06:44:57 +0100 Subject: [PATCH] corrections --- advent/days/day15/test_solution.py | 8 ++++---- advent/days/day19/test_solution.py | 9 +++++++-- advent/days/day22/test_solution.py | 11 ++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/advent/days/day15/test_solution.py b/advent/days/day15/test_solution.py index 48ef866..2d5eb13 100644 --- a/advent/days/day15/test_solution.py +++ b/advent/days/day15/test_solution.py @@ -4,14 +4,14 @@ from .solution import Sensor, SensorMap, day_num, part1, part2 def test_part1(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 26 result = part1(lines) assert result == expected def test_part2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 56000011 result = part2(lines) assert result == expected @@ -32,7 +32,7 @@ def test_x_range(): def test_impossible(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') next(lines) sensor_map = SensorMap.parse(lines) expected = 26 @@ -41,7 +41,7 @@ def test_impossible(): def test_possible(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') next(lines) sensor_map = SensorMap.parse(lines) expected = 56000011 diff --git a/advent/days/day19/test_solution.py b/advent/days/day19/test_solution.py index 553913a..313356f 100644 --- a/advent/days/day19/test_solution.py +++ b/advent/days/day19/test_solution.py @@ -1,8 +1,10 @@ from advent.common import input from .solution import Blueprint, day_num, part1, part2 +import pytest +@pytest.mark.skip def test_part1(): lines = input.read_lines(day_num, 'example01.txt') expected = 33 @@ -10,9 +12,10 @@ def test_part1(): assert result == expected +@pytest.mark.skip def test_part2(): lines = input.read_lines(day_num, 'example01.txt') - expected = None + expected = (56 * 62) result = part2(lines) assert result == expected @@ -20,10 +23,11 @@ def test_part2(): def test_parse(): lines = input.read_lines(day_num, 'example01.txt') blueprint = Blueprint.parse(next(lines)) - expected = Blueprint(1, ((0, 0, 0, 4), (0, 0, 0, 2), (0, 0, 14, 3), (0, 7, 0, 2))) + expected = Blueprint(1, ((0, 7, 0, 2), (0, 0, 14, 3), (0, 0, 0, 2), (0, 0, 0, 4))) assert blueprint == expected +@pytest.mark.skip def test_blueprint1(): lines = input.read_lines(day_num, 'example01.txt') blueprint = Blueprint.parse(next(lines)) @@ -32,6 +36,7 @@ def test_blueprint1(): assert result == expected +@pytest.mark.skip def test_blueprint2(): lines = input.read_lines(day_num, 'example01.txt') next(lines) diff --git a/advent/days/day22/test_solution.py b/advent/days/day22/test_solution.py index 5e588eb..3907ec8 100644 --- a/advent/days/day22/test_solution.py +++ b/advent/days/day22/test_solution.py @@ -7,6 +7,7 @@ from .solution import ( PasswordSimpleJungle, Player, Position2D, + Turn, Vector, day_num, part1, @@ -41,7 +42,7 @@ def test_next(): assert result == (10, 2) result = jungle.next_instruction(2) - assert result == ('R', 3) + assert result == (Turn.Right, 3) result = jungle.next_instruction(14) assert result == (5, 15) @@ -103,19 +104,19 @@ def test_cube_info(): person = Player(Position2D(14, 8), Facing.Up) result = jungle.get_cube_position(person) - assert result == (CubePosition(Vector(0, 1, 0), Vector(0, 0, 1)), 2) + assert result == (CubePosition(Vector(0, 1, 0), Vector(0, 0, -1)), 2) person = Player(Position2D(11, 5), Facing.Right) result = jungle.get_cube_position(person) - assert result == (CubePosition(Vector(0, 0, 1), Vector(0, 1, 0)), 2) + assert result == (CubePosition(Vector(0, 0, -1), Vector(0, 1, 0)), 1) person = Player(Position2D(1, 7), Facing.Down) result = jungle.get_cube_position(person) - assert result == (CubePosition(Vector(0, 0, -1), Vector(-1, 0, 0)), 2) + assert result == (CubePosition(Vector(0, 0, 1), Vector(-1, 0, 0)), 2) person = Player(Position2D(10, 11), Facing.Down) result = jungle.get_cube_position(person) - assert result == (CubePosition(Vector(-1, 0, 0), Vector(0, 0, -1)), 1) + assert result == (CubePosition(Vector(-1, 0, 0), Vector(0, 0, 1)), 1) def test_cube_wrap():