Fix some tests for Unix platforms support

Author: IVNSTN

…sts/UnitTests/CommandLintOptionsTests.cs …sts/UnitTests/CommandLineOptionsTests.csTeamTools.Linter.CommandLineTests/UnitTests/CommandLintOptionsTests.cs renamed to TeamTools.Linter.CommandLineTests/UnitTests/CommandLineOptionsTests.cs TeamTools.Linter.CommandLineTests/UnitTests/CommandLintOptionsTests.cs renamed to TeamTools.Linter.CommandLineTests/UnitTests/CommandLineOptionsTests.cs

@@ -1,23 +1,29 @@
 using CommandLine;
 using NUnit.Framework;
 using System.Collections.Generic;
+using System.IO;
 using TeamTools.TSQL.Linter.CommandLine.Config;
 
 namespace TeamTools.TSQL.Linter.CommandLineTests
 {
     [Category("Linter.ConsoleExe")]
-    public class CommandLintOptionsTests
+    public class CommandLineOptionsTests
     {
         private Dictionary<string, List<string>> argVariants;
+#if Windows
+        private const string BasePath = @"c:\";
+#else
+        private const string BasePath = @"/home/";
+#endif
 
         [SetUp]
         public void Setup()
         {
             argVariants = new Dictionary<string, List<string>>
             {
-                { "scan dir", new List<string> { "--config", "c:\\conf.json", "--dir", "c:\\src" } },
-                { "scan file", new List<string> { "--config", "c:\\conf.json", "--file", "c:\\src\\file.sql" } },
-                { "scan diff", new List<string> { "--config", "c:\\conf.json", "--dir", "c:\\src\\proj", "--diff", "--format", "json", "--basepath", "c:\\src", "--output", "c:\\report.json", "--verbose" } },
+                { "scan dir", new List<string> { "--config", BasePath + "conf.json", "--dir", BasePath + "src" } },
+                { "scan file", new List<string> { "--config", BasePath + "conf.json", "--file", Path.Combine(BasePath, "src", "file.sql") } },
+                { "scan diff", new List<string> { "--config", BasePath + "conf.json", "--dir", Path.Combine(BasePath, "src", "proj"), "--diff", "--format", "json", "--basepath", BasePath + "src", "--output", BasePath + "report.json", "--verbose" } },
             };
         }
 
@@ -42,10 +48,10 @@ public void TestAllArgumentsExtractedCorrectly()
                 .WithNotParsed(err => Assert.Fail(string.Join(";", err)));
 
             Assert.That(parsedOpts, Is.Not.Null);
-            Assert.That(parsedOpts.ConfigFile, Is.EqualTo("c:\\conf.json"));
-            Assert.That(parsedOpts.DirectoryName, Is.EqualTo("c:\\src\\proj"));
-            Assert.That(parsedOpts.BasePath, Is.EqualTo("c:\\src"));
-            Assert.That(parsedOpts.OutputFile, Is.EqualTo("c:\\report.json"));
+            Assert.That(parsedOpts.ConfigFile, Is.EqualTo(BasePath + "conf.json"));
+            Assert.That(parsedOpts.DirectoryName, Is.EqualTo(Path.Combine(BasePath, "src", "proj")));
+            Assert.That(parsedOpts.BasePath, Is.EqualTo(BasePath + "src"));
+            Assert.That(parsedOpts.OutputFile, Is.EqualTo(BasePath + "report.json"));
             Assert.That(parsedOpts.Format, Is.EqualTo(OutputFileFormat.JSON));
             Assert.That(string.IsNullOrEmpty(parsedOpts.FileListSource), Is.True);
             Assert.That(string.IsNullOrEmpty(parsedOpts.FileName), Is.True);

TeamTools.Linter.CommandLineTests/UnitTests/ConfigHandlerTests.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using System.IO;
 using TeamTools.Common.Linting;
 using TeamTools.Common.Linting.Infrastructure;
 using TeamTools.TSQL.Linter.CommandLine.Config;
@@ -15,7 +16,8 @@ public void TestConfigHandlerParsesConfigCorrectly()
             var asm = new AssemblyWrapper();
             var cfg = new ConfigHandler(asm, new AppConfigLoader(fs, asm), fs);
 
-            cfg.LoadFromFile(@".\DefaultConfig.json");
+            // Relative path to config should be successfully revealed
+            cfg.LoadFromFile(Path.Combine(".", "DefaultConfig.json"));
 
             Assert.Multiple(() =>
             {

TeamTools.Linter.CommandLineTests/UnitTests/FileEnumeratorTests.cs

@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using System.Collections.Generic;
+using System.IO;
 using TeamTools.Common.Linting;
 using TeamTools.TSQL.Linter.CommandLine.Infrastructure;
 using TeamTools.TSQL.Linter.CommandLineTests.TestingInfrastructure;
@@ -34,7 +35,11 @@ public void TestListEnumerator()
             var files = new ListedFileEnumerator(fs, "subfolder", "srcfile");
             var fileList = string.Join(";", files.EnumFiles());
 
-            Assert.That(fileList, Is.EqualTo("subfolder\\line1;subfolder\\line2"));
+            // Replace is to respect different platforms
+            var expectedValue = "subfolder\\line1;subfolder\\line2";
+            expectedValue = expectedValue.Replace('\\', Path.DirectorySeparatorChar);
+
+            Assert.That(fileList, Is.EqualTo(expectedValue));
         }
 
         [Test]

TeamTools.Linter.CommandLineTests/UnitTests/FileReporterTests.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using TeamTools.Common.Linting;
@@ -29,22 +30,27 @@ public void TestReportResultsSendsToStream()
             reporter.ReportResults();
 
             // ToList, ToArray returns elements in reversed order
-            Assert.That(writer.ToString(), Is.EqualTo("error: issue2\r\nerror: issue1\r\n"));
+            Assert.That(writer.ToString(), Is.EqualTo(string.Join(Environment.NewLine, "error: issue2", "error: issue1", "")));
         }
 
         [Test]
         public void TestJsonReportFormatterOutput()
         {
+#if Windows
+            const string basePath = @"c:\";
+#else
+            const string basePath = @"/home/";
+#endif
             string expectedOutput = @"{'LINT':{'language':'TSQL','files':[{'name':'filename.txt','issues':[{'line':2,'col':3,'reason':'Failure','evidence':'','category':'CODE_SMELL','severity':'MAJOR','rule':'RULEID'}]}]}}"
                 .Replace('\'', '"');
-            var formatter = new JsonReportFormatter(@"c:\test");
+            var formatter = new JsonReportFormatter(Path.Combine(basePath, "test"));
             var output = new StringWriter();
             var issues = new List<RuleViolation>();
             issues.Add(new RuleViolation
             {
                 Line = 2,
                 Column = 3,
-                FileName = @"c:\test\filename.txt",
+                FileName = Path.Combine(basePath, "test", "filename.txt"),
                 RuleId = "RULEID",
                 Text = "Failure",
             });