From 61f499e8e91a75283017ea3c848bf47579d67879 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Sat, 14 Dec 2019 16:10:10 +0100 Subject: [PATCH] Remove more old intcode references. --- 2019/tests/test_intcode.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/2019/tests/test_intcode.cpp b/2019/tests/test_intcode.cpp index b6ff832..a1ef0fa 100644 --- a/2019/tests/test_intcode.cpp +++ b/2019/tests/test_intcode.cpp @@ -2,34 +2,39 @@ #include "utils.hpp" using aoc2019::run_intcode; +using aoc2019::IntCodeComputer; -auto run_program(std::vector program, std::deque input) { - return run_intcode(program, std::move(input)); +auto run_program(std::vector program, std::deque input) { + std::deque output; + IntCodeComputer computer(std::move(program), std::move(input)); + computer.connectOutput(output); + computer.run(); + return output; } TEST(Intcode, TestPositionEquality) { - const std::vector program = {3, 9, 8, 9, 10, 9, 4, 9, 99, -1, 8}; + const std::vector program = {3, 9, 8, 9, 10, 9, 4, 9, 99, -1, 8}; ASSERT_EQ(1, run_program(program, {8}).front()); ASSERT_EQ(0, run_program(program, {9}).front()); } TEST(Intcode, TestPositionLess) { - const std::vector program = {3, 9, 7, 9, 10, 9, 4, 9, 99, -1, 8}; + const std::vector program = {3, 9, 7, 9, 10, 9, 4, 9, 99, -1, 8}; ASSERT_EQ(1, run_program(program, {7}).front()); ASSERT_EQ(0, run_program(program, {9}).front()); } TEST(Intcode, TestImmediateEquality) { - const std::vector program = {3, 3, 1108, -1, 8, 3, 4, 3, 99}; + const std::vector program = {3, 3, 1108, -1, 8, 3, 4, 3, 99}; ASSERT_EQ(1, run_program(program, {8}).front()); ASSERT_EQ(0, run_program(program, {9}).front()); } TEST(Intcode, TestImmediateLess) { - const std::vector program = {3, 3, 1107, -1, 8, 3, 4, 3, 99}; + const std::vector program = {3, 3, 1107, -1, 8, 3, 4, 3, 99}; ASSERT_EQ(1, run_program(program, {7}).front()); ASSERT_EQ(0, run_program(program, {9}).front());