tests

thejchap · thejchap · commit 371b69a26724 · 2020-12-22T18:03:25.000-08:00
diff --git a/advent/fs.py b/advent/fs.py
@@ -10,9 +10,14 @@
 TEST = """
 """
 
+def _pt1(lines):
+    pass
 
-def main():
+def _pt2(lines):
     pass
+
+def main():
+    return afs.input_lines(tests=[TEST], parts=[_pt1, _pt2])
 '''
 
 
@@ -39,12 +44,12 @@ def read_input(caller=None):
 @with_caller
 def input_lines(
     caller,
-    other_inputs=[],
+    tests=[],
     parts=[],
     transform_lines=lambda g: g,
     transform_line=lambda l: l,
 ):
-    inputs = other_inputs + [read_input(caller)]
+    inputs = tests + [read_input(caller)]
     results = []
 
     for part in parts:
@@ -58,13 +63,13 @@ def input_lines(
 @with_caller
 def input_groups(
     caller,
-    other_inputs=[],
+    tests=[],
     parts=[],
     transform_groups=lambda g: g,
     transform_group=lambda g: g,
     sep="\n\n",
 ):
-    inputs = other_inputs + [read_input(caller)]
+    inputs = tests + [read_input(caller)]
     results = []
 
     for part in parts:
diff --git a/advent/year_2020/__init__.py b/advent/year_2020/__init__.py
@@ -1,8 +1,24 @@
-from os.path import dirname, basename, isfile, join
-import glob
-
-modules = glob.glob(join(dirname(__file__), "*.py"))
-
-__all__ = [
-    basename(f)[:-3] for f in modules if isfile(f) and not f.endswith("__init__.py")
-]
+from . import (
+    day_01,
+    day_02,
+    day_03,
+    day_04,
+    day_05,
+    day_06,
+    day_07,
+    day_08,
+    day_09,
+    day_10,
+    day_11,
+    day_12,
+    day_13,
+    day_14,
+    day_15,
+    day_16,
+    day_17,
+    day_18,
+    day_19,
+    day_20,
+    day_21,
+    day_22,
+)
diff --git a/advent/year_2020/day_01.py b/advent/year_2020/day_01.py
@@ -70,5 +70,5 @@ def main():
     return afs.input_lines(
         transform_line=int,
         parts=[pt1, pt2],
-        other_inputs=[TEST],
+        tests=[TEST],
     )
diff --git a/advent/year_2020/day_02.py b/advent/year_2020/day_02.py
@@ -75,7 +75,7 @@ def _solve(results):
 
 def main():
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_solve],
         transform_line=_validate,
     )
diff --git a/advent/year_2020/day_03.py b/advent/year_2020/day_03.py
@@ -122,7 +122,7 @@ def _pt2(grid):
 
 def main():
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         transform_line=list,
         parts=[_pt1, _pt2],
     )
diff --git a/advent/year_2020/day_06.py b/advent/year_2020/day_06.py
@@ -128,7 +128,7 @@ def main():
     pt2 = lambda s: sum([_pt2(g) for g in s])
 
     return afs.input_groups(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[pt1, pt2],
         transform_group=lambda g: g.splitlines(),
     )
diff --git a/advent/year_2020/day_07.py b/advent/year_2020/day_07.py
@@ -134,7 +134,7 @@ def main():
     pt2 = lambda a: _count(b, a[0])
 
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[pt1, pt2],
         transform_lines=_build_graph,
     )
diff --git a/advent/year_2020/day_08.py b/advent/year_2020/day_08.py
@@ -161,7 +161,7 @@ def main():
     pt2 = lambda ins: _dfs(0, 0, ins, [0] * len(ins), True)[1]
 
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[pt1, pt2],
         transform_line=lambda l: l.split(" "),
     )
diff --git a/advent/year_2020/day_10.py b/advent/year_2020/day_10.py
@@ -199,7 +199,7 @@ def tr(lines):
         return [0] + lines + [lines[-1] + 3]
 
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         transform_lines=tr,
         parts=[_pt1, _pt2],
     )
diff --git a/advent/year_2020/day_11.py b/advent/year_2020/day_11.py
@@ -291,7 +291,7 @@ def neighbors(g, r, c):
 
 def main():
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_pt1, _pt2],
         transform_line=lambda l: [[None, MAPPING[s]] for s in l],
     )
diff --git a/advent/year_2020/day_12.py b/advent/year_2020/day_12.py
@@ -190,6 +190,6 @@ def _transform(line):
 def main():
     return afs.input_lines(
         parts=[_pt1, _pt2],
-        other_inputs=[TEST],
+        tests=[TEST],
         transform_line=_transform,
     )
diff --git a/advent/year_2020/day_14.py b/advent/year_2020/day_14.py
@@ -164,15 +164,15 @@ def main():
     sep, tr = "mask", lambda gs: [g.splitlines() for g in gs[1:]]
 
     a1 = afs.input_groups(
-        other_inputs=[TEST1],
+        tests=[TEST1],
         parts=[_pt1],
         transform_groups=tr,
         transform_group=_transform_group,
         sep="mask",
     )
 
     a2 = afs.input_groups(
-        other_inputs=[TEST2],
+        tests=[TEST2],
         parts=[_pt1, _pt2],
         transform_groups=tr,
         transform_group=_transform_group,
diff --git a/advent/year_2020/day_15.py b/advent/year_2020/day_15.py
@@ -96,7 +96,7 @@ def _pt2(lines):
 
 def main():
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_pt1, _pt2],
         transform_line=lambda l: list(map(int, l.split(","))),
     )
diff --git a/advent/year_2020/day_16.py b/advent/year_2020/day_16.py
@@ -265,7 +265,7 @@ def _transform(groups):
 
 def main():
     return afs.input_groups(
-        other_inputs=[TEST1, TEST2],
+        tests=[TEST1, TEST2],
         transform_groups=_transform,
         parts=[_pt1, _pt2],
     )
diff --git a/advent/year_2020/day_17.py b/advent/year_2020/day_17.py
@@ -521,7 +521,7 @@ def main():
     transform = lambda l: np.array([[MAPPING[s] for s in r] for r in l], np.int)
 
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_pt1, _pt2],
         transform_lines=transform,
     )
diff --git a/advent/year_2020/day_18.py b/advent/year_2020/day_18.py
@@ -148,7 +148,7 @@ def _pt2(exprs):
 
 def main():
     return afs.input_lines(
-        other_inputs=[TEST1, TEST2],
+        tests=[TEST1, TEST2],
         parts=[_pt1, _pt2],
         transform_line=lambda l: re.sub(r"\s+", "", l),
     )
diff --git a/advent/year_2020/day_19.py b/advent/year_2020/day_19.py
@@ -256,7 +256,7 @@ def parse(m):
 
 def main():
     return afs.input_groups(
-        other_inputs=[TEST1, TEST2],
+        tests=[TEST1, TEST2],
         parts=[_pt1, _pt2],
         transform_groups=lambda g: (g[0], g[1].splitlines()),
     )
diff --git a/advent/year_2020/day_20.py b/advent/year_2020/day_20.py
@@ -666,7 +666,7 @@ def _transform(g):
 
 def main():
     return afs.input_groups(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_pt1, _pt2],
         transform_group=_transform,
     )
diff --git a/advent/year_2020/day_21.py b/advent/year_2020/day_21.py
@@ -122,7 +122,7 @@ def _transform(l):
 
 def main():
     return afs.input_lines(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_pt1, _pt2],
         transform_line=_transform,
     )
diff --git a/advent/year_2020/day_22.py b/advent/year_2020/day_22.py
@@ -412,20 +412,6 @@
 
 from advent.tools import *
 
-TEST = """Player 1:
-9
-2
-6
-3
-1
-
-Player 2:
-5
-8
-4
-7
-10"""
-
 
 def _winning_score(p1, p2):
     return sum(c * (i + 1) for i, c in enumerate(list(p1 or p2)[::-1]))
@@ -492,11 +478,26 @@ def _pt2(groups):
     return _winning_score(*_game(*groups))
 
 
+TEST = """Player 1:
+9
+2
+6
+3
+1
+
+Player 2:
+5
+8
+4
+7
+10"""
+
+
 def main():
     tr = lambda g: cl.deque(list(map(int, g.splitlines()[1:])))
 
     return afs.input_groups(
-        other_inputs=[TEST],
+        tests=[TEST],
         parts=[_pt1, _pt2],
         transform_group=tr,
     )
diff --git a/advent/year_2020/day_23.py b/advent/year_2020/day_23.py
@@ -0,0 +1,19 @@
+"""
+"""
+
+from advent.tools import *
+
+TEST = """
+"""
+
+
+def _pt1(lines):
+    pass
+
+
+def _pt2(lines):
+    pass
+
+
+def main():
+    return afs.input_lines(tests=[TEST], parts=[_pt1, _pt2])
diff --git a/advent/year_2020/day_23.txt b/advent/year_2020/day_23.txt
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = -nauto
diff --git a/requirements.txt b/requirements.txt
@@ -7,4 +7,5 @@ shapely
 python-sat
 matplotlib
 lark
-scipy
+scipy
+pytest-xdist
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/advent/__init__.py b/tests/advent/__init__.py
diff --git a/tests/advent/test_year_2020.py b/tests/advent/test_year_2020.py

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,5 @@ def main():`
`70`	`70`	`return afs.input_lines(`
`71`	`71`	`transform_line=int,`
`72`	`72`	`parts=[pt1, pt2],`
`73`		`- other_inputs=[TEST],`
	`73`	`+ tests=[TEST],`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ def _solve(results):`
`75`	`75`
`76`	`76`	`def main():`
`77`	`77`	`return afs.input_lines(`
`78`		`- other_inputs=[TEST],`
	`78`	`+ tests=[TEST],`
`79`	`79`	`parts=[_solve],`
`80`	`80`	`transform_line=_validate,`
`81`	`81`	`)`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ def _pt2(grid):`
`122`	`122`
`123`	`123`	`def main():`
`124`	`124`	`return afs.input_lines(`
`125`		`- other_inputs=[TEST],`
	`125`	`+ tests=[TEST],`
`126`	`126`	`transform_line=list,`
`127`	`127`	`parts=[_pt1, _pt2],`
`128`	`128`	`)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ def main():`
`128`	`128`	`pt2 = lambda s: sum([_pt2(g) for g in s])`
`129`	`129`
`130`	`130`	`return afs.input_groups(`
`131`		`- other_inputs=[TEST],`
	`131`	`+ tests=[TEST],`
`132`	`132`	`parts=[pt1, pt2],`
`133`	`133`	`transform_group=lambda g: g.splitlines(),`
`134`	`134`	`)`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ def main():`
`134`	`134`	`pt2 = lambda a: _count(b, a[0])`
`135`	`135`
`136`	`136`	`return afs.input_lines(`
`137`		`- other_inputs=[TEST],`
	`137`	`+ tests=[TEST],`
`138`	`138`	`parts=[pt1, pt2],`
`139`	`139`	`transform_lines=_build_graph,`
`140`	`140`	`)`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ def main():`
`161`	`161`	`pt2 = lambda ins: _dfs(0, 0, ins, [0] * len(ins), True)[1]`
`162`	`162`
`163`	`163`	`return afs.input_lines(`
`164`		`- other_inputs=[TEST],`
	`164`	`+ tests=[TEST],`
`165`	`165`	`parts=[pt1, pt2],`
`166`	`166`	`transform_line=lambda l: l.split(" "),`
`167`	`167`	`)`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ def tr(lines):`
`199`	`199`	`return [0] + lines + [lines[-1] + 3]`
`200`	`200`
`201`	`201`	`return afs.input_lines(`
`202`		`- other_inputs=[TEST],`
	`202`	`+ tests=[TEST],`
`203`	`203`	`transform_lines=tr,`
`204`	`204`	`parts=[_pt1, _pt2],`
`205`	`205`	`)`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ def neighbors(g, r, c):`
`291`	`291`
`292`	`292`	`def main():`
`293`	`293`	`return afs.input_lines(`
`294`		`- other_inputs=[TEST],`
	`294`	`+ tests=[TEST],`
`295`	`295`	`parts=[_pt1, _pt2],`
`296`	`296`	`transform_line=lambda l: [[None, MAPPING[s]] for s in l],`
`297`	`297`	`)`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,6 @@ def _transform(line):`
`190`	`190`	`def main():`
`191`	`191`	`return afs.input_lines(`
`192`	`192`	`parts=[_pt1, _pt2],`
`193`		`- other_inputs=[TEST],`
	`193`	`+ tests=[TEST],`
`194`	`194`	`transform_line=_transform,`
`195`	`195`	`)`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ def _pt2(lines):`
`96`	`96`
`97`	`97`	`def main():`
`98`	`98`	`return afs.input_lines(`
`99`		`- other_inputs=[TEST],`
	`99`	`+ tests=[TEST],`
`100`	`100`	`parts=[_pt1, _pt2],`
`101`	`101`	`transform_line=lambda l: list(map(int, l.split(","))),`
`102`	`102`	`)`