From 3b4c09cadeed16c41d730391d5f8d1d4037288bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Garc=C3=ADa?= Date: Sat, 28 Oct 2023 12:56:40 +0200 Subject: [PATCH] Added new LIST_ALL test. --- .gitignore | 2 +- .../ink/runtime/test/ListSpecTest.java | 11 ++++ .../resources/inkfiles/lists/list-all.ink | 3 + .../inkfiles/lists/list-all.ink.json | 63 +++++++++++++++++++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/inkfiles/lists/list-all.ink create mode 100644 src/test/resources/inkfiles/lists/list-all.ink.json diff --git a/.gitignore b/.gitignore index 7abcff5..c3b7aab 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,4 @@ build/ *.log - +.DS_Store diff --git a/src/test/java/com/bladecoder/ink/runtime/test/ListSpecTest.java b/src/test/java/com/bladecoder/ink/runtime/test/ListSpecTest.java index 9c6e440..649ff74 100644 --- a/src/test/java/com/bladecoder/ink/runtime/test/ListSpecTest.java +++ b/src/test/java/com/bladecoder/ink/runtime/test/ListSpecTest.java @@ -131,4 +131,15 @@ public void testMoreListOperations2() throws Exception { "a1, b1, c1\na1\na1, b2\ncount:2\nmax:c2\nmin:a1\ntrue\ntrue\nfalse\nempty\na2\na2, b2, c2\nrange:a1, b2\na1\nsubtract:a1, c1\nrandom:a1\nlistinc:b1\n", story.continueMaximally()); } + + @Test + public void testListAllBug() throws Exception { + + String json = TestUtils.getJsonString("inkfiles/lists/list-all.ink.json"); + Story story = new Story(json); + + Assert.assertEquals( + "A, B\n", + story.continueMaximally()); + } } diff --git a/src/test/resources/inkfiles/lists/list-all.ink b/src/test/resources/inkfiles/lists/list-all.ink new file mode 100644 index 0000000..5c83e3e --- /dev/null +++ b/src/test/resources/inkfiles/lists/list-all.ink @@ -0,0 +1,3 @@ +LIST a = A +LIST b = B +{LIST_ALL(A + B)} \ No newline at end of file diff --git a/src/test/resources/inkfiles/lists/list-all.ink.json b/src/test/resources/inkfiles/lists/list-all.ink.json new file mode 100644 index 0000000..2d1f34a --- /dev/null +++ b/src/test/resources/inkfiles/lists/list-all.ink.json @@ -0,0 +1,63 @@ +{ + "inkVersion": 21, + "root": [ + [ + "ev", + { + "VAR?": "A" + }, + { + "VAR?": "B" + }, + "+", + "LIST_ALL", + "out", + "/ev", + "\n", + [ + "done", + { + "#f": 5, + "#n": "g-0" + } + ], + null + ], + "done", + { + "global decl": [ + "ev", + { + "list": {}, + "origins": [ + "a" + ] + }, + { + "VAR=": "a" + }, + { + "list": {}, + "origins": [ + "b" + ] + }, + { + "VAR=": "b" + }, + "/ev", + "end", + null + ], + "#f": 1 + } + ], + "listDefs": { + "a": { + "A": 1 + }, + "b": { + "B": 1 + } + } +} \ No newline at end of file