Read files from .meta/config.json (#45)

* Remove results file path from Options class

* Read solution files from .meta/config.json

src/Exercism.TestRunner.CSharp/FilesParser.cs

@@ -0,0 +1,36 @@
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Exercism.TestRunner.CSharp
+{
+    internal static class FilesParser
+    {
+        public static Files Parse(Options options)
+        {
+            var configuration = JsonSerializer.Deserialize<Configuration>(ConfigJson(options));
+            return configuration!.Files;
+        }
+
+        private static string ConfigJson(Options options) =>
+            File.ReadAllText(options.ConfigJsonPath());
+
+        private static string ConfigJsonPath(this Options options) =>
+            Path.Combine(options.InputDirectory, ".meta", "config.json");
+    }
+
+    internal class Files
+    {
+        [JsonPropertyName("solution")]
+        public string[] Solution { get; set; }
+
+        [JsonPropertyName("test")]
+        public string[] Test { get; set; }
+    }
+
+    internal class Configuration
+    {
+        [JsonPropertyName("files")]
+        public Files Files { get; set; }
+    }
+}

src/Exercism.TestRunner.CSharp/Options.cs

@@ -1,9 +1,5 @@
-using System.IO;
-
 using CommandLine;
 
-using Humanizer;
-
 namespace Exercism.TestRunner.CSharp
 {
     internal class Options
@@ -19,11 +15,5 @@ internal class Options
 
         public Options(string slug, string inputDirectory, string outputDirectory) =>
             (Slug, InputDirectory, OutputDirectory) = (slug, inputDirectory, outputDirectory);
-
-        public string TestsFilePath => Path.Combine(InputDirectory, $"{Exercise}Tests.cs");
-
-        public string ResultsJsonFilePath => Path.GetFullPath(Path.Combine(OutputDirectory, "results.json"));
-
-        private string Exercise => Slug.Dehumanize().Pascalize();
     }
 }

src/Exercism.TestRunner.CSharp/Program.cs

@@ -16,7 +16,7 @@ private static void CreateTestResults(Options options)
             Console.WriteLine($"[{DateTimeOffset.UtcNow:u}] Running test runner for '{options.Slug}' solution...");
 
             var testRun = TestSuite.RunTests(options);
-            testRun.WriteToFile(options.ResultsJsonFilePath);
+            testRun.WriteToFile(options);
 
             Console.WriteLine($"[{DateTimeOffset.UtcNow:u}] Ran test runner for '{options.Slug}' solution");
         }

src/Exercism.TestRunner.CSharp/TestCompilation.cs

@@ -13,27 +13,24 @@ namespace Exercism.TestRunner.CSharp
 {
     internal static class TestCompilation
     {
-        public static Compilation Compile(Options options) =>
-            CSharpCompilation.Create(Guid.NewGuid().ToString("N"), SyntaxTrees(options), References(), CompilationOptions());
+        public static Compilation Compile(Options options, Files files) =>
+            CSharpCompilation.Create(AssemblyName(), SyntaxTrees(options, files), References(), CompilationOptions());
 
-        private static IEnumerable<SyntaxTree> SyntaxTrees(Options options)
+        private static string AssemblyName() => Guid.NewGuid().ToString("N");
+
+        private static IEnumerable<SyntaxTree> SyntaxTrees(Options options, Files files)
+        {
+            var solutionFiles = files.Solution.Select(file => ParseSyntaxTree(file, options));
+            var testFiles = files.Test.Select(file => ParseSyntaxTree(file, options).Rewrite());
+
+            return solutionFiles.Concat(testFiles);
+        }
+
+        private static SyntaxTree ParseSyntaxTree(string file, Options options)
         {
-            SyntaxTree ParseSyntaxTree(string file)
-            {
-                var source = SourceText.From(File.OpenRead(file));
-                var syntaxTree = CSharpSyntaxTree.ParseText(source, path: file);
-
-                // We need to rewrite the test suite to un-skip all tests and capture any console output
-                if (file == options.TestsFilePath)
-                {
-                    return syntaxTree.Rewrite();
-                }
-
-                return syntaxTree;
-            }
-
-            return Directory.EnumerateFiles(options.InputDirectory, "*.cs", SearchOption.AllDirectories)
-                .Select(ParseSyntaxTree);
+            var filePath = Path.Combine(options.InputDirectory, file);
+            var source = SourceText.From(File.OpenRead(filePath));
+            return CSharpSyntaxTree.ParseText(source, path: file);
         }
 
         private static CSharpCompilationOptions CompilationOptions() =>

src/Exercism.TestRunner.CSharp/TestResultParser.cs

@@ -14,12 +14,12 @@ namespace Exercism.TestRunner.CSharp
 {
     internal static class TestResultParser
     {
-        public static TestResult[] FromTests(IEnumerable<TestInfo> tests, SyntaxTree testsSyntaxTree)
+        public static TestResult[] FromTests(IEnumerable<TestInfo> tests, Compilation compilation, Files files)
         {
             var testMethods =
-                testsSyntaxTree
-                    .GetRoot()
-                    .DescendantNodes()
+                compilation.SyntaxTrees
+                    .Where(tree => files.Test.Contains(tree.FilePath))
+                    .SelectMany(tree => tree.GetRoot().DescendantNodes())
                     .OfType<MethodDeclarationSyntax>()
                     .ToArray();
 

src/Exercism.TestRunner.CSharp/TestRunWriter.cs

@@ -6,8 +6,11 @@ namespace Exercism.TestRunner.CSharp
 {
     internal static class TestRunWriter
     {
-        public static void WriteToFile(this TestRun testRun, string resultsJsonFilePath) =>
-            File.WriteAllText(resultsJsonFilePath, testRun.ToJson());
+        public static void WriteToFile(this TestRun testRun, Options options) =>
+            File.WriteAllText(options.ResultsJsonPath(), testRun.ToJson());
+
+        private static string ResultsJsonPath(this Options options) =>
+            Path.GetFullPath(Path.Combine(options.OutputDirectory, "results.json"));
 
         private static string ToJson(this TestRun testRun) =>
             JsonSerializer.Serialize(testRun, CreateJsonSerializerOptions());

src/Exercism.TestRunner.CSharp/TestRunner.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Threading;
 
@@ -14,7 +11,7 @@ namespace Exercism.TestRunner.CSharp
 {
     internal static class TestRunner
     {
-        public static TestResult[] RunTests(Compilation compilation, Options options)
+        public static TestResult[] RunTests(Compilation compilation, Files files)
         {
             var outputPath = Path.Combine(Path.GetTempPath(), compilation.SourceModule.Name);
             compilation.Emit(outputPath);
@@ -30,8 +27,7 @@ public static TestResult[] RunTests(Compilation compilation, Options options)
             runner.Start();
             finished.Wait();
 
-            var testsSyntaxTree = compilation.SyntaxTrees.First(tree => tree.FilePath == options.TestsFilePath);
-            return TestResultParser.FromTests(tests, testsSyntaxTree);
+            return TestResultParser.FromTests(tests, compilation, files);
         }
     }
 }

src/Exercism.TestRunner.CSharp/TestSuite.cs

@@ -8,7 +8,8 @@ internal static class TestSuite
     {
         public static TestRun RunTests(Options options)
         {
-            var compilation = TestCompilation.Compile(options);
+            var files = FilesParser.Parse(options);
+            var compilation = TestCompilation.Compile(options, files);
 
             var errors = compilation.GetDiagnostics()
                 .Where(diag => diag.Severity == DiagnosticSeverity.Error)
@@ -17,7 +18,7 @@ public static TestRun RunTests(Options options)
             if (errors.Any())
                 return TestRunParser.TestRunWithError(errors);
 
-            var testResults = TestRunner.RunTests(compilation, options);
+            var testResults = TestRunner.RunTests(compilation, files);
             return TestRunParser.TestRunWithoutError(testResults);
         }
     }

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/AllTestsWithTask/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleCompileErrors/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleTestClassesWithAllPasses/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleTestsWithAllPasses/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleTestsWithMultipleFails/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleTestsWithSingleFail/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleTestsWithTestOutput/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/MultipleTestsWithTestOutputExceedingLimit/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/NoTasks/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/NoTests/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/NotImplemented/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/SingleCompileError/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/SingleTestThatFails/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/SingleTestThatPasses/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/SingleTestThatPassesWithDifferentSlug/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Foo.cs"],
+    "test": ["FooTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/SomeTestsWithTask/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/TestsInDifferentFormats/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/WithExample/.meta/Example.cs

@@ -0,0 +1,4 @@
+public static class Fake
+{
+    public static int Add(int x, int y) => x + y;
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/WithExample/.meta/config.json

@@ -0,0 +1,7 @@
+{
+  "files": {
+    "solution": ["Fake.cs"],
+    "test": ["FakeTests.cs"],
+    "example": [".meta/Example.cs"]
+  }
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/WithExample/Fake.cs

@@ -0,0 +1,4 @@
+public static class Fake
+{
+    public static int Add(int x, int y) => x + y;
+}

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/WithExample/Fake.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Example.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="Exercism.Tests" Version="0.1.0-alpha" />
+  </ItemGroup>
+
+</Project>

test/Exercism.TestRunner.CSharp.IntegrationTests/Solutions/WithExample/FakeTests.cs

@@ -0,0 +1,6 @@
+using Xunit;
+public class FakeTests
+{
+    [Fact]
+    public void Add_should_add_numbers() => Assert.Equal(2, Fake.Add(1, 1));
+}