test: cleanup

InkBlot.Tests/Helpers.cs

@@ -27,7 +27,7 @@ internal static class Helpers
 
 public class TestBase
 {
-    protected (Story, Diagnostic[]) ParseText(string inkInput)
+    protected static (Story, Diagnostic[]) ParseText(string inkInput)
     {
         // parse the story
         var fileReader = new InMemoryFileReader([

InkBlot.Tests/MultiDivertTest.cs

@@ -5,9 +5,9 @@ namespace InkBlot.Tests;
 
 public class MultiDivertTest : TestBase
 {
-    private IStoryNode[] MyParseText(string text)
+    private static IStoryNode[] MyParseText(string text, bool stripSpaces)
     {
-        var (story, diagnostics) = ParseText(text);
+        var (story, diagnostics) = ParseText(stripSpaces ? text.Replace(" ", "").Replace("\t", "") : text);
 
         diagnostics.ShouldBe([]);
         var storyNodes = story.StoryNodes.ToArray();
@@ -15,65 +15,90 @@ public class MultiDivertTest : TestBase
         return storyNodes;
     }
 
-    [Fact]
+    [Theory]
-    public void TestThreadDivert()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestThreadDivert(bool stripSpaces)
     {
-        var storyNodes = MyParseText("<- threadName");
+        var storyNodes = MyParseText("<- threadName", stripSpaces);
         storyNodes.ShouldBe([new MultiDivert(new ThreadDivert(new Identifier(["threadName"])))]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestSimpleDivert()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestSimpleDivert(bool stripSpaces)
     {
-        var storyNodes = MyParseText("-> divertName");
+        var storyNodes = MyParseText("-> divertName", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList([], new TunnelListEndingDivert(new Identifier(["divertName"]))))
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestReturnFromTunnel()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestDefaultChoice(bool stripSpaces)
     {
-        var storyNodes = MyParseText("->->");
+        var storyNodes = MyParseText("->", stripSpaces);
+        storyNodes.ShouldBe([
+            new MultiDivert(new TunnelsAndDivertsList([], new TunnelListEndingDivert(null)))
+        ]);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestReturnFromTunnel(bool stripSpaces)
+    {
+        var storyNodes = MyParseText("->->", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList([], new TunnelListEndingReturnFromTunnel(null)))
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestDivertFromTunnel()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestDivertFromTunnel(bool stripSpaces)
     {
-        var storyNodes = MyParseText("->-> divertName");
+        var storyNodes = MyParseText("->-> divertName", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList([],
                 new TunnelListEndingReturnFromTunnel(new Identifier(["divertName"]))))
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestTunnel()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestTunnel(bool stripSpaces)
     {
-        var storyNodes = MyParseText("-> tunnelName ->");
+        var storyNodes = MyParseText("-> tunnelName ->", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList([new Identifier(["tunnelName"])],
                 new TunnelListEndingDivert(null)))
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestTunnelWithDivert()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestTunnelWithDivert(bool stripSpaces)
     {
-        var storyNodes = MyParseText("-> tunnelName -> divertName");
+        var storyNodes = MyParseText("-> tunnelName -> divertName", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList([new Identifier(["tunnelName"])],
                 new TunnelListEndingDivert(new Identifier(["divertName"]))))
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestMultiTunnel()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestMultiTunnel(bool stripSpaces)
     {
-        var storyNodes = MyParseText("-> tunnelName1 -> tunnelName2 ->");
+        var storyNodes = MyParseText("-> tunnelName1 -> tunnelName2 ->", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList(
                 [new Identifier(["tunnelName1"]), new Identifier(["tunnelName2"])],
@@ -81,10 +106,12 @@ public class MultiDivertTest : TestBase
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestMultiTunnelWithReturn()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestMultiTunnelWithReturn(bool stripSpaces)
     {
-        var storyNodes = MyParseText("-> tunnelName1 -> tunnelName2 ->->");
+        var storyNodes = MyParseText("-> tunnelName1 -> tunnelName2 ->->", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList(
                 [new Identifier(["tunnelName1"]), new Identifier(["tunnelName2"])],
@@ -92,10 +119,12 @@ public class MultiDivertTest : TestBase
         ]);
     }
 
-    [Fact]
+    [Theory]
-    public void TestMultiTunnelWithReturnAndReplacement()
+    [InlineData(true)]
+    [InlineData(false)]
+    public void TestMultiTunnelWithReturnAndReplacement(bool stripSpaces)
     {
-        var storyNodes = MyParseText("-> tunnelName1 -> tunnelName2 ->-> replacementDivert");
+        var storyNodes = MyParseText("-> tunnelName1 -> tunnelName2 ->-> replacementDivert", stripSpaces);
         storyNodes.ShouldBe([
             new MultiDivert(new TunnelsAndDivertsList(
                 [new Identifier(["tunnelName1"]), new Identifier(["tunnelName2"])],