trackler 2.2.1.64 → 2.2.1.65

data/tracks/csharp/generators/CustomExercise.cs

@@ -0,0 +1,9 @@
+using Generators.Output;
+
+namespace Generators
+{
+    public abstract class CustomExercise : Exercise
+    {
+        public override string Name => GetType().ToExerciseName();
+    }
+}

data/tracks/csharp/generators/Exercise.cs

@@ -1,114 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using Generators.Input;
-using Generators.Output;
-
-namespace Generators
+namespace Generators
 {
     public abstract class Exercise
     {
-        public string Name => GetType().ToExerciseName();
-
-        private static readonly ExerciseWriter ExerciseWriter = new ExerciseWriter();
-        private CanonicalData _canonicalData { get; set; }
-
-        public void Regenerate(CanonicalData canonicalData)
-        {
-            _canonicalData = canonicalData;
-            UpdateCanonicalData(canonicalData);
-
-            ExerciseWriter.WriteToFile(this);
-        }
-
-        public string Render() => CreateTestClass().Render();
-
-        protected virtual void UpdateCanonicalData(CanonicalData canonicalData)
-        {
-        }
-
-        protected virtual HashSet<string> AddAdditionalNamespaces()
-        {
-            return new HashSet<string>();
-        }
-
-        protected virtual string RenderTestMethodBodyArrange(TestMethodBody testMethodBody)
-            => TemplateRenderer.RenderPartial(testMethodBody.ArrangeTemplateName, testMethodBody.ArrangeTemplateParameters);
-
-        protected virtual string RenderTestMethodBodyAct(TestMethodBody testMethodBody)
-            => TemplateRenderer.RenderPartial(testMethodBody.ActTemplateName, testMethodBody.ActTemplateParameters);
-
-        protected virtual string RenderTestMethodBodyAssert(TestMethodBody testMethodBody)
-            => TemplateRenderer.RenderPartial(testMethodBody.AssertTemplateName, testMethodBody.AssertTemplateParameters);
-
-        protected virtual string[] RenderAdditionalMethods()
-        {
-            return new string[] { };
-        }
-
-        private HashSet<string> GetUsingNamespaces()
-        {
-            var usingNamespaces = new HashSet<string> { "Xunit" };
-
-            foreach (var canonicalDataCase in _canonicalData.Cases.Where(canonicalDataCase => canonicalDataCase.ExceptionThrown != null))
-                usingNamespaces.Add(canonicalDataCase.ExceptionThrown.Namespace);
-
-            usingNamespaces.UnionWith(AddAdditionalNamespaces());
-
-            return usingNamespaces;
-        }
-
-        private string[] RenderTestMethods() => _canonicalData.Cases.Select(RenderTestMethod).Concat(RenderAdditionalMethods()).ToArray();
-
-        private TestClass CreateTestClass() => new TestClass
-        {
-            ClassName = Name.ToTestClassName(),
-            Methods = RenderTestMethods(),
-            CanonicalDataVersion = _canonicalData.Version,
-            UsingNamespaces = GetUsingNamespaces()
-        };
-
-        private string RenderTestMethod(CanonicalDataCase canonicalDataCase, int index) => CreateTestMethod(canonicalDataCase, index).Render();
-
-        private TestMethod CreateTestMethod(CanonicalDataCase canonicalDataCase, int index) => new TestMethod
-        {
-            Skip = index > 0,
-            Name = ToTestMethodName(canonicalDataCase),
-            Body = RenderTestMethodBody(canonicalDataCase)
-        };
-
-        private static string ToTestMethodName(CanonicalDataCase canonicalDataCase) 
-            => canonicalDataCase.UseFullDescriptionPath 
-                ? string.Join(" - ", canonicalDataCase.DescriptionPath).ToTestMethodName()
-                : canonicalDataCase.Description.ToTestMethodName();
-
-        private string RenderTestMethodBody(CanonicalDataCase canonicalDataCase)
-        {
-            var testMethodBody = CreateTestMethodBody(canonicalDataCase);
-            testMethodBody.Arrange = RenderTestMethodBodyArrange(testMethodBody);
-            testMethodBody.Act = RenderTestMethodBodyAct(testMethodBody);
-            testMethodBody.Assert = RenderTestMethodBodyAssert(testMethodBody);
-
-            return testMethodBody.Render();
-        }
-
-        private TestMethodBody CreateTestMethodBody(CanonicalDataCase canonicalDataCase)
-        {
-            if (canonicalDataCase.ExceptionThrown != null)
-            {
-                return new TestMethodBodyWithExceptionCheck(canonicalDataCase, _canonicalData);
-            }
-
-            if (canonicalDataCase.Expected is bool)
-            {
-                return new TestMethodBodyWithBooleanCheck(canonicalDataCase, _canonicalData);
-            }
-
-            if (canonicalDataCase.Expected is null)
-            {
-                return new TestMethodBodyWithNullCheck(canonicalDataCase, _canonicalData);
-            }
-
-            return new TestMethodBodyWithEqualityCheck(canonicalDataCase, _canonicalData);
-        }
+        public abstract string Name { get; }
     }
-}
+}

data/tracks/csharp/generators/ExerciseCollection.cs

@@ -3,31 +3,50 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Generators.Input;
 using Generators.Output;
 
 namespace Generators
 {
     public class ExerciseCollection : IEnumerable<Exercise>
     {
-        private readonly HashSet<string> _exerciseNames;
-        
-        public ExerciseCollection(IEnumerable<string> exerciseNames) => _exerciseNames = new HashSet<string>(exerciseNames);
+        private readonly CanonicalDataFile _canonicalDataFile;
+        private readonly Dictionary<string, Type> _exerciseTypesByName;
 
-        public IEnumerator<Exercise> GetEnumerator() => GetDefinedGenerators().GetEnumerator();
+        public ExerciseCollection(CanonicalDataFile canonicalDataFile)
+        {
+            _canonicalDataFile = canonicalDataFile;
+
+            _exerciseTypesByName = Assembly.GetEntryAssembly()
+                .GetTypes()
+                .Where(IsConcreteGenerator)
+                .ToDictionary(type => type.ToExerciseName(), StringComparer.OrdinalIgnoreCase);
+        }
+
+        public IEnumerator<Exercise> GetEnumerator() => GetExercises().GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        private IEnumerable<Exercise> GetDefinedGenerators() =>
-            from type in Assembly.GetEntryAssembly().GetTypes()
-            where IsConcreteExercise(type) && ShouldBeIncluded(type)
-            select (Exercise)Activator.CreateInstance(type);
+        private IEnumerable<Exercise> GetExercises()
+        {
+            foreach (var exerciseName in ConfigFile.GetExerciseNames())
+            {
+                if (HasNoCanonicalData(exerciseName))
+                    yield return new MissingDataExercise(exerciseName);
+                else if (IsNotImplemented(exerciseName))
+                    yield return new UnimplementedExercise(exerciseName);
+                else
+                    yield return CreateExercise(exerciseName);
+            }
+        }
+
+        private bool HasNoCanonicalData(string exerciseName) => !_canonicalDataFile.Exists(exerciseName);
+
+        private bool IsNotImplemented(string exerciseName) => !_exerciseTypesByName.ContainsKey(exerciseName.ToExerciseName());
 
-        private static bool IsConcreteExercise(Type type) => typeof(Exercise).IsAssignableFrom(type) && !type.GetTypeInfo().IsAbstract;
+        private Exercise CreateExercise(string exerciseName) 
+            => (Exercise)Activator.CreateInstance(_exerciseTypesByName[exerciseName.ToExerciseName()]);
 
-        private bool ShouldBeIncluded(Type type) 
-            => _exerciseNames == null ||
-               _exerciseNames.Count == 0 ||
-               _exerciseNames.Contains(type.ToExerciseName(), StringComparer.OrdinalIgnoreCase) ||
-               _exerciseNames.Contains(type.Name, StringComparer.OrdinalIgnoreCase);
+        private static bool IsConcreteGenerator(Type type) => typeof(Exercise).IsAssignableFrom(type);
     }
 }

data/tracks/csharp/generators/Exercises/Acronym.cs

@@ -1,6 +1,6 @@
 namespace Generators.Exercises
 {
-    public class Acronym : Exercise
+    public class Acronym : GeneratorExercise
     {
     }
 }

data/tracks/csharp/generators/Exercises/AllYourBase.cs

@@ -3,7 +3,7 @@
 
 namespace Generators.Exercises
 {
-    public class AllYourBase : Exercise
+    public class AllYourBase : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Allergies.cs

@@ -3,7 +3,7 @@
 
 namespace Generators.Exercises
 {
-    public class Allergies : Exercise
+    public class Allergies : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Alphametics.cs

@@ -5,7 +5,7 @@
 
 namespace Generators.Exercises
 {
-    public class Alphametics : Exercise
+    public class Alphametics : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Anagram.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class Anagram : Exercise
+    public class Anagram : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/AtbashCipher.cs

@@ -1,6 +1,6 @@
 namespace Generators.Exercises
 {
-    public class AtbashCipher : Exercise
+    public class AtbashCipher : GeneratorExercise
     {
     }
 }

data/tracks/csharp/generators/Exercises/BeerSong.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class BeerSong : Exercise
+    public class BeerSong : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/BinarySearch.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class BinarySearch : Exercise
+    public class BinarySearch : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Bob.cs

@@ -1,6 +1,6 @@
 namespace Generators.Exercises
 {
-    public class Bob : Exercise
+    public class Bob : GeneratorExercise
     {
     }
 }

data/tracks/csharp/generators/Exercises/BookStore.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class BookStore : Exercise
+    public class BookStore : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Bowling.cs

@@ -2,12 +2,11 @@
 using System.Text;
 using Generators.Input;
 using Generators.Output;
-using System.Linq;
 using System.Collections.Generic;
 
 namespace Generators.Exercises
 {
-    public class Bowling : Exercise
+    public class Bowling : GeneratorExercise
     {
         private const string PreviousRolls = "previous_rolls";
 

data/tracks/csharp/generators/Exercises/BracketPush.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class BracketPush : Exercise
+    public class BracketPush : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Clock.cs

@@ -4,7 +4,7 @@
 
 namespace Generators.Exercises
 {
-    public class Clock : Exercise
+    public class Clock : GeneratorExercise
     {
         private const string ParamClock1 = "clock1";
         private const string ParamClock2 = "clock2";

data/tracks/csharp/generators/Exercises/CollatzConjecture.cs

@@ -3,7 +3,7 @@
 
 namespace Generators.Exercises
 {
-    public class CollatzConjecture : Exercise
+    public class CollatzConjecture : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/ComplexNumbers.cs

@@ -7,7 +7,7 @@
 
 namespace Generators.Exercises
 {
-    public class ComplexNumbers : Exercise
+    public class ComplexNumbers : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Connect.cs

@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Generators.Input;
+using Generators.Input;
 using Generators.Output;
 
 namespace Generators.Exercises
 {
-    public class Connect : Exercise
+    public class Connect : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/CryptoSquare.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class CryptoSquare : Exercise
+    public class CryptoSquare : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Diamond.cs

@@ -0,0 +1,9 @@
+namespace Generators.Exercises
+{
+    // This class derives from CustomExercise instead of GeneratorExercise
+    // as it has custom (property-based) tests that cannot be generated from
+    // the canonical data.
+    public class Diamond : CustomExercise
+    {
+    }
+}

data/tracks/csharp/generators/Exercises/DifferenceOfSquares.cs

@@ -1,9 +1,8 @@
 using Generators.Input;
-using System;
 
 namespace Generators.Exercises
 {
-    public class DifferenceOfSquares : Exercise
+    public class DifferenceOfSquares : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Dominoes.cs

@@ -7,7 +7,7 @@
 
 namespace Generators.Exercises
 {
-    public class Dominoes : Exercise
+    public class Dominoes : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Etl.cs

@@ -5,7 +5,7 @@
 
 namespace Generators.Exercises
 {
-    public class Etl : Exercise
+    public class Etl : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/FlattenArray.cs

@@ -1,10 +1,9 @@
 using Generators.Input;
 using Generators.Output;
-using System.Collections;
 
 namespace Generators.Exercises
 {
-    public class FlattenArray : Exercise
+    public class FlattenArray : GeneratorExercise
     {
     	protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/FoodChain.cs

@@ -2,7 +2,7 @@
 
 namespace Generators.Exercises
 {
-    public class FoodChain : Exercise
+    public class FoodChain : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {

data/tracks/csharp/generators/Exercises/Gigasecond.cs

@@ -5,7 +5,7 @@
 
 namespace Generators.Exercises
 {
-    public class Gigasecond : Exercise
+    public class Gigasecond : GeneratorExercise
     {
         protected override void UpdateCanonicalData(CanonicalData canonicalData)
         {