From 1a795e9ccefdcc086d4c890ec5ed527c786e0cf1 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Tue, 14 Dec 2021 01:23:19 +0000 Subject: Add inputs to 04 and fix tests --- test/01.lisp | 24 +++++++++++------------- test/02.lisp | 16 +++++++--------- test/03.lisp | 28 +++++++++++++--------------- test/04.lisp | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 37 deletions(-) create mode 100644 test/04.lisp (limited to 'test') diff --git a/test/01.lisp b/test/01.lisp index 46bb1b5..a21cac1 100644 --- a/test/01.lisp +++ b/test/01.lisp @@ -2,19 +2,17 @@ (defsuite 01/aoc (aoc)) -(defvar 01/default-input nil) - -(setf 01/default-input - '("199" - "200" - "208" - "210" - "200" - "207" - "240" - "269" - "260" - "263")) +(defvar 01/default-input + '("199" + "200" + "208" + "210" + "200" + "207" + "240" + "269" + "260" + "263")) ;;(time (format t "part 1: ~a~%" (part-a (parse-input "../inputs/01.txt")))) ;;(time (format t "part 1: ~a~%" (part-b (parse-input "../inputs/01.txt")))) diff --git a/test/02.lisp b/test/02.lisp index 631dd92..9070517 100644 --- a/test/02.lisp +++ b/test/02.lisp @@ -2,15 +2,13 @@ (defsuite 02/aoc (aoc)) -(defvar 02/default-input nil) - -(setf 02/default-input - '("forward 5" - "down 5" - "forward 8" - "up 3" - "down 8" - "forward 2")) +(defvar 02/default-input + '("forward 5" + "down 5" + "forward 8" + "up 3" + "down 8" + "forward 2")) (deftest 02/test-ex-a (02/aoc) (let ((result (02/part-a (02/parse-input-direct 02/default-input)))) diff --git a/test/03.lisp b/test/03.lisp index 000ece8..cc8085f 100644 --- a/test/03.lisp +++ b/test/03.lisp @@ -2,21 +2,19 @@ (defsuite 03/aoc (aoc)) -(defvar 03/default-input nil) - -(setf 03/default-input - '("00100" - "11110" - "10110" - "10111" - "10101" - "01111" - "00111" - "11100" - "10000" - "11001" - "00010" - "01010")) +(defvar 03/default-input + '("00100" + "11110" + "10110" + "10111" + "10101" + "01111" + "00111" + "11100" + "10000" + "11001" + "00010" + "01010")) (deftest 03/test-ex-a (03/aoc) (let ((result (03/part-a (03/parse-input-direct 03/default-input)))) diff --git a/test/04.lisp b/test/04.lisp new file mode 100644 index 0000000..cccaf4e --- /dev/null +++ b/test/04.lisp @@ -0,0 +1,42 @@ +(use-package :clunit) + +(defsuite 04/aoc (aoc)) + +(defvar 04/default-input + '("7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1" + "" + "22 13 17 11 0" + " 8 2 23 4 24" + "21 9 14 16 7" + " 6 10 3 18 5" + " 1 12 20 15 19" + "" + " 3 15 0 2 22" + " 9 18 13 17 5" + "19 8 7 25 23" + "20 11 10 24 4" + "14 21 16 12 6" + "" + "14 21 17 24 4" + "10 16 15 9 19" + "18 8 23 26 20" + "22 11 13 6 5" + " 2 0 12 3 7")) + +(deftest 04/test-ex-a (04/aoc) + (let ((result (04/part-a (04/parse-input-direct 04/default-input)))) + (assert-equalp 4512 result))) + +(deftest 04/test-ex-b (04/aoc) + (let ((result (04/part-b (04/parse-input-direct 04/default-input)))) + (assert-equalp 0 result))) + +(deftest 04/test-a (04/aoc) + (let ((result (04/part-a (04/parse-input "inputs/04.txt")))) + (assert-equalp 0 result))) + +(deftest 04/test-b (04/aoc) + (let ((result (04/part-b (04/parse-input "inputs/04.txt")))) + (assert-equalp 0 result))) + +(defun 04/run-tests () (run-suite '04/aoc)) -- cgit