Unit tests for scriptcs#630

ryanrousseau · ryanrousseau · commit 63d68230c25a · 2014-05-19T19:50:34.000-05:00
diff --git a/src/ScriptCs.Core/FilePreProcessor.cs b/src/ScriptCs.Core/FilePreProcessor.cs
@@ -137,11 +137,10 @@ private void InDirectory(string path, Action action)
 
         private bool IsNonDirectiveLine(string line)
         {
-            var trimmedLine = line.TrimStart(' ');
             var directiveLineProcessors =
                 _lineProcessors.Where(lp => lp is IDirectiveLineProcessor).Select(lp => lp as DirectiveLineProcessor);
 
-            return line.Trim() != string.Empty && !directiveLineProcessors.Any(lp => lp.Matches(trimmedLine));
+            return line.Trim() != string.Empty && !directiveLineProcessors.Any(lp => lp.Matches(line));
         }
 
         private static bool IsUsingLine(string line)
diff --git a/test/ScriptCs.Core.Tests/DirectiveLineProcessorTests.cs b/test/ScriptCs.Core.Tests/DirectiveLineProcessorTests.cs
@@ -34,6 +34,23 @@ public void ShouldReturnTrueAndContinueProcessingDirectiveIfAfterCodeAndBehaviou
             }
         }
 
+        public class TheMatchesMethod
+        {
+            [Fact]
+            public void ShouldReturnTrueWhenLineMatchesDirectiveString()
+            {
+                var directiveLineProcessor = new TestableDirectiveLineProcessor();
+                directiveLineProcessor.Matches("#Test x").ShouldBeTrue();
+            }
+
+            [Fact]
+            public void ShouldReturnFalseWhenLineDoesNotMatchDirectiveString()
+            {
+                var directiveLineProcessor = new TestableDirectiveLineProcessor();
+                directiveLineProcessor.Matches("#NotATest x").ShouldBeFalse();
+            }
+        }
+
         public class TestableDirectiveLineProcessor : DirectiveLineProcessor
         {
             private BehaviorAfterCode? _behaviourAfterCode;
diff --git a/test/ScriptCs.Core.Tests/FileProcessorTests.cs b/test/ScriptCs.Core.Tests/FileProcessorTests.cs
@@ -573,5 +573,75 @@ private IFilePreProcessor GetFilePreProcessor()
                 return new FilePreProcessor(_fileSystem.Object, Mock.Of<ILog>(), lineProcessors);
             }
         }
+
+        public class TheParseScriptMethod
+        {
+            private readonly Mock<IFileSystem> _fileSystem;
+
+            public TheParseScriptMethod()
+            {
+                _fileSystem = new Mock<IFileSystem>();
+                _fileSystem.SetupGet(x => x.NewLine).Returns(Environment.NewLine);
+                _fileSystem.Setup(fs => fs.GetFullPath(It.IsAny<string>())).Returns<string>((path) => path);
+            }
+
+            [Fact]
+            public void ShouldProcessCustomDirectiveWhenItComesBeforeCode()
+            {
+                var testableDirectiveProcessor = new DirectiveLineProcessorTests.TestableDirectiveLineProcessor();
+                var filePreprocessor = GetFilePreProcessor(testableDirectiveProcessor, new LoadLineProcessor(_fileSystem.Object));
+                var lines = new List<string>
+                    {
+                        "#Test something",
+                        "Console.WriteLine(\"Success\");"
+                    };
+
+                filePreprocessor.ParseScript(lines, new FileParserContext());
+                testableDirectiveProcessor.InheritedProcessLineCalled.ShouldBeTrue();
+            }
+
+            [Fact]
+            public void ShouldProcessALoadDirectiveWhenItComesAfterACustomDirective()
+            {
+                var testableDirectiveProcessor = new DirectiveLineProcessorTests.TestableDirectiveLineProcessor();
+                var loadLineProcessor = new TestableLoadLineProcessor(_fileSystem.Object);
+                var filePreprocessor = GetFilePreProcessor(testableDirectiveProcessor, loadLineProcessor);
+                var lines = new List<string>
+                    {
+                        "#Test something",
+                        "#load myscript.csx",
+                        "Console.WriteLine(\"Success\");"
+                    };
+
+                filePreprocessor.ParseScript(lines, new FileParserContext());
+                loadLineProcessor.InheritedProcessLineCalled.ShouldBeTrue();
+            }
+
+            private IFilePreProcessor GetFilePreProcessor(ILineProcessor customDirectiveProcessor, ILineProcessor loadLineProcessor)
+            {
+                var lineProcessors = new ILineProcessor[]
+                    {
+                        new UsingLineProcessor(),
+                        new ReferenceLineProcessor(_fileSystem.Object),
+                        loadLineProcessor,
+                        customDirectiveProcessor
+                    };
+
+                return new FilePreProcessor(_fileSystem.Object, Mock.Of<ILog>(), lineProcessors);
+            }
+
+            public class TestableLoadLineProcessor : LoadLineProcessor
+            {
+                public TestableLoadLineProcessor(IFileSystem fileSystem)
+                    : base(fileSystem)
+                { }
+                public bool InheritedProcessLineCalled { get; private set; }
+                protected override bool ProcessLine(IFileParser parser, FileParserContext context, string line)
+                {
+                    InheritedProcessLineCalled = true;
+                    return true;
+                }
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,10 @@ private void InDirectory(string path, Action action)`
`137`	`137`
`138`	`138`	`private bool IsNonDirectiveLine(string line)`
`139`	`139`	`{`
`140`		`- var trimmedLine = line.TrimStart(' ');`
`141`	`140`	`var directiveLineProcessors =`
`142`	`141`	`_lineProcessors.Where(lp => lp is IDirectiveLineProcessor).Select(lp => lp as DirectiveLineProcessor);`
`143`	`142`
`144`		`- return line.Trim() != string.Empty && !directiveLineProcessors.Any(lp => lp.Matches(trimmedLine));`
	`143`	`+ return line.Trim() != string.Empty && !directiveLineProcessors.Any(lp => lp.Matches(line));`
`145`	`144`	`}`
`146`	`145`
`147`	`146`	`private static bool IsUsingLine(string line)`