From 25c5c27a6e7c6de6b83c9a34368f1e99c485c3da Mon Sep 17 00:00:00 2001
From: Aditya Bist <adbist@microsoft.com>
Date: Fri, 24 Feb 2017 15:49:45 -0800
Subject: [PATCH] Fix batch parser test (#239)

* fixed batch parser test

* fix batch parser test

* fix batch parser test

* fixed baseline tests for parser and fixed trace output logic

* Update RunEnvironmentInfo.cs

* checking error logs on AppVeyor

* checking error logs on app veyor

* changed file reading encoding

* adding logs to app veyor build

* changed encoding of baseline files

* added error logs for app veyor

* changed error logs for app veyor

* changed how file stream works in batch parser tests

* changed baseline and testscript encodings

* cleaned code for necessary batch parser tests
---
 .../BatchParser/BatchParserTests.cs           | 516 +++++-----
 .../Baselined/BaselinedTest.cs                | 902 +++++++++---------
 .../RunEnvironmentInfo.cs                     | 185 ++--
 .../Baselines/BL-err-blockComment.txt         | Bin 754 -> 376 bytes
 .../Baselines/BL-err-blockComment2.txt        | Bin 756 -> 377 bytes
 .../BatchParser/Baselines/BL-err-cycle1.txt   | Bin 1618 -> 789 bytes
 .../Baselines/BL-err-varDefinition.txt        | Bin 1124 -> 561 bytes
 .../Baselines/BL-err-varDefinition2.txt       | Bin 2374 -> 1162 bytes
 .../Baselines/BL-err-varDefinition3.txt       | Bin 1240 -> 605 bytes
 .../Baselines/BL-err-varDefinition4.txt       | Bin 1364 -> 661 bytes
 .../Baselines/BL-err-varDefinition5.txt       | Bin 1478 -> 738 bytes
 .../Baselines/BL-err-varDefinition6.txt       | Bin 1638 -> 801 bytes
 .../Baselines/BL-err-varDefinition7.txt       | Bin 1622 -> 793 bytes
 .../Baselines/BL-err-varDefinition8.txt       | Bin 1606 -> 785 bytes
 .../Baselines/BL-err-varDefinition9.txt       | Bin 1606 -> 785 bytes
 .../Baselines/BL-err-variableRef.txt          | Bin 1072 -> 522 bytes
 .../Baselines/BL-err-variableRef2.txt         | Bin 1116 -> 544 bytes
 .../Baselines/BL-err-variableRef3.txt         | Bin 1420 -> 691 bytes
 .../Baselines/BL-err-variableRef4.txt         | Bin 974 -> 486 bytes
 .../BatchParser/Baselines/BL-input.txt        | Bin 22614 -> 10759 bytes
 .../BatchParser/Baselines/BL-input2.txt       | Bin 31594 -> 15374 bytes
 .../Baselines/BL-pass-blockComment.txt        | Bin 3170 -> 1540 bytes
 .../Baselines/BL-pass-command-and-comment.txt | Bin 17180 -> 8427 bytes
 .../Baselines/BL-pass-lineComment.txt         | Bin 2836 -> 1374 bytes
 .../Baselines/BL-pass-lineComment2.txt        | Bin 834 -> 399 bytes
 .../Baselines/BL-pass-noBlockComments.txt     | Bin 1428 -> 685 bytes
 .../Baselines/BL-pass-noLineComments.txt      | Bin 1298 -> 618 bytes
 .../Baselines/BL-pass-varDefinition.txt       | Bin 1296 -> 631 bytes
 .../Baselines/BL-pass-varDefinition2.txt      | Bin 1854 -> 901 bytes
 .../Baselines/BL-pass-varDefinition3.txt      | Bin 1362 -> 664 bytes
 .../Baselines/BL-pass-varDefinition4.txt      | Bin 4652 -> 2275 bytes
 .../BatchParser/TestScripts/TS-input.txt      |   2 +-
 .../TestServiceProvider.cs                    |   2 +-
 33 files changed, 834 insertions(+), 773 deletions(-)

diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs
index 1d4dae0d..e3a680ac 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs
@@ -1,244 +1,272 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using Microsoft.SqlTools.ServiceLayer.BatchParser;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution;
-using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined;
-using Xunit;
-
-namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser
-{
-    public class BatchParserTests : BaselinedTest
-    {
-        private bool testFailed = false;
-
-        public BatchParserTests()
-        {
-            InitializeTest();
-        }
-
-        public void InitializeTest()
-        {
-            CategoryName = "BatchParser";
-            this.TraceOutputDirectory = RunEnvironmentInfo.GetTestDataLocation();
-            TestInitialize();
-        }
-
-        [Fact]
-        public void VerifyThrowOnUnresolvedVariable()
-        {
-            string script = "print '$(NotDefined)'";
-            StringBuilder output = new StringBuilder();
-
-            TestCommandHandler handler = new TestCommandHandler(output);
-            IVariableResolver resolver = new TestVariableResolver(new StringBuilder());
-            Parser p = new Parser(
-                handler,
-                resolver,
-                new StringReader(script),
-                "test");
-            p.ThrowOnUnresolvedVariable = true;
-
-            handler.SetParser(p);
-
-            Assert.Throws<BatchParserException>(() => p.Parse());
-        }
-
-        public void TokenizeWithLexer(string filename, StringBuilder output)
-        {
-            
-            using (Lexer lexer = new Lexer(new StreamReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read)), filename))
-            {
-                
-                string inputText = File.ReadAllText(filename);
-                inputText = inputText.Replace("\r\n", "\n");
-                StringBuilder roundtripTextBuilder = new StringBuilder();
-                StringBuilder outputBuilder = new StringBuilder();
-                StringBuilder tokenizedInput = new StringBuilder();
-                bool lexerError = false;
-
-                Token token = null;
-                try
-                {
-                    do
-                    {
-                        lexer.ConsumeToken();
-                        token = lexer.CurrentToken;
-                        roundtripTextBuilder.Append(token.Text);
-                        outputBuilder.AppendLine(GetTokenString(token));
-                        tokenizedInput.Append('[').Append(GetTokenCode(token.TokenType)).Append(':').Append(token.Text).Append(']');
-                    } while (token.TokenType != LexerTokenType.Eof);
-                }
-                catch (BatchParserException ex)
-                {
-                    lexerError = true;
-                    outputBuilder.AppendLine(string.Format(CultureInfo.CurrentCulture, "[ERROR: code {0} at {1} - {2} in {3}, message: {4}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Message));
-                }
-                output.AppendLine("Lexer tokenized input:");
-                output.AppendLine("======================");
-                output.AppendLine(tokenizedInput.ToString());
-                output.AppendLine("Tokens:");
-                output.AppendLine("=======");
-                output.AppendLine(outputBuilder.ToString());
-
-                if (lexerError == false)
-                {
-                    // Verify that all text from tokens can be recombined into original string
-                    Assert.Equal<string>(inputText, roundtripTextBuilder.ToString().Replace("\r\n", "\n"));
-                }
-            }
-        }
-
-        private string GetTokenCode(LexerTokenType lexerTokenType)
-        {
-            switch (lexerTokenType)
-            {
-                case LexerTokenType.Text:
-                    return "T";
-                case LexerTokenType.Whitespace:
-                    return "WS";
-                case LexerTokenType.NewLine:
-                    return "NL";
-                case LexerTokenType.Comment:
-                    return "C";
-                default:
-                    return lexerTokenType.ToString();
-            }
-        }
-
-        [Fact]
-        public void BatchParserTest()
-        {
-            Start("err-blockComment");
-            Start("err-blockComment2");
-            Start("err-varDefinition");
-            Start("err-varDefinition2");
-            Start("err-varDefinition3");
-            Start("err-varDefinition4");
-            Start("err-varDefinition5");
-            Start("err-varDefinition6");
-            Start("err-varDefinition7");
-            Start("err-varDefinition8");
-            Start("err-varDefinition9");
-            Start("err-variableRef");
-            Start("err-variableRef2");
-            Start("err-variableRef3");
-            Start("err-variableRef4");
-            Start("err-cycle1");
-            Start("input");
-            Start("input2");
-            Start("pass-blockComment");
-            Start("pass-lineComment");
-            Start("pass-lineComment2");
-            Start("pass-noBlockComments");
-            Start("pass-noLineComments");
-            Start("pass-varDefinition");
-            Start("pass-varDefinition2");
-            Start("pass-varDefinition3");
-            Start("pass-varDefinition4");
-            Start("pass-command-and-comment");
-            Assert.False(testFailed, "At least one of test cases failed. Check output for details.");
-        }
-
-        public void TestParser(string filename, StringBuilder output)
-        {
-            try
-            {
-                TestCommandHandler commandHandler = new TestCommandHandler(output);
-
-                Parser parser = new Parser(
-                    commandHandler,
-                    new TestVariableResolver(output),
-                    new StreamReader(File.Open(filename, FileMode.Open)),
-                    filename);
-
-                commandHandler.SetParser(parser);
-
-                parser.Parse();
-            }
-            catch (BatchParserException ex)
-            {
-                output.AppendLine(string.Format(CultureInfo.CurrentCulture, "[PARSER ERROR: code {0} at {1} - {2} in {3}, token text: {4}, message: {5}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Text, ex.Message));
-            }
-        }
-
-        private string GetPositionString(PositionStruct pos)
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0}:{1} [{2}]", pos.Line, pos.Column, pos.Offset);
-        }
-
-        private string GetTokenString(Token token)
-        {
-            if (token == null)
-            {
-                return "(null)";
-            }
-            else
-            {
-                string tokenText = token.Text;
-                if (tokenText != null)
-                {
-                    tokenText = tokenText.Replace("\n", "\\n").Replace("\r", "\\r").Replace("\t", "\\t");
-                }
-                string tokenFilename = token.Filename;
-                tokenFilename = GetFilenameOnly(tokenFilename);
-                return string.Format(CultureInfo.CurrentCulture, "[Token {0} at {1}({2}:{3} [{4}] - {5}:{6} [{7}]): '{8}']", 
-                    token.TokenType, 
-                    tokenFilename,
-                    token.Begin.Line, token.Begin.Column, token.Begin.Offset,
-                    token.End.Line, token.End.Column, token.End.Offset, 
-                    tokenText);
-            }
-        }
-
-        internal static string GetFilenameOnly(string fullPath)
-        {
-            return fullPath != null ? Path.GetFileName(fullPath) : null;
-        }
-        
-        public override void Run()
-        {
-            string inputFilename = GetTestscriptFilePath(CurrentTestName);
-            StringBuilder output = new StringBuilder();
-
-            TokenizeWithLexer(inputFilename, output);
-            TestParser(inputFilename, output);
-
-            string baselineFilename = GetBaselineFilePath(CurrentTestName);
-            string baseline;
-
-            try
-            {
-                baseline = GetFileContent(baselineFilename);
-            }
-            catch (FileNotFoundException)
-            {
-                baseline = string.Empty;
-            }
-
-            string outputString = output.ToString();
-
-            Console.WriteLine(baselineFilename);
-
-            if (string.Compare(baseline, outputString, StringComparison.Ordinal) != 0)
-            {
-                DumpToTrace(CurrentTestName, outputString);
-                string outputFilename = Path.Combine(TraceFilePath, GetBaselineFileName(CurrentTestName));
-                Console.WriteLine(":: Output does not match the baseline!");
-                Console.WriteLine("code --diff \"" + baselineFilename + "\" \"" + outputFilename + "\"");
-                Console.WriteLine();
-                Console.WriteLine(":: To update the baseline:");
-                Console.WriteLine("copy \"" + outputFilename + "\" \"" + baselineFilename + "\"");
-                Console.WriteLine();
-                testFailed = true;
-            }
-        }
-    }
-}
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using Microsoft.SqlTools.ServiceLayer.BatchParser;
+using Microsoft.SqlTools.ServiceLayer.Test.Common;
+using Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined;
+using Xunit;
+using Microsoft.SqlTools.ServiceLayer.QueryExecution;
+
+namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser
+{
+    public class BatchParserTests : BaselinedTest
+    {
+        private bool testFailed = false;
+
+        public BatchParserTests()
+        {
+            InitializeTest();
+        }
+
+        public void InitializeTest()
+        {
+            CategoryName = "BatchParser";
+            this.TraceOutputDirectory = RunEnvironmentInfo.GetTraceOutputLocation();
+            TestInitialize();
+        }
+
+        [Fact]
+        public void VerifyThrowOnUnresolvedVariable()
+        {
+            string script = "print '$(NotDefined)'";
+            StringBuilder output = new StringBuilder();
+
+            TestCommandHandler handler = new TestCommandHandler(output);
+            IVariableResolver resolver = new TestVariableResolver(new StringBuilder());
+            using (Parser p = new Parser(
+                handler,
+                resolver,
+                new StringReader(script),
+                "test"))
+            {
+                p.ThrowOnUnresolvedVariable = true;
+                handler.SetParser(p);
+
+                Assert.Throws<BatchParserException>(() => p.Parse());
+            }
+        }
+
+        private static Stream GenerateStreamFromString(string s)
+        {
+            MemoryStream stream = new MemoryStream();
+            StreamWriter writer = new StreamWriter(stream);
+            writer.Write(s);
+            writer.Flush();
+            stream.Position = 0;
+            return stream;
+        }
+
+        public void TokenizeWithLexer(string filename, StringBuilder output)
+        {
+            // Create a new file by changing CRLFs to LFs and generate a new steam
+            // or the tokens generated by the lexer will always have off by one errors
+            string input = File.ReadAllText(filename).Replace("\r\n", "\n");
+            var inputStream = GenerateStreamFromString(input);
+            using (Lexer lexer = new Lexer(new StreamReader(inputStream), filename))
+            {
+                
+                string inputText = File.ReadAllText(filename);
+                inputText = inputText.Replace("\r\n", "\n");
+                StringBuilder roundtripTextBuilder = new StringBuilder();
+                StringBuilder outputBuilder = new StringBuilder();
+                StringBuilder tokenizedInput = new StringBuilder();
+                bool lexerError = false;
+
+                Token token = null;
+                try
+                {
+                    do
+                    {
+                        lexer.ConsumeToken();
+                        token = lexer.CurrentToken;
+                        roundtripTextBuilder.Append(token.Text.Replace("\r\n", "\n"));
+                        outputBuilder.AppendLine(GetTokenString(token));
+                        tokenizedInput.Append('[').Append(GetTokenCode(token.TokenType)).Append(':').Append(token.Text.Replace("\r\n", "\n")).Append(']');
+                    } while (token.TokenType != LexerTokenType.Eof);
+                }
+                catch (BatchParserException ex)
+                {
+                    lexerError = true;
+                    outputBuilder.AppendLine(string.Format(CultureInfo.CurrentCulture, "[ERROR: code {0} at {1} - {2} in {3}, message: {4}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Message));
+                }
+                output.AppendLine("Lexer tokenized input:");
+                output.AppendLine("======================");
+                output.AppendLine(tokenizedInput.ToString());
+                output.AppendLine("Tokens:");
+                output.AppendLine("=======");
+                output.AppendLine(outputBuilder.ToString());
+
+                if (lexerError == false)
+                {
+                    // Verify that all text from tokens can be recombined into original string
+                    Assert.Equal<string>(inputText, roundtripTextBuilder.ToString());
+                }
+            }
+        }
+
+        private string GetTokenCode(LexerTokenType lexerTokenType)
+        {
+            switch (lexerTokenType)
+            {
+                case LexerTokenType.Text:
+                    return "T";
+                case LexerTokenType.Whitespace:
+                    return "WS";
+                case LexerTokenType.NewLine:
+                    return "NL";
+                case LexerTokenType.Comment:
+                    return "C";
+                default:
+                    return lexerTokenType.ToString();
+            }
+        }
+
+        private static void CopyToOutput(string sourceDirectory, string filename)
+        {
+            File.Copy(Path.Combine(sourceDirectory, filename), filename, true);
+            FileUtilities.SetFileReadWrite(filename);
+        }
+
+        [Fact]
+        public void BatchParserTest()
+        {
+            CopyToOutput(FilesLocation, "TS-err-cycle1.txt");
+            CopyToOutput(FilesLocation, "cycle2.txt");
+
+            Start("err-blockComment");
+            Start("err-blockComment2");
+            Start("err-varDefinition");
+            Start("err-varDefinition2");
+            Start("err-varDefinition3");
+            Start("err-varDefinition4");
+            Start("err-varDefinition5");
+            Start("err-varDefinition6");
+            Start("err-varDefinition7");
+            Start("err-varDefinition8");
+            Start("err-varDefinition9");
+            Start("err-variableRef");
+            Start("err-variableRef2");
+            Start("err-variableRef3");
+            Start("err-variableRef4");
+            Start("err-cycle1");
+            Start("input");
+            Start("input2");
+            Start("pass-blockComment");
+            Start("pass-lineComment");
+            Start("pass-lineComment2");
+            Start("pass-noBlockComments");
+            Start("pass-noLineComments");
+            Start("pass-varDefinition");
+            Start("pass-varDefinition2");
+            Start("pass-varDefinition3");
+            Start("pass-varDefinition4");
+            Start("pass-command-and-comment");
+            Assert.False(testFailed, "At least one of test cases failed. Check output for details.");
+        }
+
+        public void TestParser(string filename, StringBuilder output)
+        {
+            try
+            {
+                // Create a new file by changing CRLFs to LFs and generate a new steam
+                // or the tokens generated by the lexer will always have off by one errors
+                TestCommandHandler commandHandler = new TestCommandHandler(output);
+                string input = File.ReadAllText(filename).Replace("\r\n", "\n");
+                var inputStream = GenerateStreamFromString(input);
+                StreamReader streamReader = new StreamReader(inputStream);
+
+                using (Parser parser = new Parser(
+                    commandHandler,
+                    new TestVariableResolver(output),
+                    streamReader,
+                    filename))
+                {
+                    commandHandler.SetParser(parser);
+                    parser.Parse();
+                }
+            }
+            catch (BatchParserException ex)
+            {
+                output.AppendLine(string.Format(CultureInfo.CurrentCulture, "[PARSER ERROR: code {0} at {1} - {2} in {3}, token text: {4}, message: {5}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Text, ex.Message));
+            }
+        }
+
+        private string GetPositionString(PositionStruct pos)
+        {
+            return string.Format(CultureInfo.InvariantCulture, "{0}:{1} [{2}]", pos.Line, pos.Column, pos.Offset);
+        }
+
+        private string GetTokenString(Token token)
+        {
+            if (token == null)
+            {
+                return "(null)";
+            }
+            else
+            {
+                string tokenText = token.Text;
+                if (tokenText != null)
+                {
+                    tokenText = tokenText.Replace("\r\n", "\\n").Replace("\n", "\\n").Replace("\r", "\\r").Replace("\t", "\\t");
+                }
+                string tokenFilename = token.Filename;
+                tokenFilename = GetFilenameOnly(tokenFilename);
+                return string.Format(CultureInfo.CurrentCulture, "[Token {0} at {1}({2}:{3} [{4}] - {5}:{6} [{7}]): '{8}']", 
+                    token.TokenType, 
+                    tokenFilename,
+                    token.Begin.Line, token.Begin.Column, token.Begin.Offset,
+                    token.End.Line, token.End.Column, token.End.Offset, 
+                    tokenText);
+            }
+        }
+
+        internal static string GetFilenameOnly(string fullPath)
+        {
+            return fullPath != null ? Path.GetFileName(fullPath) : null;
+        }
+        
+        public override void Run()
+        {
+            string inputFilename = GetTestscriptFilePath(CurrentTestName);
+            StringBuilder output = new StringBuilder();
+
+            TokenizeWithLexer(inputFilename, output);
+            TestParser(inputFilename, output);
+
+            string baselineFilename = GetBaselineFilePath(CurrentTestName);
+            string baseline;
+
+            try
+            {
+                baseline = GetFileContent(baselineFilename).Replace("\r\n", "\n");
+            }
+            catch (FileNotFoundException)
+            {
+                baseline = string.Empty;
+            }
+
+            string outputString = output.ToString().Replace("\r\n", "\n");
+
+            Console.WriteLine(baselineFilename);
+
+            if (string.Compare(baseline, outputString, StringComparison.Ordinal) != 0)
+            {
+                DumpToTrace(CurrentTestName, outputString);
+                string outputFilename = Path.Combine(TraceFilePath, GetBaselineFileName(CurrentTestName));
+                Console.WriteLine(":: Output does not match the baseline!");
+                Console.WriteLine("code --diff \"" + baselineFilename + "\" \"" + outputFilename + "\"");
+                Console.WriteLine();
+                Console.WriteLine(":: To update the baseline:");
+                Console.WriteLine("copy \"" + outputFilename + "\" \"" + baselineFilename + "\"");
+                Console.WriteLine();
+                testFailed = true;
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Baselined/BaselinedTest.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Baselined/BaselinedTest.cs
index f358488a..0afa62c8 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Baselined/BaselinedTest.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/Baselined/BaselinedTest.cs
@@ -1,454 +1,448 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using Xunit;
-
-namespace Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined
-{
-    /// <summary>
-    /// This class serves as the base class for all baselined tests
-    /// It will provide easy services for you to interact with your test files and their baselines
-    /// </summary>
-    public abstract class BaselinedTest
-    {
-        /// <summary>
-        /// Holds the extension for the TestScripts
-        /// </summary>
-        private string _testScriptExtension;
-
-        /// <summary>
-        /// Holds the extensionf or the Baseline files
-        /// </summary>
-        private string _baselineExtension;
-
-        /// <summary>
-        /// Holds the path to the base location of both TestScripts and Baselines
-        /// </summary>
-        private string _testCategoryName;
-
-        /// <summary>
-        /// Holds the ROOT Dir for trace output
-        /// </summary>
-        private string _traceOutputDir;
-
-        /// <summary>
-        /// Holds the prefix for the baseline
-        /// </summary>
-        private string _baselinePrefix;
-
-        /// <summary>
-        /// Holds the prefix for the Testscript
-        /// </summary>
-        private string _testscriptPrefix;
-
-        /// <summary>
-        /// Holds the name of the current test
-        /// </summary>
-        private string _currentTestname;
-
-        private string _baselineSubDir = string.Empty;
-
-        public const string TestScriptDirectory = @"Testscripts\";
-        public const string BaselineDirectory = @"Baselines\";
-
-        /// <summary>
-        /// Gets/Sets the extension for the Testscript files
-        /// </summary>
-        public string TestscriptFileExtension
-        {
-            get
-            {
-                return _testScriptExtension;
-            }
-            set
-            {
-                if (string.IsNullOrEmpty(value))
-                    throw new ArgumentException("TestscriptFileExtension needs a value");
-                _testScriptExtension = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets/Sets the extension for the Baseline files
-        /// </summary>
-        public string BaselineFileExtension
-        {
-            get
-            {
-                return _baselineExtension;
-            }
-            set
-            {
-                if (string.IsNullOrEmpty(value))
-                    throw new ArgumentException("BaselineFileExtension needs a value");
-                _baselineExtension = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets/Sets the path to the base location of both test scripts and baseline files
-        /// </summary>
-        /// <remarks>
-        /// Just use the SubDir name
-        /// TestScripts should be in FileBaseLocation\Testscripts; and Baselines should be in FileBaseLocation\Baselines
-        /// The value of this will be appended to ROOT_DIR (QA\SrcUTest\Common)
-        /// </remarks>
-        public string CategoryName
-        {
-            get
-            {
-                return _testCategoryName;
-            }
-            set
-            {
-                if (string.IsNullOrEmpty(value))
-                    throw new ArgumentException("FileBaseLocation needs a value");
-                _testCategoryName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets/Sets the output base directory for trace output (null = no trace output)
-        /// </summary>
-        public string TraceOutputDirectory
-        {
-            get
-            {
-                return _traceOutputDir;
-            }
-            set
-            {
-                _traceOutputDir = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the full path of where the files will be pulled from
-        /// </summary>
-        public string FilesLocation
-        {
-            get
-            {
-                return Path.Combine(RunEnvironmentInfo.GetTestDataLocation(), CategoryName, TestScriptDirectory);
-            }
-        }
-
-        /// <summary>
-        /// Gets or Sets the sub directory in Baselines where the exected baseline results are located
-        /// </summary>
-        public string BaselinesSubdir 
-        {
-            get 
-            {
-                if (this._baselineSubDir == null)
-                    this._baselineSubDir = string.Empty;
-                return this._baselineSubDir; 
-            }
-            set { this._baselineSubDir = value; }
-        }
-
-        /// <summary>
-        /// Gets the full path of where the baseline files will be pulled from
-        /// </summary>
-        public string BaselineFilePath
-        {
-            get
-            {
-                return Path.Combine(RunEnvironmentInfo.GetTestDataLocation(), CategoryName, Path.Combine( BaselineDirectory, BaselinesSubdir ));
-            }
-        }
-
-        /// <summary>
-        /// Gets the full path of where the Trace will output
-        /// </summary>
-        public string TraceFilePath
-        {
-            get
-            {
-                return Path.Combine(Path.GetFullPath(TraceOutputDirectory), this.CategoryName, this.BaselinesSubdir);
-            }
-        }
-
-        /// <summary>
-        /// Gets/Sets the prefix used for baseline files
-        /// </summary>
-        public string BaselinePrefix
-        {
-            get
-            {
-                return _baselinePrefix;
-            }
-            set
-            {
-                if (string.IsNullOrEmpty(value))
-                    throw new ArgumentException("BaselinePrefix needs a value");
-                _baselinePrefix = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets/Sets the prefix used for testscript files
-        /// </summary>
-        public string TestscriptPrefix
-        {
-            get
-            {
-                return _testscriptPrefix;
-            }
-            set
-            {
-                if (string.IsNullOrEmpty(value))
-                    throw new ArgumentException("TestscriptPrefix needs a value");
-                _testscriptPrefix = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets/Sets the name of the current test
-        /// </summary>
-        public string CurrentTestName
-        {
-            get
-            {
-                return _currentTestname;
-            }
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public BaselinedTest()
-        {
-            Initialize();
-        }
-
-        /// <summary>
-        /// Initializes the class
-        /// </summary>
-        private void Initialize()
-        {
-            _testScriptExtension = _baselineExtension = "txt"; //default to txt
-            _testCategoryName = null;
-            string projectPath = Environment.GetEnvironmentVariable(Constants.ProjectPath);
-            if (projectPath != null)
-            {
-                _traceOutputDir = Path.Combine(projectPath, "trace");
-            }
-            else
-            {
-                _traceOutputDir = Environment.ExpandEnvironmentVariables(@"%SystemDrive%\trace\");
-            }
-            _baselinePrefix = "BL";
-            _testscriptPrefix = "TS";
-        }
-
-        /// <summary>
-        /// This method should be called whenever you do a [TestInitialize]
-        /// </summary>
-        public virtual void TestInitialize()
-        {
-
-            if (string.IsNullOrEmpty(_testCategoryName))
-                throw new ArgumentException("Set CategoryName to the name of the directory containing your Testscripts and Baseline files");
-
-            if (!Directory.Exists(FilesLocation))
-                throw new FileNotFoundException(string.Format("Path to Testscripts ([{0}]) does not exist.", FilesLocation));
-            if (!Directory.Exists(BaselineFilePath))
-                throw new FileNotFoundException(string.Format("Path to Baseline Files [{0}] does not exist.", BaselineFilePath));
-            if (!string.IsNullOrEmpty(TraceFilePath) && !Directory.Exists(TraceFilePath))   //if this does not exist, then we want it (pronto)
-                Directory.CreateDirectory(TraceFilePath);
-
-        }
-
-        /// <summary>
-        /// Compares two strings and gives appropriate output
-        /// </summary>
-        /// <param name="actualContent">Actual string</param>
-        /// <param name="baselineContent">Expected string</param>
-        /// <remarks>Fails test if strings do not match; comparison is done using an InvariantCulture StringComparer</remarks>
-        public void CompareActualWithBaseline(string actualContent, string baselineContent)
-        {
-
-            int _compareResult = string.Compare(actualContent, baselineContent, StringComparison.OrdinalIgnoreCase);
-            if (_compareResult != 0)
-            {
-                Trace.WriteLine("Debug Info:");
-                Trace.WriteLine("========BEGIN=EXPECTED========");
-                Trace.WriteLine(baselineContent);
-                Trace.WriteLine("=========END=EXPECTED=========");
-                Trace.WriteLine("=========BEGIN=ACTUAL=========");
-                Trace.WriteLine(actualContent);
-                Trace.WriteLine("==========END=ACTUAL==========");
-                Assert.True(false, string.Format("Comparison failed! (actualContent {0} baselineContent)", (_compareResult < 0 ? "<" : ">")));    //we already know it is not equal
-            }
-            else
-            {
-                Trace.WriteLine("Compare match! All is fine...");
-            }
-        }
-
-        /// <summary>
-        /// Gets the name of the testscript with the provided name
-        /// </summary>
-        /// <param name="name">Name of the test</param>
-        /// <returns>the path to the baseline file</returns>
-        /// <remarks>Asserts that file exists</remarks>
-        public string GetTestscriptFilePath(string name)
-        {
-            string retVal = Path.Combine(FilesLocation, string.Format("{0}-{1}.{2}", TestscriptPrefix, name, TestscriptFileExtension));
-            Assert.True(File.Exists(retVal), string.Format("TestScript [{0}] does not exist", retVal));
-            return retVal;
-        }
-
-        /// <summary>
-        /// Gets the name of the test script with the provided name and the provided index
-        /// </summary>
-        /// <param name="name">Name of the test</param>
-        /// <param name="index">File index</param>
-        /// <returns>the path to the baseline file</returns>
-        /// <remarks>Asserts that file exists</remarks>
-        public string GetTestscriptFilePath(string name, int index)
-        {
-            string retVal = Path.Combine(FilesLocation, string.Format("{0}-{1}{2}.{3}", TestscriptPrefix, name, index.ToString(), TestscriptFileExtension));
-            Assert.True(File.Exists(retVal), string.Format("TestScript [{0}] does not exist", retVal));
-            return retVal;
-        }
-
-        /// <summary>
-        /// Gets the formatted baseline file name
-        /// </summary>
-        /// <param name="name">Name of the test</param>
-        public string GetBaselineFileName(string name)
-        {
-            return string.Format("{0}-{1}.{2}", BaselinePrefix, name, BaselineFileExtension);
-        }
-
-        /// <summary>
-        /// Gets the file path to the baseline file for the named case
-        /// </summary>
-        /// <param name="name">Name of the test</param>
-        /// <returns>the path to the baseline file</returns>
-        /// <remarks>Asserts that file exists</remarks>
-        public string GetBaselineFilePath(string name, bool assertIfNotFound)
-        {
-            string retVal = Path.Combine(BaselineFilePath, GetBaselineFileName(name));
-
-            if (assertIfNotFound)
-            {
-                Assert.True(File.Exists(retVal), string.Format("Baseline [{0}] does not exist", retVal));
-            }
-            return retVal;
-        }
-
-        public string GetBaselineFilePath(string name)
-        {
-            return GetBaselineFilePath(name, true);
-        }
-
-        /// <summary>
-        /// Gets the contents of a file
-        /// </summary>
-        /// <param name="path">Path of the file to read</param>
-        /// <returns>The contents of the file</returns>
-        public string GetFileContent(string path)
-        {
-            Trace.WriteLine(string.Format("GetFileContent for [{0}]", Path.GetFullPath(path)));
-
-            using (StreamReader sr = new StreamReader(File.Open(path, FileMode.Open), Encoding.Unicode))
-            {
-                return sr.ReadToEnd();
-            }
-        }
-
-        /// <summary>
-        /// Dumps the text to a Trace file
-        /// </summary>
-        /// <param name="testName">Test name used to create file name</param>
-        /// <param name="text">Text to dump to the trace file</param>
-        /// <remarks>Overwrites whatever is already in the file (if anything)</remarks>
-        public string DumpToTrace(string testName, string text)
-        {
-            if (string.IsNullOrEmpty(TraceFilePath))
-            {
-                return string.Empty; //nothing to do
-            }
-
-            string traceFile = Path.Combine(TraceFilePath, GetBaselineFileName(testName));
-
-            if (File.Exists(traceFile))
-            {
-                Trace.Write(string.Format("Overwriting existing trace file [{0}]", traceFile));
-                File.Delete(traceFile);
-            }
-            else
-            {
-                Trace.Write(string.Format("Dumping to trace file [{0}]", traceFile));
-            }
-
-            if (Directory.Exists(TraceFilePath) == false)
-            {
-                Directory.CreateDirectory(TraceFilePath);
-            }
-            WriteTraceFile(traceFile, text);
-            return traceFile;
-        }
-
-        /// <summary>
-        /// Writes the context to the trace file
-        /// </summary>
-        /// <param name="traceFile">The file name for the trace output</param>
-        /// <param name="text">The content for the trace file</param>
-        public void WriteTraceFile(string traceFile, string text)
-        {
-            Stream traceStream = GetStreamFromString(traceFile);
-            using (StreamWriter sw = new StreamWriter(traceStream, Encoding.Unicode))
-            {
-                sw.Write(text);
-                sw.Flush();
-                sw.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Converts a string to a stream
-        /// </summary>
-        /// <param name="s"></param>
-        /// <returns></returns>
-        private Stream GetStreamFromString(string s)
-        {
-            MemoryStream stream = new MemoryStream();
-            StreamWriter writer = new StreamWriter(stream);
-            writer.Write(s);
-            writer.Flush();
-            stream.Position = 0;
-            return stream;
-        }
-
-        /// <summary>
-        /// Starts the actual running of the test after nicely initializing
-        /// </summary>
-        /// <param name="testname">Name of the test</param>
-        public void Start(string testname)
-        {
-            Trace.WriteLine(string.Format("Starting test named [{0}]", testname));
-            _currentTestname = testname;
-
-            Run();
-
-            Trace.WriteLine("Test Completed");
-        }
-
-        /// <summary>
-        /// Runs the actual test
-        /// </summary>
-        /// <remarks>Override this method to put in your test logic</remarks>
-        public abstract void Run();
-
-    }
-}
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined
+{
+    /// <summary>
+    /// This class serves as the base class for all baselined tests
+    /// It will provide easy services for you to interact with your test files and their baselines
+    /// </summary>
+    public abstract class BaselinedTest
+    {
+        /// <summary>
+        /// Holds the extension for the TestScripts
+        /// </summary>
+        private string _testScriptExtension;
+
+        /// <summary>
+        /// Holds the extensionf or the Baseline files
+        /// </summary>
+        private string _baselineExtension;
+
+        /// <summary>
+        /// Holds the path to the base location of both TestScripts and Baselines
+        /// </summary>
+        private string _testCategoryName;
+
+        /// <summary>
+        /// Holds the ROOT Dir for trace output
+        /// </summary>
+        private string _traceOutputDir;
+
+        /// <summary>
+        /// Holds the prefix for the baseline
+        /// </summary>
+        private string _baselinePrefix;
+
+        /// <summary>
+        /// Holds the prefix for the Testscript
+        /// </summary>
+        private string _testscriptPrefix;
+
+        /// <summary>
+        /// Holds the name of the current test
+        /// </summary>
+        private string _currentTestname;
+
+        private string _baselineSubDir = string.Empty;
+
+        public const string TestScriptDirectory = @"Testscripts\";
+        public const string BaselineDirectory = @"Baselines\";
+
+        /// <summary>
+        /// Gets/Sets the extension for the Testscript files
+        /// </summary>
+        public string TestscriptFileExtension
+        {
+            get
+            {
+                return _testScriptExtension;
+            }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("TestscriptFileExtension needs a value");
+                _testScriptExtension = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the extension for the Baseline files
+        /// </summary>
+        public string BaselineFileExtension
+        {
+            get
+            {
+                return _baselineExtension;
+            }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("BaselineFileExtension needs a value");
+                _baselineExtension = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the path to the base location of both test scripts and baseline files
+        /// </summary>
+        /// <remarks>
+        /// Just use the SubDir name
+        /// TestScripts should be in FileBaseLocation\Testscripts; and Baselines should be in FileBaseLocation\Baselines
+        /// The value of this will be appended to ROOT_DIR (QA\SrcUTest\Common)
+        /// </remarks>
+        public string CategoryName
+        {
+            get
+            {
+                return _testCategoryName;
+            }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("FileBaseLocation needs a value");
+                _testCategoryName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the output base directory for trace output (null = no trace output)
+        /// </summary>
+        public string TraceOutputDirectory
+        {
+            get
+            {
+                return _traceOutputDir;
+            }
+            set
+            {
+                _traceOutputDir = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path of where the files will be pulled from
+        /// </summary>
+        public string FilesLocation
+        {
+            get
+            {
+                return Path.Combine(RunEnvironmentInfo.GetTestDataLocation(), CategoryName, TestScriptDirectory);
+            }
+        }
+
+        /// <summary>
+        /// Gets or Sets the sub directory in Baselines where the exected baseline results are located
+        /// </summary>
+        public string BaselinesSubdir 
+        {
+            get 
+            {
+                if (this._baselineSubDir == null)
+                    this._baselineSubDir = string.Empty;
+                return this._baselineSubDir; 
+            }
+            set { this._baselineSubDir = value; }
+        }
+
+        /// <summary>
+        /// Gets the full path of where the baseline files will be pulled from
+        /// </summary>
+        public string BaselineFilePath
+        {
+            get
+            {
+                return Path.Combine(RunEnvironmentInfo.GetTestDataLocation(), CategoryName, Path.Combine( BaselineDirectory, BaselinesSubdir ));
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path of where the Trace will output
+        /// </summary>
+        public string TraceFilePath
+        {
+            get
+            {
+                return Path.Combine(Path.GetFullPath(TraceOutputDirectory), this.CategoryName, this.BaselinesSubdir);
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the prefix used for baseline files
+        /// </summary>
+        public string BaselinePrefix
+        {
+            get
+            {
+                return _baselinePrefix;
+            }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("BaselinePrefix needs a value");
+                _baselinePrefix = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the prefix used for testscript files
+        /// </summary>
+        public string TestscriptPrefix
+        {
+            get
+            {
+                return _testscriptPrefix;
+            }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("TestscriptPrefix needs a value");
+                _testscriptPrefix = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the name of the current test
+        /// </summary>
+        public string CurrentTestName
+        {
+            get
+            {
+                return _currentTestname;
+            }
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public BaselinedTest()
+        {
+            Initialize();
+        }
+
+        /// <summary>
+        /// Initializes the class
+        /// </summary>
+        private void Initialize()
+        {
+            _testScriptExtension = _baselineExtension = "txt"; //default to txt
+            _testCategoryName = null;
+            string projectPath = Environment.GetEnvironmentVariable(Constants.ProjectPath);
+            if (projectPath != null)
+            {
+                _traceOutputDir = Path.Combine(projectPath, "trace");
+            }
+            else
+            {
+                _traceOutputDir = Environment.ExpandEnvironmentVariables(@"%SystemDrive%\trace\");
+            }
+            _baselinePrefix = "BL";
+            _testscriptPrefix = "TS";
+        }
+
+        /// <summary>
+        /// This method should be called whenever you do a [TestInitialize]
+        /// </summary>
+        public virtual void TestInitialize()
+        {
+
+            if (string.IsNullOrEmpty(_testCategoryName))
+                throw new ArgumentException("Set CategoryName to the name of the directory containing your Testscripts and Baseline files");
+
+            if (!Directory.Exists(FilesLocation))
+                throw new FileNotFoundException(string.Format("Path to Testscripts ([{0}]) does not exist.", FilesLocation));
+            if (!Directory.Exists(BaselineFilePath))
+                throw new FileNotFoundException(string.Format("Path to Baseline Files [{0}] does not exist.", BaselineFilePath));
+            if (!string.IsNullOrEmpty(TraceFilePath) && !Directory.Exists(TraceFilePath))   //if this does not exist, then we want it (pronto)
+                Directory.CreateDirectory(TraceFilePath);
+
+        }
+
+        /// <summary>
+        /// Compares two strings and gives appropriate output
+        /// </summary>
+        /// <param name="actualContent">Actual string</param>
+        /// <param name="baselineContent">Expected string</param>
+        /// <remarks>Fails test if strings do not match; comparison is done using an InvariantCulture StringComparer</remarks>
+        public void CompareActualWithBaseline(string actualContent, string baselineContent)
+        {
+
+            int _compareResult = string.Compare(actualContent, baselineContent, StringComparison.OrdinalIgnoreCase);
+            if (_compareResult != 0)
+            {
+                Trace.WriteLine("Debug Info:");
+                Trace.WriteLine("========BEGIN=EXPECTED========");
+                Trace.WriteLine(baselineContent);
+                Trace.WriteLine("=========END=EXPECTED=========");
+                Trace.WriteLine("=========BEGIN=ACTUAL=========");
+                Trace.WriteLine(actualContent);
+                Trace.WriteLine("==========END=ACTUAL==========");
+                Assert.True(false, string.Format("Comparison failed! (actualContent {0} baselineContent)", (_compareResult < 0 ? "<" : ">")));    //we already know it is not equal
+            }
+            else
+            {
+                Trace.WriteLine("Compare match! All is fine...");
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the testscript with the provided name
+        /// </summary>
+        /// <param name="name">Name of the test</param>
+        /// <returns>the path to the baseline file</returns>
+        /// <remarks>Asserts that file exists</remarks>
+        public string GetTestscriptFilePath(string name)
+        {
+            string retVal = Path.Combine(FilesLocation, string.Format("{0}-{1}.{2}", TestscriptPrefix, name, TestscriptFileExtension));
+            Assert.True(File.Exists(retVal), string.Format("TestScript [{0}] does not exist", retVal));
+            return retVal;
+        }
+
+        /// <summary>
+        /// Gets the name of the test script with the provided name and the provided index
+        /// </summary>
+        /// <param name="name">Name of the test</param>
+        /// <param name="index">File index</param>
+        /// <returns>the path to the baseline file</returns>
+        /// <remarks>Asserts that file exists</remarks>
+        public string GetTestscriptFilePath(string name, int index)
+        {
+            string retVal = Path.Combine(FilesLocation, string.Format("{0}-{1}{2}.{3}", TestscriptPrefix, name, index.ToString(), TestscriptFileExtension));
+            Assert.True(File.Exists(retVal), string.Format("TestScript [{0}] does not exist", retVal));
+            return retVal;
+        }
+
+        /// <summary>
+        /// Gets the formatted baseline file name
+        /// </summary>
+        /// <param name="name">Name of the test</param>
+        public string GetBaselineFileName(string name)
+        {
+            return string.Format("{0}-{1}.{2}", BaselinePrefix, name, BaselineFileExtension);
+        }
+
+        /// <summary>
+        /// Gets the file path to the baseline file for the named case
+        /// </summary>
+        /// <param name="name">Name of the test</param>
+        /// <returns>the path to the baseline file</returns>
+        /// <remarks>Asserts that file exists</remarks>
+        public string GetBaselineFilePath(string name, bool assertIfNotFound)
+        {
+            string retVal = Path.Combine(BaselineFilePath, GetBaselineFileName(name));
+
+            if (assertIfNotFound)
+            {
+                Assert.True(File.Exists(retVal), string.Format("Baseline [{0}] does not exist", retVal));
+            }
+            return retVal;
+        }
+
+        public string GetBaselineFilePath(string name)
+        {
+            return GetBaselineFilePath(name, true);
+        }
+
+        /// <summary>
+        /// Gets the contents of a file
+        /// </summary>
+        /// <param name="path">Path of the file to read</param>
+        /// <returns>The contents of the file</returns>
+        public string GetFileContent(string path)
+        {
+            Trace.WriteLine(string.Format("GetFileContent for [{0}]", Path.GetFullPath(path)));
+
+            using (StreamReader sr = new StreamReader(File.Open(path, FileMode.Open), Encoding.UTF8))
+            {
+                return sr.ReadToEnd();
+            }
+        }
+
+        /// <summary>
+        /// Dumps the text to a Trace file
+        /// </summary>
+        /// <param name="testName">Test name used to create file name</param>
+        /// <param name="text">Text to dump to the trace file</param>
+        /// <remarks>Overwrites whatever is already in the file (if anything)</remarks>
+        public string DumpToTrace(string testName, string text)
+        {
+            if (string.IsNullOrEmpty(TraceFilePath))
+            {
+                return string.Empty; //nothing to do
+            }
+
+            string traceFile = Path.Combine(TraceFilePath, GetBaselineFileName(testName));
+
+            if (File.Exists(traceFile))
+            {
+                Trace.Write(string.Format("Overwriting existing trace file [{0}]", traceFile));
+                File.Delete(traceFile);
+            }
+            else
+            {
+                Trace.Write(string.Format("Dumping to trace file [{0}]", traceFile));
+            }
+
+            if (Directory.Exists(TraceFilePath) == false)
+            {
+                Directory.CreateDirectory(TraceFilePath);
+            }
+            WriteTraceFile(traceFile, text);
+            return traceFile;
+        }
+
+        /// <summary>
+        /// Writes the context to the trace file
+        /// </summary>
+        /// <param name="traceFile">The file name for the trace output</param>
+        /// <param name="text">The content for the trace file</param>
+        public void WriteTraceFile(string traceFile, string text)
+        {
+            File.WriteAllText(traceFile, text);
+        }
+
+        /// <summary>
+        /// Converts a string to a stream
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private Stream GetStreamFromString(string s)
+        {
+            MemoryStream stream = new MemoryStream();
+            StreamWriter writer = new StreamWriter(stream);
+            writer.Write(s);
+            writer.Flush();
+            stream.Position = 0;
+            return stream;
+        }
+
+        /// <summary>
+        /// Starts the actual running of the test after nicely initializing
+        /// </summary>
+        /// <param name="testname">Name of the test</param>
+        public void Start(string testname)
+        {
+            Trace.WriteLine(string.Format("Starting test named [{0}]", testname));
+            _currentTestname = testname;
+
+            Run();
+
+            Trace.WriteLine("Test Completed");
+        }
+
+        /// <summary>
+        /// Runs the actual test
+        /// </summary>
+        /// <remarks>Override this method to put in your test logic</remarks>
+        public abstract void Run();
+
+    }
+}
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RunEnvironmentInfo.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RunEnvironmentInfo.cs
index 2889214e..4e6119de 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RunEnvironmentInfo.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RunEnvironmentInfo.cs
@@ -1,73 +1,112 @@
-
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.SqlTools.ServiceLayer.Test.Common
-{
-    /// <summary>
-    /// Contains environment information needed when running tests. 
-    /// </summary>
-    public class RunEnvironmentInfo
-    {
-        private static string cachedTestFolderPath;
-
-        public static bool IsLabMode()
-        {
-            string bvtLabRoot = Environment.GetEnvironmentVariable(Constants.BVTLocalRoot);
-            if (string.IsNullOrEmpty(bvtLabRoot))
-            {
-                return false;
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Location of all test data (baselines, etc).
-        /// </summary>
-        /// <returns>The full path to the test data directory</returns>
-        public static string GetTestDataLocation()
-        {
-            string testFolderPath;
-            string testPath = Path.Combine("test", "Microsoft.SqlTools.ServiceLayer.Test.Common", "TestData");
-            string projectPath = Environment.GetEnvironmentVariable(Constants.ProjectPath);
-
-            if (projectPath != null)
-            {
-                testFolderPath = Path.Combine(projectPath, testPath);
-            }
-            else
-            {
-                if (cachedTestFolderPath != null)
-                {
-                    testFolderPath = cachedTestFolderPath;
-                }
-                else
-                {
-                    // We are running tests locally, which means we expect to be running inside the bin\debug\netcoreapp directory
-                    // Test Files should be found at the root of the project so go back the necessary number of directories for this 
-                    // to be found. We are manually specifying the testFolderPath here for clarity on where to expect this
-
-                    string assemblyDir = Path.GetDirectoryName(typeof(Scripts).GetTypeInfo().Assembly.Location);
-                    string defaultPath = Path.Combine(assemblyDir, GoUpNDirectories(4));
-                    testFolderPath = Path.Combine(defaultPath, "Microsoft.SqlTools.ServiceLayer.Test.Common", "TestData");
-
-                    cachedTestFolderPath = testFolderPath;
-                }
-            }
-            return testFolderPath;
-        }
-        private static string GoUpNDirectories(int n)
-        {
-            string up = ".." + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "\\" : "/");
-            return string.Concat(Enumerable.Repeat(up, n));
-        }
-    }
-}
+
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.SqlTools.ServiceLayer.Test.Common
+{
+    /// <summary>
+    /// Contains environment information needed when running tests. 
+    /// </summary>
+    public class RunEnvironmentInfo
+    {
+        private static string cachedTestFolderPath;
+        private static string cachedTraceFolderPath;
+
+        public static bool IsLabMode()
+        {
+            string bvtLabRoot = Environment.GetEnvironmentVariable(Constants.BVTLocalRoot);
+            if (string.IsNullOrEmpty(bvtLabRoot))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Location of all test data (baselines, etc).
+        /// </summary>
+        /// <returns>The full path to the test data directory</returns>
+        public static string GetTestDataLocation()
+        {
+            string testFolderPath;
+            string testPath = Path.Combine("test", "Microsoft.SqlTools.ServiceLayer.Test.Common", "TestData");
+            string projectPath = Environment.GetEnvironmentVariable(Constants.ProjectPath);
+
+            if (projectPath != null)
+            {
+                testFolderPath = Path.Combine(projectPath, testPath);
+            }
+            else
+            {
+                if (cachedTestFolderPath != null)
+                {
+                    testFolderPath = cachedTestFolderPath;
+                }
+                else
+                {
+                    // We are running tests locally, which means we expect to be running inside the bin\debug\netcoreapp directory
+                    // Test Files should be found at the root of the project so go back the necessary number of directories for this 
+                    // to be found. We are manually specifying the testFolderPath here for clarity on where to expect this
+
+                    string assemblyDir = Path.GetDirectoryName(typeof(Scripts).GetTypeInfo().Assembly.Location);
+                    string defaultPath = Path.Combine(assemblyDir, GoUpNDirectories(4));
+                    testFolderPath = Path.Combine(defaultPath, "Microsoft.SqlTools.ServiceLayer.Test.Common", "TestData");
+
+                    cachedTestFolderPath = testFolderPath;
+                }
+            }
+            return testFolderPath;
+        }
+
+        /// <summary>
+        /// Location of all trace data (expected output)
+        /// </summary>
+        /// <returns>The full path to the trace data directory</returns>
+        public static string GetTraceOutputLocation()
+        {
+            string traceFolderPath;
+            string testPath = @"test\Microsoft.SqlTools.ServiceLayer.Test.Common\Trace";
+            string projectPath = Environment.GetEnvironmentVariable(Constants.ProjectPath);
+
+            if (projectPath != null)
+            {
+                traceFolderPath = Path.Combine(projectPath, testPath);
+            }
+            else
+            {
+                if (cachedTraceFolderPath != null)
+                {
+                    traceFolderPath = cachedTraceFolderPath;
+                }
+                else
+                {
+                    // We are running tests locally, which means we expect to be running inside the bin\debug\netcoreapp directory
+                    // Test Files should be found at the root of the project so go back the necessary number of directories for this 
+                    // to be found. We are manually specifying the testFolderPath here for clarity on where to expect this
+
+                    string assemblyDir = Path.GetDirectoryName(typeof(Scripts).GetTypeInfo().Assembly.Location);
+                    string defaultPath = Path.Combine(assemblyDir, GoUpNDirectories(4));
+                    traceFolderPath = Path.Combine(defaultPath, "Microsoft.SqlTools.ServiceLayer.Test.Common", "TestData");
+
+                    cachedTraceFolderPath = traceFolderPath;
+                }
+            }
+            return traceFolderPath;
+        }
+
+        private static string GoUpNDirectories(int n)
+        {
+            string up = ".." + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "\\" : "/");
+            return string.Concat(Enumerable.Repeat(up, n));
+
+        }
+    }
+}
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment.txt
index 5f18e60ca67dcd50b37c155e6294ce22077b4e4d..0096e7d9503e8b8b54dac3f066123cb2d738006f 100644
GIT binary patch
literal 376
zcmcJLy$ZrW5QO_c-eI~xFltP9U?GyuKhAU^MKp^X@$Teqh2Ya0gP6v~!mYNLo%v=r
z)R6<*mW+B(17&V^7GbdbI$;n7#Y^i)Nf?y5lzS;~whduzwI;(m%LO^DOwGM(%}7Ox
za$X_nw`_qjORGK%#W5l0lGD|m+xO{|JDxz3_w|JYw#s{DE+EtN34=Lw?OH_fESgp?
gr1G$m$6Vqc9K&nC)Um)U#@+B(YoPu>#lJv50UCjJT>t<8

literal 754
zcmdUty=wwN5XD~|@PF7Ya2TVp6D)$HOQNXVVR3#Sq9#F45dV1f_s-}c+E`e~FgqW+
z^Y-oR?6#j8X^k!vl<HSg{2xuU!4Anyi2k%<ucm^YRKG!d-r7CkF0Z2aOso&JktSN>
z-T^g3I0QBD=7@Qv`X)+2G~;>3E+IZ}wHH*OzJiTaRuB8~pR4LE%U0QS-Y*LvbvR+P
z1-7pl_yf9derpNjHCm*?OqNKZF`l`8f#r-5$HZpp-uVqVb5|zZGG*skkzQF#FgbQ9
pR!i@^zLRw#JWN0GsqqAPnmj9k_eHF$?ANaSR^IE&PDOX?^d1k2cv=7e

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment2.txt
index 9ea67865aafccabf31c5a7e75de7cda3fec8d2a7..29f584c4a45a608737676814785c165ef654fb2d 100644
GIT binary patch
literal 377
zcmcJLI}5@<5QO_c{=;-aF!9wLScs(a#hETxM6-k=-ksd75d8ICf@ou7;Z{@3&VI8S
z>d1j@OGZ7YhBCK1i#S?-oj8i4qWAibC63Bm%Doi0*qX4mT9e_O<$|16rs9xVF=k?h
za(Y4<)FQ}5(8{1VrsQ0DzS>LsTAgRy@fe!CuNo5AD({tPK&B2ShIHu4wHPInQFiK?
e%EL+?bBVuz49@{m#{!cCcf+4z1NWQi7w9KyAa;`g

literal 756
zcmdUtOKSo_5QOV2<Uh<!ki_Rr$U#DGnuvN^Jgg5yj1P1L@yDxQt(z<oFFAM!P0w`q
zO!rjR^!e1*R0njcphRmeuvePv$UY%9$J=PnSyN9c==Bfc`_{ov-QC?Pz7y$PJ>(N@
z^6r?N2^fOju$G8%CHlZisA$B?6kUve#cC_4Mt+SwQdL9tmn_!EqKz!>&H|PC+;Fum
z`$%8ZAH%}!t96yBeL$bdF_s+?YldaC9gsNUnlpT3HGA$N$L`FScNUx!RZ@ku490Js
oB6ZcG|9;9v_(zQ7ljAA!M0s8U9hO-4>CfH!v7GPUTs?~E3$ns^kN^Mx

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-cycle1.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-cycle1.txt
index 99ccebc2c311e224287725ba080ebd6aaa931361..ce03634793c4086cf1047c31e59a0d9ccb775b84 100644
GIT binary patch
literal 789
zcmaKq!D_-l5Qgu0ior`-Q8CfeKo6x@D2OdF;34iIY{t4Yjk4La+NbYiw{~eY=Cp+Q
zzJF(S=5!zpX7@&w`l13<wQmdtcNf1POL4DNWgy(DP-Kfa1|oZ^WZ4vis71C~A_%UM
zM_E!lG6y5F*=~a(NZW||*UYN+2c&c`kQ+#sL(+O^xv1rCB8(s#3m5{Q_!y1FEkfw?
zLvfNU=yR?r>hw68O>ygtA}d-~UhvbxWx)xu{Dk?5<xzWnwN-}deJ(rh5ToO)V#<oC
zRe(2i&ml$!xa;#dcCa6@xA3StdvN4`3$sDL--nm`WI0O^PLtTElAz}^de_R%9`9=P
zA8F=-VU{G%94~hT!GqGWDRZ6BhBQ@fsQe1&9q_uIZ_dE2GZ<bigaN!$UFWZa@Ywbg
W`uGqu$wt@egUTbT>>3v%5qtx`2kn;t

literal 1618
zcmbtUO-}+b5PfG8|3kxN)rfHcFC-p}!Ni21K@tuNhYcS}L?sI-`s39%?e4Zf6I@Kw
z-RZQQ_vWMX^WDS<E6xN83%uc(@+&6z;(tipgsT~r+^gdd2e>RS<a~q<Z_a36EG=j;
zz!T*FeeSi;Ozq0*mL~?75^YHII!B^Ub@4!1X<4id@Tt#@P{A2(t~lj>gZ#(b?`x)=
z+?zRd+uSpDna_$$B^JUl*53|s%hV+tWd}9PQI8PPcE}qM&WWpdPNh1d4YmH5r^It#
z93&FkTw28aV00vEBi=2_$VE4-Dml}TaqA=F)T4JjqWF2N=cEXaO+3q@N`E3osphbd
zT>BYxb-gSYg*oFFGY`e$Av|0}%cGX^xNvw#mVEixr#1xH#jwcYyTqUZ7u#3Yem17k
zi)X_{-NhzDmfAegL*X7*X!BJx_?3#@td243b*l4Ia^8!5r6t<h*WT{e_#f-O*k|^l
zHNTbizKy#y1_SmP=~oKZ^gf~AOU59k)TVaKnQ%&Hvvq6U#$U2wI<WMnUA^d(3~UD%
x*>p3>lkB~4J?Dt=NJ+FedA0&?wgR3J?&49xn-jcqHD&iTtZc6yvLl*T^9w<T@k#&y

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition.txt
index 366ee9cb7912ddf7efa3f038538a60aaaa302448..b2d8d8473fa3095bdfe0a28cfef692cb45bdecaf 100644
GIT binary patch
literal 561
zcmb`EK}*9x5QXo7{D*gof+<}+SO+`^_8<sKQt4sIVM)hyQ8!_CYNNm2?Y7{>;-!08
z80LNR-pnJ9>>>RdJNwNmST}5h^6d7{muI?W`81v=q`%S2n$YCgVn+zS!q}Ng*!RN-
z7In$qmr;Gsuhv<yy_?7=XNnZ`v_T0)GwAE)oKPGF6p?)(E!S2!45sCOXo-<%H_)?0
zL*mS<>Zu~M{fhD8Jhy$9QtzEci;9vWY1I|9x@_V`jyk`<2ZvxfCOo*d_mL<FUrx-3
ytqI^*+&Ez$7rR~CcgA3Ru&zTfjcX_-F<gxId{@=;3a59M&I;jC2)lu&@cRS6Beb>v

literal 1124
zcmd6mK}*9x5QX1a@IUM=3Ra9BtOXB(9t1(L6%V0@(rOKAl_a&*AFqBhTbl@8ikGq^
zyE8jG@9mq}ug?qJY0g(DsM3obSx=PfgL#B6$9mP2y^c1uq2m>X#b@f0snVMUV00K|
z!|t<xOGF2xzUS{PIh21Q#+-Fj_?16^Qjx2Nw*^kYXf3c$vG4spIWajn6Ya8^^KB^w
zE#+jUJ(vVe1^2bxcZhG>Stk6OH%Jz|GcbSD3*6}egbKtG^#&TU`X9HNN6qcXxwRYI
zf@(fzx@KJRnYu&Rjhw{|_bynOXWXcDlYdmvG^sIa+*AjSoNC{-vL0Do^BvASyFw)j
zjaeDbb8;CotDJGPYL<G(TM;$KnlYEm)~6OZ^*yU~?AV!W|AZA>`+{g=IL1z>ZtTQ_
m+Q*KI9d)G>l<LY<3;ths?JDjbU#q=bd&Txf!}5mfqVG34w6?PV

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition2.txt
index d528a7a48365e854c9e993d008a7ebb9f8395bdb..12d1f3c181f9dc598b0608d763a10432964c9641 100644
GIT binary patch
literal 1162
zcmbW1T~ER=6o&8jE6yE~I70`1HSxkI7bZl_z;ID}QO6M*SxeR`=&$$CGH3jPu$wK-
z-lxxU`fh+rtiao6H2NJUpw0Zn^W^N;D-lEVud3qQg}W5vAqOc&Ts4mm&0`_O^?)Z*
zT<|m{^sAcb3Ai`o)e`o+wNNVa26I)Z(zWZC`}UE`WVBLppC*Y23lIfBc^C~-tg4iB
zF7Z(t?X@-8fnWMP#u<o?gcKM*0dXwb99nDTmaIwRC+*SARe_smfe~n@AWi}e8qNrp
zeiI?&0)cfvoCbty5ZkN7cqGwBvd%6xEG8o*BMJ+Yhn<9CKC-&R%62k}$w=uDr5h+k
zV|0y+fi@dQ#bTI1+3FCmUf|rD26SP|63vE*)#1SD9)ak^nQd{3o1L~&&iEQnTXk2;
zhjFA|m8lT_AFw+3jX^4jxINE@{T%vvev@-3>;&P?R9M()D12-c)rm^;a|qPgzk9YH
ze;eSb07Tx05}i|1<ZxvQThSiA?)pMGKw5k;9xM9GES~fXSG{-IOrce@4rKBHy~1f@

literal 2374
zcmchZPfy!G5XI+Qso%l31c{(JX<CTHp`sirA&MXs2a<ym{zZjQ#imL5@W5|&o$NSD
zP{9dW*`A$U?|bt+yW^+F1G$h1*GMAC<W7EL4`m<^JkRkB=>3s<##-`GKFIDXn$ACy
z6IROPuOwi!XsPLU89!x43naDMSc$Xdy}gCrzVjZ+0q-fAuCa$*qj~O%dqWf&ODg|}
zCc`tKS9S5;Vcp^xG8Pf3vP|%#vaw+8eH6N6{jNi6&-6-j{GvKO{xB;lXc2*vf!W4e
zLz5A$mh1GL{-x7?z?=a%L#fLa_Jpe{F?ccWp2;V;L@rwOZ9Csrd>iy4sc^S?S90d6
z^z>Ute1U5)GB8u8Kp(3tyTBx{+i~o+4LfD%wJb7f!$2b~%OW5K7BQNsayy1cvV_Mv
zl(G1hmH(bP8ou7T^@;N=@~D<g-D#xbflcpSRk92$vqsLWZkVlKCyQ#?e9qZ444eKE
zoes(BF=v&YspWTAEEd~ys?W}aSek}WhqI*v>f+tD$60Vo)04m4o}0%HtQzvgDb+0G
z_iE1R#Zj$JZH=nP-^bOMsomss4*TR~wS5gKbF$6jzRYH-j;}^X@=cDZIQ!fqcR!Y&
z*jg?6<iWYi%wJ@}2unRz*wg<3TQz+3@|Ea+c89OWZ>e{iaLY`+(n_V(!E@G8&E1ri
z!1luVf52MVYgN@aG_Q;Gf6VL@uV%f@yyvMa>wNuN7`v)?LvQ+Dkh-0FMZdxu73#6C
FUC;Y`ZTJ8H

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition3.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition3.txt
index af42b18f4747320c346cc6e4a85ad82d4722c256..fac12a566588f12e6bd441c491485a15ea2e9554 100644
GIT binary patch
literal 605
zcmaiyPfr3d5XJBP6mwfhSmN$pw223UYhtnivv8|D)Mda%X-PZC>Zf;DKobAaOOr|8
z?@ixKg)Igk|ANkb;2f-5Z%B&kUyo2DnWo@8yqRFl(<{Op7uK<^X9&v4U0<tlC52W~
zBz_}h>~5_}zmQtYc0Tb7FH~26kzcLQ5inymO)-R&wYNL6CF@-=q?US_%s^deNFkF&
z4ywp>UqW)GpF|%`#<;Dx)pI5XG~47m!y@lo9^DDF|JwhYqqf6bGUlqo9O5{!IF@su
zz4{x72|_*G)YGztvaTn!gvQSix;)EvjScZoIL}=E(DRJ{j(M=(1t4rm!T?qnqgkSa
md)N37m<#dUk!fLTA|Mwxjxey<_Sy12tWAj4Eg?yUT6_Y}6}|5O

literal 1240
zcmbu9T}uK{5Qg9Dp#QLU8l<G#MF?F)Z4iitd8b~OsV$X?u4(=F>X|*OyM`394CiZR
z&dfV=X3qClT|=!Ib9st1)eHNHLVdD6!3#Ofv_w|Zv5s_k0GWPA*W4^Y9+sxe@9N_%
zWPa2uUOfB^HHtkspG9O5{6J0J>O?)PG*nLz*y({AQDUhEe~~$xJiyZkelNz{-o~{^
zZ0ttiaHd)wn5TM!EEk5v;c4Ty1aA(N67M&h9rh5-kb4vPDzjfRimKqTf`yLGK;y-E
zFrKe!%=MA>h_S}0fHY5@3Q4>jWn*c8a7Fg)B`w?eV%f#*;;C+9^oc8trc0i>c-@aH
z`-XW?{q~+>x`;D;9%p`&;oVx<kIYq1UQAi<e`DI9aCLaEE48S!fZ2MW1vME~Ap`2m
zy2Z=9a6qNa;0>rZ*FWxsEieCLa2;;;4z2A|P^3SG?d>PAf5MZ=ta}zvUt@O0y`vT^
y0_z`#*F*jRH$rQT#)@^pYJF##%UEU|=OSC_nL2jA#thv#+E&+N?i8SM(g8n6Bf&5L

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition4.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition4.txt
index 6525f508dd98162d611c8d884b675dc835ae092b..3785dafcdce96fc0ccbe853bbac5d8ade6379ad5 100644
GIT binary patch
literal 661
zcma*lQBT4!5C`!0eu{gWCX6s<B5C4-!9AD|G=sO=hsq9Yl$Nwbrk~zh87xsm_p+qT
z{rb<{O|V7>!M>u=pICu5n{D9i=H$o348yx}ocs8fVmjeWiZM@9Fc#=atLHa_3YXeo
zb+|9=l1nyk9`Q$;iFg2e5>$ZsEJf#1Qtq019kex9{ZNOCjAtMQ5>m+c2*kC#<dC!>
z5_yoOxSP<ke^C)2YS^HoNIjWO8Qb+5O*pT#wNV-7Ao4+UPPd`6|CMmaTaom<$(Uz9
zLQ+T12RsyhGbjoZkGJKlD4{6Jhmym>RtRwvMZLjApe3MLw0-W{M4R#ZfO`84f`E14
vz<RJo@6`%9+?$1Uj#%&?Ca4;A$^+8j)&z9)*6u~q!fcfD+N>a9Nnf%r3t-R1

literal 1364
zcmb`H!A=4(5J2Z_;y?6;CSn9kR1yycIhYVN$PGBG2)I#!z#{0!t8Y5XE~|tDFwJ(`
zPN(x`I@9m3nsjB(Hx?(64CRIKKtlQC|HN9zY$Q`;W!aZKx!j=X{-!)|QY7yZV53Z%
zEX~`<Z>1KWt+NW_Jk4QuNN;)}+K=*zrh}?0J<p|te^02Q*W;A7=WQfDO=2rq4~#M0
z<ubeuyAd`Utmd&hrsZR%>x3g@Pl%m?oXRodIp2X4uvb90DJQTv?~|^b`?WLH4w*U0
z(J#j&7n3)!y0{NVl)5q_QhFa6h26MP2IDFwtQSjMExc`EZ#7W`x;L8Ui^gbsqOA3l
zs3;{Ls}gZcqqRwPtS0}zSSopz(&$S`JWKeHvagS*W$rGK{B3tV%_2Hh1NU+zb@IGQ
z?|fgEJI0!$9qwA|PAg%NlU4G3#9D{jx3|JFAe-aqZCWj8e%Y(CO;sJC8zlrf*4Inl
zCg-bN<(iQbS|EK!D!Cy;)dQ_w<8{bCeBK7=J1Q$+#UZtwQ!mqcH_vABOy$}8Gh*+U
R-CBu#baLKuj>@+e=La}8)HwhE

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition5.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition5.txt
index bda188ad8055e3f08d8abcbe447473f0a23e74b4..b8b4484a66289506cebfb99acc260af7f617007b 100644
GIT binary patch
literal 738
zcmcJN!AiqG5Qgu8yu;w73Z^6!v0d;W*qf*%ksg*DmUP-IHJiFSk>Jxi*;Jc@QbF9y
z&My4l%=|O=*r5e#c4+iFu0fl9OCk(zzCB?eGo&|Vg>e2Z<SG+T$XuvH7zTL{b4Lb?
z{1*&TPy~4vp|uf%?r@`xCf%5;DRp$7hy-L@Km>`HgS;*-1WXReCdC(ORcS)ES0$dp
zd5Fg?K+Zi5MxY!!I)(5;k4R#W3(rs^#_x+6^aG0fOyW^J%QSsV1(eMiAtS5J_MxF1
zZLN(Wo($W@<_s!Nm~lK~tF-yq&r7J$IkiOr&!&879D`olhE(r3)XMHaZK&UX3Zbl&
oRb~HjKL3>cX2+jy(`=c-Kh@_~4~WMg;H)*A{j=erh(CAm0k&i7dH?_b

literal 1478
zcmdUvK}!QM5QX1a@INeGs$h$yh;6}xpf^#ml^%+RrPa37R_(4*{PF5H$<{=x2Q4BJ
zvOAec@?Iuy^74GFE6wRMCCYWHG4@m=J@N138!@`m1F@#owWj@VG@IX5i=A>kDg~oS
z%cAim@eVVZAer69N}UzFwoChsS;mZI9v&&oO5UL+?3shm##;t`Mk^PL4jEs&Q;wK3
z0%xjSRj}vuO;y3GvbL)ocqOb$oUiVDd-%2-`x4*yWF;cYtU4Nkk%O6$)l@yKRoMk5
zfnCF~t4Hh-ea@&213T%eECOO+Q6*=Vxkkhz{es7DWG2RsS^4|4Xt=#NKSw&JozhL0
zJv7mG_tYX!GpCh-PVnX^%G5M*KGT@58Lu|4oER%`s1=&36{@l-`-wicSv3JQqoo>P
z8RH9f>*)rDrbw&edn(xY8Z)nPTW1wHCYn+K#@)XGLo7S>(8W!oi&%!WIDe(kx7YZY
m4#-wZmbt`z|4;tHt7k8uuLjHF205D+Xa9J^aVGx$4qgH0EbVsy

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition6.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition6.txt
index 47a16c602e7a2e1131cac291c65fa4519782df41..f6648d8b8d83df3c36b7b4810822ffd9a7a68a44 100644
GIT binary patch
literal 801
zcmbV~PfG(a5XJBNDTcjNp)HLEZ37+z_aKxiy9+(U9O8D`1~t1Rsa^f_PLtLJ|5eN-
zAuzvr^X5&lMGL-uM5Etu0opVh&y&k<Pa+ERFUoT6!Y#$T;2=fGRrgFE(kfk~Qp~12
zks_;?TqfnNf&1VlB78u^f$~rm1GIKP@M~OZqrI-p`OvrigmDI9Bw+xIk3n3>Qx3ho
zfSx>%=4<WIHLAj6w7>|o35ao^LB}bv^~VUIE)duV#3Ue8hxogcSRP3<Bpdxl4U3hL
zLc_7>(0&b_tQl^n+8niqMFio_cE+>l(7owEw9(%kIuw3l5FrtFS9y`;kmdPp&Y`Lo
z2q6kt+hFA>fRqK=_}7^znLmf59}^6ow#Q*VdLN$AIkiF#H>Rqsr3T<$jaMyfl>?;D
Yjqzxy>vpZ55E^BjHY?~I%p1z&9Wr(Hpa1{>

literal 1638
zcmcJQ%}WA76u{p(=zkczSdh_nC>1&cc?iV9gbwOq^Q)yYao4o|`0Dp&R(Do3D2ZWq
zXWqQ^{pNl7^;wsJESOU<lE|w(u^vk#AH4g>B6bs*aaNUm*^`T34ApPT9lw;wn}pb?
zGGcGv<@_FvDwcHJVinrey0jn<Qji|A&s5!p)X`QOx~suHWZ$)t*6Jp4s*~q-WSN%9
zQ5qN$h+0TX&`uep^afY#ht?|*IuUlpawf;D7t8|*uov)cTTWmxd}pkzY-Q)j4$&}D
z<mr2&n3AgxmQgVH<`EkSHe;d?a{mF}?nal9WONlvSN7<X(D^b?)Pg{7x+_IyF{23Z
znR>3`afDkq{=+lAeV@w3Q%|$#{kMODG>e>7pT@;65I>jl)v-Bp4I($EX0)Pr&!Rwl
z4##)8%Kac0!w&V+!Rlr%SGl|7)4JWCX_geO2i(e~G^z6%Ph+1=xnZp}+M^Qt)>m0g
z*2w+|vYxF<?U1e-UETYcvMpw=r~ak89APc-x`Xxwtwm+cXMk$Ha2hj08L?8GYhs{x
z(thS{U^stAnxM5nW6nF~t^Wb4IkRWl0o}jB-1ehqcE<LjDcYJ(Blg8Lh9X_jb&zkn
Cclt2^

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition7.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition7.txt
index 2b90818bf41bc83877cf9b75d29b00afc804492c..6614f9e1268e7c55d3d397b562a4334dc1ccea07 100644
GIT binary patch
literal 793
zcmbW#%}c{D6aesh|BA;hQ`p8LxQ~Db!5)M$r7i3bbBNvB7SyyPnXCTwz9r6rUlV&t
z3A|t4*9;r9;Hw8T`W2U;O}+Izx%l==M2`MhS<YQJrC8(~q$s#*fA2eGXDP*e#uF*h
zYQ<$z?0NU0CL&xw#6Wo{@;+MIC;AFk+GwvUGamTHpD@lq3?=k|@d=2rJmt`Rf4(aZ
z(qf}Mx>}WZObbTPrXVIkgVrgq@yCP^7X&s0F%5)jiNB{3!=pq+vf+QSVKFi)BT~+T
z5{A$wHOJjdo1@KP5g_br-*z?%)}3h~n&<ERIRt((NJzx(WtOKIq*->8aVV=LLRf^f
zsj>95e6$HP@2?fnR{p#qy|}&LX?7e!;XQal=hPZGT${48mUwV4#;XQ)$^p{l)_An^
U=5C`O5o%?fHf!j{#tmfh1_?Cvh5!Hn

literal 1622
zcmcJQ-Ae*N5Wwd-=zmyxu^^)h$`9xv$cI2IOz1&<xco{g6YosxkFS2StL`cql*n>-
zyEC)SZ)bMK@2|3SWXdxVBdNT}GxLG;<&$q4S)bKV#^{Q&FMD$NhoSa$x#yQsd6yU;
zMMe^=o9G{~DB?-yHD<A$tx6x|Kw3O)tF1^GOZ|P_Rf4<Ax@je~#VL}R%`&s2@>XVv
z(BMCXriL^N>4=e?(O<Lf+KBYA>EmZ0IXPiI<vElHe-V4@ate!KpRuyMmF18fVPPc0
zJB&hRMy}_dXTT7bCw!#%OvpgY={xM*j?R;Kx`L(42Xsp4V!2FIgFsKZErs{!DI#K~
zkt+lo@dl1vL?-kfQn`Gp)@N_m@rh=)$axKEE^Le<IS*)jWvtIyg{)1e7p>&&Z%`y5
zgJU~e-1~@n@NsHTI}N<9=W<oM&0Sjc`#a5?!qxwsTuGH0FYz|^U6otrTAwYdux(@I
z>#@YmA0lhniqy{ND$&(^cuO|r%k|R#be3bhr9o%Vo}hK8tUmi{^@=88#L{D?`Wxb}
z=g~gq=neW0q$yTYEGB#tzS{TIa%^?l`P@Ii#P*>VR>t<B5!QN_daN^n{|uebb&Ve_
Ci}@D-

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition8.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition8.txt
index 26d9035abbabc9736c18cdb8adf3436167fbd1e6..54c97259a61e6a87c50912c23212e7fded7cf8a8 100644
GIT binary patch
literal 785
zcmbW#%}c{D6aesh|BA;hQ`p9$1Gj(&!5)M$r7i3bbBNvB7SyyPnXCTwz9pLlzb5vQ
z5_rG7uPHWY!B>xH^cyZfn|kAUa{29-h#dWkvYfkcN-@tlNKtUr{yua%Qp~12ks_^@
zTqea1cOPaV!UaSMl!qekqqTj4uW_l3_PR3Tfp7c?;|#=5LLV3(gSe2V9J>3*yYe8-
z*V?12Rf)&6U<7RfVjMJRodO$wObBs7U_%g-K&Y1Zdnz$JN>n5p{wEt2Bcn1R<vb`f
zf;OcYZl~HDZ4HazM4j!L&PGAHH!Vcd{JlGez)uDViMYGU@-%}q%Wg9cWwk&EYmhcI
zmYx=m_JF4SwI15YpBJPTHy1ojjsun5gJ*P3t&qcwDJyFU2lr~cYGA7zAYE>ZM@uhm
T*ZK*eR@P~=g6^(q1DU)7yIJyJ

literal 1606
zcmcJPO;5r=5QgV$;(yq9sU~8q9}!4An8?9|pg|H3z@dU5QIXIh=#N*Q*)4P-V4{uL
zw4I%u_I*0LGhd%od5{^`Sd1j{Do@x$8OR6EF1`V?kxW=C%eHLE`7egXH|3TuCGsW_
z8f8Z8&D*Ts5m81-?FLq4tyS;6>@YN@CRL*J+d8Yj++*Ihp2p%2;xuNN*AZn=W{J+A
zoj}sSTYz%RD5T_<%zHK)17Zf~45cUs*fXwO3DFCAw<(9P7~V71SG2w}e0xL~3Ap<i
z2vTzW_j&dWIeA1QK{F=%k#w-~(q$wWUCGiFJvt?Hxm+e{K%jq`mm*WlC_-|knJal5
z(FTtH$c(S=Q@Q=r)ol0vJ3nE1ikzxXb7FH8%CSe|s$%_))!4BqwW1ZA|MZ07>pQNa
z#hDM~)T3%qH!W1xbGeGmbB<PZf2NsJxZ1yw3#n7z74F8~>vD~)wb`KpyEa!@Emk=7
zBYYiOjoJ}ik8t(wpO8&^<$CB}y2?IkiPsghA7~9KtJ`^vc)=SpBI#r4+7-Fif6@Ns
y$PMf7coU*#L`-?cJhj(r<ixIN$8%kOYWvSKGh_SDm}osmeda-`9nk$;r}zdv>h<ve

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition9.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition9.txt
index 2d12250050255699afe47f86291d1a76a2a67909..8dc07583a0d729de0bc1a1f8dadb1dcc62d88d32 100644
GIT binary patch
literal 785
zcmbW#%}c{D6aesh|BA;hQ`p9$1Gj(&!5)M$r7i3bbBNvB7SyyPnXCTwz9pLlzb5vQ
z5_rG7uPHWY!B>xH^cyZfn|kAUa{29-h#dWkvYfkcN-@tlNKtUr{&qSKQp~12ks_^@
zTqea1cOPaV!UaSMl!qekqqTj4uW_l3_PR2Yfp7c?;|#=5LLV3(gSe2V9J>3*yYe8-
z*V?12Rf)&6U<7RfVjMJRodO$wObBs7U_%g-K&Y1Zdnz$JN>n5p{wEt2Bcn1R<vb`f
zf;OcYZl~HDZ4HazM4j!L&PGAHH!Vcd{JlGez)uDViMYGU@-%}q%Wg9cWwk&EYmhcI
zmYx=m_JF4SwI15YpBJPTHy1ojjsun5gJ*P3t&qcwDJyFU2lr~cYGA7zAYE>ZM@uhm
T*ZK*eR@P~=g6^(q1DU)7#T4>r

literal 1606
zcmcJPO;5r=5QgV$;(yq1K@&07j|e0lOypof&|nh}z@dU5QIXIh=#N*Q*)4P-V4{R<
z+Rn~S`#zoBneVTvJj#@7Bt{Z>lV|LK^yQOh2VbArP{yp4Wmk6O;txaP8*;~&5_y*h
zjWQ$l<}KFmi72C_c8C>OYuTHVoIKc-npBC>Z|fTsn7hnd))UVEAWmZzc^y#}WftfR
z+6g2f-U5^(Mj<7?V&1jc=o8aNXCNgx#GZ2PNq}C!yA3&l#qgf7zM}P=<J%{~NS?c&
zfqY7?|31sUAtz60BxuHDKaw`qrgRxeMpv?QMUPGiT`m`iLJ0IvH>JoFGm3zmY352E
zN3@1x8=3L-eJZz~x|;3Yw(}FDr^u=LG^aL4ft+|Wt}0gVSdAT<P%B!&o1dOQe0|4t
zJU{b+oOx7D>ZXb6YA#o?o1CL%-QQ_u6t4Df<x=X@cZIvL_qyC*Yi+ivz>dvTR*Mx*
z{SaT<R-<-A*CSlL`zK`GUb!CnpRRI%TH<vD?FU+e%IbDrBVO^wj7WM|x^_+O^<T7q
zIda4L2i}CJDG?K%F;DIF8acLW+VNc1pV<EM!pzwIGa_2gQIB~()y~uXT&MT}QO@=G

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef.txt
index 8699187caf03541f78752b5246511e9ae5649bef..69ea48c7ab43972df9464e83e7a27af29db65e5a 100644
GIT binary patch
literal 522
zcma)(!AiqG6h-&>in|cfLR*Xx3j;1(WKjrF(%>e}VoYAz!FEz6(<b`$zSKrhv^dLw
zcP{sym^!j>^$QvOMkTb_?Va#$e|=t_iAQC%dfpH$Rb<H&gjTyXObw&9Bycer%RGsN
zC-bPTg!Hl=-h46{(tjYM&Ote3%PCnqJ)F2HRWsMQQ6K{3ml9J1BAg=+Z{%3O|4+Ox
zhm3^USQ|PUbAofwRUaA7k2z1~i^4U|5QeKC06zEfhr4tcrHIn>J{2hHlCUrbwbA9!
zBjL?@IG4QU@bFt<w(-Y2lMiKZJmPWk3AWTUYQ+K;rl_r@!l8LJPIYKi0~S^9jbmda
T+O=kXJ7pVfR`6MvKa<`&cYmU}

literal 1072
zcmb`GO-lk%6o%h*(0`akFbWyjM1|0zg^NHeOxmc6DL)!A6~`Lu$5+ppJELhKC2_g;
zp09h)d%iy2YwBsvp32iqV?9ET6zPq-i!6eh=owu_yV}wDAC}p-)a2!@LOevAcN+4u
z2iH@dZTCp`sVu=_rU$emkk}dO2~7ohPX!g#;lH|S85ZNJSoYyNDZ1t&f;h8T#hW9_
z<Mcph@z3xOre{+(Dj}P)N_ttt-9XdV0hacrpfX;{ylv?a1RgKER2Jwol?FONUc}0i
z|8H6FvuG{1%Sh^AOUR8?%rd-fJgeAUOh=121D$<|s7;pI`1=`=tIc*u);(^<k^6V`
zz1D>q)UnFxrDsD|&{l<eGS*G=a|v#%?~sgjztyIW#(FPDZ<P*o4Bz4oHdNcqjCI!U
zJ87SPm(ypo>&j*4n}y+tS)m3{rn49<BJ0*3l=X3}SEMtn=5Psj%<ZOZ%p{x6&7IA6
a!n{S<Oir+!Vr?BXK<8&u=hN|SzCHo-N~RV7

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef2.txt
index fd2425650ad9b301ad9fd254e075aea14701da3c..6468f7f10ff288eee24c799181bebb26023b6c54 100644
GIT binary patch
literal 544
zcmb7>K~KU!6ol{n6>~5tBtR@6>LwmMa3CRQO2cK{!`ePzBW%fbq19jSD^N|0lDNlB
zX1+HwQ>w_p=Wk@q2W2pJxA!7=`1J)c5ew~%e%%lpEy<Bh38nFC79RA*WUzWm0#~iu
zgLZ8tXHyX<InI|t1xZaQzRcOJ{y;*NhxSP3U2?9=x+5T_WxwYu--<*8d9BbzB!(l%
z;f-nwg#S7uR1IxL<<wZZ3_N2P*{|Wl(UJIKzil|tC5uM(!-4gIe144Q;~3*Oeu@Rs
zJR?j_<u#FJ++pn=iNQVO;O?Bg&zD4soBpe+&S^+^ZuGc82U{u%z2ZeCHqD)*)T4N}
gURNk}0iG}4ThBXYDA$Hp-Dy`CyF$ndhCLO00;wIUvj6}9

literal 1116
zcmcJOOHaa35QWd$#Q)HRNg)v<SYISAT(B@9Xpp!87Rbv+1kzTE{&@A9K4>Jy1QK)8
zd*{x~?VK}@ug|8&TJZ&P6ltMn<hgu(aE{RV+?IO9R@c7vbhX7Y|E@Z`e9(XhKKr9)
z{Mq3))`ZW_xrT`@#v{^G7WED985%<|M}EPlj(nh!&Slm>W%Y^BQZqwmw+1XG-1`aM
z&YDx0`TS&%W6YU5;I)iIL>eS}NB63r3s{vbZo#CDWulsn@U>SZRf$vObyvq=aCqY+
zI!|Yb*3&8aGG30{f6R=VWxy&>uxo)gCSO)ptHbUbfAUFr*4ErTYE-c7k-Hudf5((o
zY*#FsG5<!ABS`Chr)#yTZ-d=Q_O@=3tu{llHcE1I1M;F9H+#92^=6LW>VKk3{?O&T
z*yw>;qW9<s>kX@db=)=`cF2ojQcX_#wU`a_uxSZd15J_4W-N@8_3;?VIy}@n+6b=|
ox0o~JOeb=|)SE4xQJcb;+4QsdUE&+yZ49Q^+-xpgCLx`?Z$cif5C8xG

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef3.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef3.txt
index 53d8180f34f3d7ccf639cbe1c8838ecb50c49b3e..cabbdfb72948e258aa0fa53a5151bb965af38388 100644
GIT binary patch
literal 691
zcma))OHYG96ovQvin}nOO-duBK01jD7c81I)lhVUvl!u0CzhcZrUm`=US2l7YS}T&
z{m$Xsv%m^9nEVx$e8&W&+U^XqZhn2NC}a=Hpw6TchHmeLmg0GXpfN>_Dn<rp13Kl=
za=|Q4_nYs-{@u@0#;vfHD?U{STOUA(l>uQOTsf$<)58Nyy|Jmxz-2B(=NuexnKy&T
zyXHd%_Gyl6-peepTu6n-l{!9YO=?wd)<`|61Li-s{ak~%f@pftAlf_*m=oMgSUXN6
zuQoHi{9%T2J@!BS*f#>Xu%i3hVC4tk2f<yyAkGtnx!Q}3Odh-KE=AU)MX66I3h&DX
zs4;&nY}ED&4DGe+#RxJi3bCf1%vGFgjj@5^O&L)^DGHzp<-59JRIc(xQnR)~7gDXk
KZhB>px%C0>W7w+z

literal 1420
zcmb_cO-}+r41H%4|HB+i77{h$5<f^hc;H|{&>(sN4hSp~LCCTS`s3Bt&MrHwNCFbV
zPCL_S-|Mvf{;HsdIsYLHB8>4u`4t0va_w?&Ky89Io|UkVJzQ<@6Z;10y!k*ckwzJ*
z$F^$X{~c|{9`O5wAuSBG9s;!$Bppg6?j9f)+qUSlib{+}G>MRU$m6#~nal!OwUk4B
z!E+jWS!R{sPO@PbL9!GPhaeaI9!H8X<eKGB<4FJ?$F!AOITRSDz<Ujx5QE_zqkBFs
zb=SuQ_w%$e@OGLlFXk*+O8HcYaK;?U>q^eIXSK}0GCN(cEh^uHSCensWW?2&{+r`$
z)D+9P=D3J6C&zBRtj4pO90@8nzD4Cb8FF8KeTHlmZ~I!=nCp=wIkCNPhilYW^JRXG
zervd;EcM!9U3ImJZuqv+3q#gb7mt+O&aP4)In^dT;iIT;<5T*(FYFZBwCfJ(Ih|-C
z+a6w?CSoP1ru?<hrzGdXM0kZdjXJz*c>clNh*ooIGp<vvc1DdkA(IJb=jII0%z~Y0
V6WWHfmTv3wj^|7>k5j@<r5_ZS-0}bb

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef4.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef4.txt
index 99e4ac122c6ee479c9b931043ad162e150ee1dbf..8f4b116e1e7b2de5851e6c75f8cce5e321e9e3da 100644
GIT binary patch
literal 486
zcmb7>O-sZu5QguC{)agTt*~9J7L<So4;2J)C0o6e9%4IPgWF_DW_PQ<-icO3QNbMZ
z@jg%9xyBJ4kbOd<U$6shHd_*LbpGRtqq-7zhR_Y#DB}A&<+OTOBRK5Qp=l9PMNlp-
z4+R{geB9Kf?L`wuRe<=<><|{Vpu&-WA63f?oy$HVCHBRfMoM#$Lw(dh2DvECpe{}u
z4p08+k+8x9WTC%#6XiQGL~zLMg<O^rN+}moKx;dME3;E;-Q7=Z+^7KqfqhTd_xOuD
zcl_H|XYZ2$;zp+WW-y@lYK4L!t#uAt0{?7Cjj&f9xN^G<6X9X(A2m;6qny`f1<70e
I$(*HM0rcLN)Bpeg

literal 974
zcmcIjO-sW-5PfIC|F8!k5mc-O6v2as2!dFN(M#zeCQS{twj|N2KVE$^lh{^7DI!a<
zyYsR0=FQCe+c^e!=2ya@#sv2~KcK)X_l&ZFw<#W}JHk5FaJ<42`yOI?Uh|b&qm1>%
zL~ru`6B5QQ_`k)77LK<8a<vsCsmgrnYwALDaf(g8=&%95@$NH9NbEV~eMK36W>S5N
zyG7RK>xfc#kQf#z#uc^|Malgu%7~gA0e0viUOqaE)1h|{yTst=<5U*lP^AG5C^zKZ
zKl9-=EC~1W42_|`<hPv5Z#lLojO$CBAR?zB|5C?@tIJO+nG$8Dbv|Roh3gSJBEt<&
zi@kBd`&jL)M#6c3{f6JYA9%MumMX7O)h)g}p9wizk1TheSP80%E5VQ_(Mu+hSE>D+
x($`V{qH~b2XB=j<uDDy5PdH=kjM(JOa7PwwCZ@_nrL!}nkGIhM9=p)G{sVd4nb80M

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-input.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-input.txt
index c5d6a3fb3c69d2b0204eb565a27d9921840e1bf1..ba5b26d3386e1a997329b7946b5b27b2cd182867 100644
GIT binary patch
literal 10759
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

literal 22614
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

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-input2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-input2.txt
index c36560e562bd24a54c975b20be837702f385abec..97c741cb5982e911247bab43294693afc3909cb3 100644
GIT binary patch
literal 15374
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
RlI!_;BTDxt``?{U{tp)jbg=*c

literal 31594
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

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-blockComment.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-blockComment.txt
index 107771e549f2fac761743ceb8b08a312b219746c..c6a0a85485b841f8729099a70517f2afb4ed27a4 100644
GIT binary patch
literal 1540
zcmbW1O>e?542JLd6}|zLSV>#hh_uTPH^gPVl^#l$X^7FH5wvQ*e$IzipcT+n{jiew
z>1)T%LRRt%RJoPK=10E4rq~~qV9%`=OJ>6NJU_KxGJp)vSg|ml<wCGDiA7mR$jjYM
z7D@ns_4Pd;7im9QR+I{|dZC`CN&Qn;f0p@{=G!Nk`;D2Mm+vBFu@3C;7Y|F!0L-i&
z$P~n{!+mx*3=Q9nKd4Iex!{nDQWydkV@RTOAfTtC@1@-^#@S%_2$Csrx`V8{B_WiP
zB#gJKCT{%=E5JB|5y?7(#j?U(xtb*BZAlT5LPI*kEamrNgJp1oWWA9T=+p-`yj4-h
zc2f>HTE+yD(5CyM25aIyg@8~?GSmR=h&GYRxCY)6Y9Jg0fuRm{Y_s1fRB|+o01Ink
zMYZ%%H+7+KG$cn_-D6YTJ!vCfgVD$*%37nBy9tbpK%^mgtOZX0Cy;y*GZ7p)oKqJ#
zg{vZW2gPZJ;mLBfl51FljDa%G^I%@d{HP?XGnIcppAXoJu@v^3VET~3N58O*(84#~
Y?4pXX_}nSVS~eXijXc+5Cr2e?zl__&mjD0&

literal 3170
zcmchZ%TB{E5JhK=#6M)mLn<YqDJl{hP<Mz8-2n?4Kp>u?MIb&NxYv`!o-|E?wkUF&
zI3CaO+{xHqpGR^f?`SU)$ylD`4)>38D<Am3MBgo*p5+zq_GDF7Wd9cz$Dhg}EZee)
zt1ai|x!M!ejPZQ~%;TSq<tQiOoP75L(kqO}aQA?V>mYUHuFx}S+WA}s!{mIAm}iVp
z7ig1n7WSOi+7|1LWGMHTBSTE9GfZ1Yy)ENt3A}wD9<H&<bEnP#PpaT3kB-$#74f4Y
zs1rtutL2&paw0A0ejy`Vtzac~{1!&PqpeE}e=#giWg9FJY$Df}y1owjHk=k~WiG7c
z%v7(SUM!FI?RjGGk+L^I#7tN|Q|LdWQr1|iky54qgDWKPWJ#`S;&indHn9!x{V_A<
z%P8wTr0O^o6WIxLY~ncv&l_q6>lv%WJb9i#CFYQNSE{7U|3uP&=?s<i3_j}>oIgrc
zzadT6QFe@S%~i6V(th)QkDaoHRGu~w?N1G@R%%<V>lqiNFBvV1GVYZ6rg-nG*|PPm
z`t>yYBAJD|_(DC;&vvcl#*oaGPN_R(40p|U+Z@A1Wnb01XDV2GMp@?G>^*$BktDOF
zQ|h#gWY6pv{}aiocV+52COreh$jPt@PR6nz%_`@Q>ASF=bpBp_>iA}p7y9z##4{{&
zqVG=3nL8D8FB!VsB$FH5^CYx^u?IolINuBP1kG4*mHJ=Y>E5M%dau9q+g!70qfIUN
XM5~`w0*<8h>`bp8$=*5*+0XV3z<kU-

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-command-and-comment.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-command-and-comment.txt
index 96eb3904e8871700da8d7494238d625c86ce4331..eca5948001d2829d51eebed5a18b940d8e5730aa 100644
GIT binary patch
literal 8427
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

literal 17180
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
D8?0Q;

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-lineComment.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-lineComment.txt
index 3c48e618718ebff77cce4def9dff7f2f0699bec0..442a4b3c0453978070c8f4868286a23d5319a7ad 100644
GIT binary patch
literal 1374
zcmb7@yKcfT6ozN~6ldcixgs}8Ep;hkLo7sMNHdt!6;UBUjZvdMeUI$~M+QY{Cd>Bu
z{Qa@dM%3aPWcekE{8xNHUR<t{k=KVGNmh(f*yM$PtURAZA=6~LVI)mr##6m|0Dh`U
z;O>U~j)B?nU}a=h9Hu_3nFBo6Szec)EG4m0uWrU9(G##TdcY;bJ9^<&MNg>ROh3t5
zPCVv8GEad5juw!3Q95NXb^?ym7P%EaI(a|RfDq~{ytmNI_rhXgQOiE9woW5_L_BK*
zw}b)Nd}b;QWDZHthI8-7Vh7|ytYINHQ2B!UeEVZAMRnns=u6pFYY@5yCM8&%0VxBO
z5-W`jjzdGSZ^hyUq(djeKwhZQh0D9!8<wuE)*!`vF(7Gu2E+?hJS;Uj=o1+qN;C7i
zEp0$LbTSCUMJip?NOj)k0I9ZAQ+yO$&UH5X&pWO9FTsd4I7Ba$;L^MM{n+z;uc|F`
z2&h43vl*;wkzJ*L1DDwmCf=01>5;^iWW;HF!YOr|g><r!(d`~oX>%pr4TSswU~#1C

literal 2836
zcmchZO;5r=5QgW9iT`15hzW)Qt!Uy!!;N^6gadFW6(bQpVrwM+c=er~rQK}`Rld?R
zEZd!(XWw@_-JkCsO=*GqofIYXN>6CN(2TzDdyl>u{=Lx$o?X&09nsZ4E*?Lm8${M|
zDeCFjrf5aT^o)yhB{asUTRfEv{I8F8sQZ`E6GVkHrx=mkDxYIOcbG*vv-~xx;zX6v
zE*bN)E3@vh_%7D;0M@ZqxSzTZ8%12rMb&JSg2J|%tWJV;_p$yuybGaOjMm(!?~Xph
z*ahwr@{r9#+>ja|VRmKu0^RG8kN%q0v}#ti%F(J>3p=^oQwknW>C@T;+i==U!rDyv
zJvz5YN7&mV?6YE~KA3p@o2r)2nz1yEY8{IuTtVS_vJH!!)n;jEnid5X4ZoFT?^UsC
zyK$1WYht(Yo)a=5ZlzAP$X0K?lLLCh4o~1`tap8c)}~742{JCxw?!A0j%u&2GK-xx
zWARLX+o6$K>(-oox+q!+p^yk+J9W`V9my)k;atoUWL!e)LqD4<*{hFCW9Q9iJX3cA
zM<@32a4w2gQvZcR`25tx0Pm=+*1D>?n|hYdoe?#Sk{xPWOhr4NWB5yUI3=0d<rD58
zRkGt$;q~u>oDDXuWBHuxNtRWDPZ+2AQq<L_!$_Y1xt>n+=^{d{Rr<_O!`N%9kLxdg
nPvtBp+OIk#aGp^6Q}z|&k;P8(lZu|hb(s5$oL@Z)NAUd%K<TWN

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-lineComment2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-lineComment2.txt
index 08b2fb91cd06b482a749f10ee9993a9a3bd13458..a03606cf2e68387d53a70e78d3c18f931c5febd2 100644
GIT binary patch
literal 399
zcma)&F$=;#42Adm71>$~5!=$`z{TQLTy#5cs5N3yuf;|z{(A3@s)M4243EJ3crOL@
zbOvq?Wa=Ajp*HP>rI>ykp>m0+)uNC>4|?A0q!ud&=$<~I`~mXjbRxr0GOU)^mR*O(
z+R$)L#@url%NW!|141lQP>CK%2oMAPfGp@*Skn)Pw^~TzaH)r^%?t8RlELaB7MHyx
rv0cBWNL+!;RT-44Vl#*+ieTPTbzy={$<-dhcqC?CG4=N0h;GFl?V5F?

literal 834
zcmb`FO-}+b5Qg8giT|NDg=CGahJ%S04L8C?ZVLy+B@$GKEP?pr)n}%{R)Z#fWU||K
zI_>*(W?o;qDz)Z&Qc$ItrpzBT(KF*Mz6q<jmh7ErUwb<LfmwW^OHO9kka<tt_j_!W
z?sU)|vo~~={+491Q#amRM+NSh=>aqP3hrzF_jQHxoYex$bnoveKSk#{B6`hts1|xH
z&KEj{C2%IV@5FsMz6KFN2kd10BX6OUr3b}|ms;*hV*kQY>qeG*%XgZv45;4#wcR}b
zm79;+HBV%0Cp=&0Cf51)IWdM>?>mM~F05CYZb2RI^^y0pRp!QPGtwP%t9^smi^Nw^
QKkJLw`}QikZ8O^Z4QF3@HUIzs

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-noBlockComments.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-noBlockComments.txt
index 24d436f6a1889a8166b69689e2c98ac05105d796..2bbe59a643dc8fdcfe0588574869cd501e39e9a7 100644
GIT binary patch
literal 685
zcmbW#O;3X`7{KxS^C_O&wkEX}%r={N*|HniMQ*hR#4aOqWsxotKfUe4koc0Iav;2<
zKmK`2W?TD$zCKu2z1b(M-0AEU-2Hff&XquhOc=e*6d1i$oTFf$Zily<dZ!HJ5pO=s
zfW!xw+ty>@F~8@hqG`CRSI>2MSl7p+b-uast)EIIQC}P6DAfY>+{_eCx`K)6p{;$*
zDrd(n5`vXPbwSpH8=T9R$DGS*a^|RILJ*B%uzuN;s7?r28lz<T->QB&NfBN4Sxo#n
zE2XSuocj%B-G0joTRS$We(4t_)Bs})H?1wt-r{57%RNrz3|4gI!+)Wm+hm}z#xoND
F@DBPM$oT*O

literal 1428
zcmchXO-}+b5Qg8giT|NDWD~?)6pe`&2sgsTy#WVYF%mx@vPR>NSKpa#w_PMevxYS7
zcKR`W`tEeTK8Kj&o%IC<IhJ@}{}~H>@O#U#1+5icId_Re9N_8?Mb?jza%Y>KBCTyq
zIX1$u@F!NE{T7Six@hNo#1%jH56FE-A5$ev%Ui6AGpfvv%H7qFP&CMS{!H5x*Q8m|
zTC=pMz!E(?vdySZpWi1I(JANrF<aSvgqY{W^fJZ?S&ZID#?E!D%dsXcgGNP<M!_vg
zd8QHlzfmR8f6hJi$vlN6OG?^{fNa7@nDET)RMorJrK%Ems;=r4qZ4rX_}EVNzj_H-
zNMYGJrD8G80=9i>w#nehEN`N*=i<z&Ca-26stH?2VcAYg)e<DXR?WWYx)HW{_HH7l
xkz|NSi@`v%W2PBU-r<eD#0>ZB%ZqPvZ7&$hi(F!}WtjKGtB+!D$=?yn)o<6$&Sn4r

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-noLineComments.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-noLineComments.txt
index c9b21fefcea175948a348a2a78496f1e88074a0d..ce562f3d7cc4a9b2c1353606070acd8fc3ab9b50 100644
GIT binary patch
literal 618
zcma))!A`?442JK13g5Ox3Z+|t5s3@aZq+XImgZ235fv<*s3$6(9=BbXM5m3MqB!}!
z-&Rs;=@YqrCtrQj3s!!&X9Eu>7uc1F6oS_1YsLaUDo<F}+bwwp6*;>}4LF+_jp53n
z8cOT>)i}sHU-PR0+aKU+AYs9nJ?UN1G}_mxI1Yv8id&w>CPsVh#IP_6wDYB#8JtM2
z+@B1VdlgMwaBS$SBVKR>vPhCnH^1*Cxj%w3YGnjxlZK}QWr;Sq?J=Y29I5|{C*Xl5
y<eM&EayQB+lfDoyy!-=^FrbvebxY-*37-ot-*6hw;IZGaG;ZMBKY&q#0Pq7zBf78v

literal 1298
zcmb_cO;5r=5PfG8|HIypCa73Q)WnO1TjRyvfCH8qi60PKBk{+pZ)SJvwi1QZY&Pr+
zGqdl#+0N%jf*fn^7Z{XS;(_O9Ebz|XIeiOSE4=c*bL?Xe7dtG8ALELdM~GNU>>ih4
z%_S=u%(x%*j-02A-X|_WP-=9<%qeSJBXReOmGUfAnw9GLKl4Vcf5+UZ)=n$7g{xiX
zX3>8~88Qj+33}m>;)Y08v<j}Ca!VYidPadmW~{jn(C3|fW{+`9JeEsLU#z}Zy<OS{
z9jD%eJ({rk_6qt8QL*D#i+aAxhPvi>qqfpz=|CGsP4t%2pyC<hgcv+0k8LxqlxRe!
zc8HpHhloy9=K;<FOn<+r&1nBqMT<E^XHgF;9fy23+v;dvd^;7JH~)^uD<oe}q|0EW
s6DHFsBCqUL-&uxxp5;sEGWIg?m9G1C;<T9^cH&sX;moN|3W@Uj3!omr-~a#s

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition.txt
index 0738badbae3d0be7a817705cce5d24299549d10c..2fed31710ab00c0c232e9765804469c29133ee18 100644
GIT binary patch
literal 631
zcmbW#!A`?43<ltPp2FH?a42d(h|SV&aO2iWJD3~-c+A?AR*PX3PfwOYD<;Gcy|jty
z&yN1wbH_W-X2U_=`57d%uZm{z<722|ee*lSnBR_;6@sH0{rEXaKZt+aGVDdyU;^)9
zD}g7D?wS=kQy-eep@*To0X+>~p{|P7$5<rjmRAx)r3n|>>6t|fR5~cY;tc4<og+*?
zhnc!BX}K2V*!m|vrDY>)bD&w)V03Ek^pue6vS3S~c_#cw{C$+ZyqD4;ZTX*RY+sp_
tOFV#A*I7A=<RJ{1jFYBpen0CV9_z_4DLj?%0z>vb-6^19`TZ(5^8w+l#)1F<

literal 1296
zcmcJP!A`<J5QhJ=iSMxCf*v$h69p1)dh=!z55S=!NF%96st_Mu{bm>JVijWuY1&R_
zr~7|1yR#qfR~l;0{Vb<ak9xo^l<ST69lo5eC%rJ%(XMuM{*TMzySiqkQm@L;=x|M=
z?>^%<M08LxJH^Vp_1)W8%#bsFs|j;B&7dna#xkV>-wb==nTKllc`nIm#H@WElYV75
z#aGWK5LZ!dh2EiEqLAV}peh-;OtC_47wC_?wo&CM6*|P4bMGlZFX7*=j$m>8<-D)u
zeP{UgiEwK2j4RY!kXvn*tK+EI*ylbZ);I>f9-GlsBo$rT)3qWxBMh}%B}yT%OgF7j
zrC3oU)XXZ^jySSkIJQxlSU;u;>uICa>TSC|$zm4;)j)IX_g1LUiB2P$^<C4WBYW)9
xdguJS#-W!sS>ZbAUl}Y(tTV$&V!c)9o*fbTE<O=5ympG&ZmEy1KQH<yd;%PQ$_4-c

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition2.txt
index 4e8dd8255a55a97f55b2dcc4d59c9aab283f8435..4fe26858ade49b4fad641a6d9d24b7ea91c16677 100644
GIT binary patch
literal 901
zcmbW0OHaZ;5P<LdE9PLrBf+pGB5dNt$c=EJ35RuKwlK&>T}V4<<F9v_rPi1xMSJPC
z>3s9eqjM}V2im`&cb~Wc=MP6x;;!)$dWrOIbEOKt8@*a8FgjJXKI)?<%-@{1gqx=<
zw`(+dF<0XB-Bma1nd))2-zp>0Q|{tBrO^BWVkWQz>2h$eMKK78A8_luBe(a-HI>wr
zN`f957=Tn0(6^?ipmUb%m<qMpIl|%)L|SnSVcZn-gmF-VQY@(z!GVmBL(o%Z*qZSN
znHV2Yp-wscmye90j2Q)^Bq}wGsg_*e$K3h$cAa^Fot!2yiiVHACSB07DwHYXK)K;M
zc~xrAWlD*PfWR8D(U@63jl$No%&?051qm)9Y$ZAW3}F|Y&0a%?!oLH$p_xYX`+b;|
ZxIPj>W@){HuI!0>K2g{tCAdT(#20Qn7)JmA

literal 1854
zcmcJQK~KU!5QX2_#Q(4d6Tn1cX@WrF#mJ3tv55yHrhsUpR%20#KVE$^+p=3kf&tPL
zc4wzM-@M(O{r>9W7BjxDFqq;Q4{WDM@X7x%Z3%lXc;i?b``E+TKOXV#<B~H?@s5}=
z+I%vvKj8QkJ=%;U?TD>dTZ`5{8B)$8q)$o}Yj2Dj3~7ro;+V|QLzlBi>|(|PROwS=
z|Mz%@IZx<6&@ZC70$DysIbWNR^D?FE3@N6}B%<|*s>RGTW6S1#LB5HSC-h1fDMcN}
zY|r>s5inxFulqP5jp27jZB4bE(pIB~L507*hLxOM)GOA{P}O_J5WO-b5p_1_b1aUp
zrF>0~PZ+J9Wu}M>lI!LiE~euMsGF$Q@<`%8NOq%+PvCReRh3b<hP&4&$aj;C>v+Ok
zr+P`L_0HGwb?tFoKX~e-R%~OJl?g3*eSSJZ=H+y}=Gnhy+~s83*>Q`p9Z^GfT!@B8
z<f_ebrfsSvWIlr>3q7s;bGce8TM0Kin~RZG^A!3>RkgQ-)WsBcRMpnZgf(=C$9z}W
y8%oajdb@SNc@On5=;$ps(wj{7=um6*h*i>P?XA)G+_OpLlv-tP61S$pTD(7vcpUox

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition3.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition3.txt
index a59b0d0c501b410858e39deef90fd5d88454d0bd..fea3cd099586fdf162636cc7ce1aac42652444a8 100644
GIT binary patch
literal 664
zcmbW#u};G<5C-7gPjT{67=q$3&{|@nTht|yIvgIH#s!PYiE0B8PtVnEYY8Dm;Kf#?
z`~2t5wVBKj!tiFC{W3jRH@*kS9)Dd78xubCQA!_oh1*7g!dB{h<Q?Zb&U>zKQ%k0B
zJ?y1o?db}Cl^MnlkU-D@+NKz__XYV+W^bJhc5wH1VG1`w3cyl90YWYTAJnac#W}-5
zU8wD=4aSdpXJ)yGL~aGRj2vXBHB*=+Vqqji3Al=e&c+|Yr20hBe~R*7c|<CWOht)A
zigcYuj<zwMwRQ7NIx8err~X$d*R#tKO?IYFm&zXq5sW4uta|~Px7FQ&^3XE`?CA0I
GihToVRLWog

literal 1362
zcmcJP!A`<J5QhIViSN*GK@S>>2Z6+!-Ut_)cmNI+L>mnnTb20m>NmTEZ4pfjlBUb-
zbe8${-<|pV=<7xc-e*NB^r(C6xiY=;JH?kVd(sQvdfHP%XMcDseyB_SsnDxZa`bre
z%6!cCD<XPiGCRRaowe?5>RL^ni5sVk7C%s*6_&?l7x2%RkDVu3?Itf{>g=8_L`5~y
z2#x}(1n(gVq;Th0ejn%TVdk{Sh|0(`*NKj>7rgt5$r!VGsAFg%)<w?OalTW02Sh|_
zF;?|xmF%X(@+=}0x+6zH&fJkqu(sz5EP=1<_&OCnWAu8~nGzUmuiJBkoPi@oH&d@$
zAxVEA*^N3?f-09kRr?ywaQ7O;<!$nL15dluDXuB?y;e4#;ea!Iqk^o)|Kmp0X*^|n
zRS9kO5HuUn4MybMOy(<jySufX`FEZrhjj(tv8=A=y5%1Fn$PF~*Lo<G^4-$zsP!f5
JN>g^%&=-pm&Ex<8

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition4.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-pass-varDefinition4.txt
index c6d63cdf369236a2028d502f6f664b1c0cbcca56..a636e0df85b8bcde5998c7321bc1ac54d74718bb 100644
GIT binary patch
literal 2275
zcmbuBO>dh(5QgvjD@I(BAh|Itj>$^BG|kP*#g=j)9I&%)P#ti?x_0~P`|ge@s9$`P
z3&`+3JM+%$tQY#E-^i4ob&-G9&y*MYgHhuBA1{$CwfUO8DOI_9nmjHQrO8TV&7<d~
z$-_d4^j{x$eo%uwTs7}bUHkN09@aZO`En?Yrfs>~l}CiV{zip9(k?HwBLBKp^a|G#
zSmD0hs#L7357p1~MdE%S#!zNxwVdp;s+z!rk9wOIxyj2SdS_1NGEe~})08F@sF;#@
zdZp;%Y}7?sqaI&!qpN+k(VaL4akyJbVuzy!w9+TjiEu)P2&R<WI!4wo1_Z-;Mj_8&
zIx3!krHqllgbw3*O-v8^xIh&<QwvxQRA`M4q$52Q4XIbvYO&+M@sJZ6U$@W}9~1|K
z|6wq~sZg<!vqR}ZHmX&-em)^RR)Zw1PvJ<PYO&)WL;1fxN$V3R4v1{!7@wr|2};fm
znabaM>fPhWkO2&XSCYLNw&{RjDPv~9@F=j8tZB}E<pYcXfJL@^lIK9X&F{+BS6y_?
zf?DlB5lC|;^_{3gBahU15iB^fk<WShv?K4eL2I$&pk?A4x1Yvu(3x#KP#h5L6LWcn
zRe5F`4@%AseG{{ttqt0{@sJ?{7zVFm_G)NIw(%eZ=0=4W_tAN{dQU~G^KjC24A)xy
z3kWSBP%@Jjp9tq)p5Yv(4F4S{Ne931{wncADtzCk`;*=raK^7Qvw5M*;7WXOPX-5{
K5`Ftt2=N1*GQS-F

literal 4652
zcmc(jO>f#j5QgU*ssF*^k|t8x+J+V*_0lxAD3>DjkZ=G3tyKzbAtmjPZ~M*;%gkB^
zDYXr<4D0pBJUjEwc-MdbT+@UevHzfmR<ximXwNC9-}t{rUyh@1^ni0cdPXPo_6Zwb
ze@h?mq!s<7A#C)pEzR)&=Re|#9xQRYkJiw&ioGprx&9lv#x?w8zW)E7UB@%Z_{teC
z!TXZVF~WQJ_kl(<g9k3?JK76)W`Z+Qv}V{Aw8k;}eMG<TJIB!)|1%ediSyGrp2lNu
zZWQcY@%9ynrm#A29`EBw^s(H;AXJ0ITd#_O_(X{83S;S`_X3(4LJ3Q>L>ccf(y1F|
zj;nH5np2xzp#6ybImNIT<L+B}1)2!=MXs;w`re@L%z5V&zgA(V8+O)~r;nhy&#=M1
zUpkU8TGjcKMfozv*EM_*l{59hz+<h>p*EExhTqtGnIReOAZf-smcVjJRQasNuz4TF
z8#Ret%ab}k#grHx&g}B2-5_df)FiHxb!aFiYhSpMt@dN&gnH=?74;5w%gJnQtfr}=
zeWen`C-9|G9Vh>o(b6cRWJ40fvsryHi?ymOJ_iy+Sv|HZ59`#H#87I0SQn~vtF44O
zhUrk+D%w{niDnwa?Ks+EMoXiN66G|AX0zI27Hd^mytdMyM(om7{WV@9DGCz?%O+Jm
z4K&ugr+k$cyOyWps(c!}54p-8rqYYAEQ7GMx7pYZYU=)Myu{4rD>k0FSDil;36zV8
zcm~l8$m*WimcPsDtb{zma4a&$&er$cAfNa9zP`6?(Y{hi?a6`}(s3#wGg=yDl$w+U
z+GsYvnZ;UF7GDXo;N5Y!N+^-^^KG6-S~kg|EYMi<p7NDY><Z6ocrbA}ot4x<ulrpy
zUs)Sgn^_hK_H+5#!0SxOJ6<Wy=@Z5vtH>OyN?BhsmweISnl(7U9lT<GDpzasCF2C&
u2Y8F<%6*L)yDu)ho*21R^BC*Z$gP6UVB?+X<25X=8s(cv-PM>q?e~ARCC3c_

diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/TestScripts/TS-input.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/TestScripts/TS-input.txt
index 3f2bacc7..1254f3b0 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/TestScripts/TS-input.txt
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/TestScripts/TS-input.txt
@@ -1,4 +1,4 @@
-GO 2
+GO 2
 BEGIN
 :r input-2.txt
 :r "input-2.txt"
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs
index a9f1e4f7..607b5f3f 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs
@@ -135,7 +135,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
                 }
                 TestServiceProvider.hasInitServices = true;
 
-                const string hostName = "SQ Tools Test Service Host";
+                const string hostName = "SQL Tools Test Service Host";
                 const string hostProfileId = "SQLToolsTestService";
                 Version hostVersion = new Version(1, 0);