Merge pull request #116 from NeonGraal/sample-dirs

Sample dirs

Author: NeonGraal

Diff for: test/GqlPlus.ComponentTestBase/SampleChecks.cs

@@ -83,12 +83,16 @@ protected async Task CheckErrors(string category, string directory, string file,
       () => extra.ShouldBeEmpty("Extra errors"));
   }
 
-  protected VerifySettings CustomSettings(string category, string group, string file)
+  protected VerifySettings CustomSettings(string category, string group, string file, string section = "")
   {
     VerifySettings settings = new();
     settings.ScrubEmptyLines();
-    settings.UseDirectory($"{category}{group}Tests");
     settings.UseFileName(file);
+    if (string.IsNullOrWhiteSpace(section)) {
+      settings.UseDirectory($"{category}{group}Tests");
+    } else {
+      settings.UseDirectory($"{category}{group}Tests/{section}");
+    }
 
     return settings.CheckAutoVerify();
   }
@@ -98,4 +102,117 @@ protected static async Task<string> ReadFile(string file, string extn, params st
 
   protected static async Task<string> ReadSchema(string schema, params string[] dirs)
     => await ReadFile(schema, "graphql+", ["Schema", .. dirs]);
+
+  protected static bool IsObjectInput(string input)
+    => input is not null && input.Contains("object ", StringComparison.Ordinal);
+
+  private static string PascalCase(string? input)
+    => string.Concat(TitleWords(input).Select(s => Abbreviations.TryGetValue(s, out string? abbr) ? abbr : s));
+
+  private static string CamelCase(string? input)
+    => string.Concat(TitleWords(input)
+      .Select(s => Abbreviations.TryGetValue(s, out string? abbr) ? abbr : s)
+      .Select((s, i) => i > 0 ? s : s.ToLowerInvariant()));
+
+  public static readonly (string, string)[] Replacements = [("dual", "Dual"), ("input", "Inp"), ("output", "Outp")];
+
+  protected static string ReplaceName(string? input, string testName)
+    => input is null ? ""
+    : input
+      .Replace("name", CamelCase(testName), StringComparison.InvariantCulture)
+      .Replace("Name", PascalCase(testName), StringComparison.InvariantCulture);
+
+  protected static string ReplaceObject(string? input, string testName, string objectReplace, string objReplace)
+    => input is null ? ""
+    : input
+      .Replace("object", objectReplace, StringComparison.InvariantCulture)
+      .Replace("Obj", objReplace, StringComparison.InvariantCulture)
+      .Replace("name", CamelCase(testName), StringComparison.InvariantCulture)
+      .Replace("Name", PascalCase(testName), StringComparison.InvariantCulture);
+
+  protected static IEnumerable<string> ReplaceValue(string input, string testName)
+    => input
+      .ThrowIfNull()
+      .Contains("object ", StringComparison.Ordinal)
+        ? Replacements.Select(r => ReplaceObject(input, testName, r.Item1, r.Item2))
+        : [ReplaceName(input, testName)];
+
+  protected static async Task ReplaceFile(string testDirectory, string testName, Action<string, string, string> action)
+  {
+    ArgumentNullException.ThrowIfNull(action);
+    string input = await ReadSchema(testName, testDirectory);
+
+    if (IsObjectInput(input)) {
+      action.ShouldSatisfyAllConditions(
+        () => {
+          foreach ((string label, string abbr) in Replacements) {
+            action(ReplaceObject(input, abbr, label, abbr), testDirectory, testName + "+" + label);
+          }
+        });
+    } else {
+      action(ReplaceName(input, testName), testDirectory, testName);
+    }
+  }
+
+  protected static async Task ReplaceFileAsync(string testDirectory, string testName, Func<string, string, string, Task> action)
+  {
+    ArgumentNullException.ThrowIfNull(action);
+    string input = await ReadSchema(testName, testDirectory);
+
+    if (IsObjectInput(input)) {
+      await WhenAll([.. Replacements
+        .Select(r => action(ReplaceObject(input, testName, r.Item1, r.Item2), testDirectory, testName + "+" + r.Item1))]);
+    } else {
+      await action(ReplaceName(input, testName), testDirectory, testName);
+    }
+  }
+
+  protected async Task<IEnumerable<string>> SchemaValidDataAll()
+  {
+    IEnumerable<Task<IEnumerable<string>>> tasks = SchemaValidData
+      .Files
+      .SelectMany(kv => kv.Value.Select(file => (file, dir: kv.Key)))
+      .Select(async p => ReplaceValue(await ReadSchema(p.file, p.dir), p.file));
+
+    return (await Task.WhenAll(tasks))
+      .SelectMany(i => i);
+  }
+
+  protected async Task<IEnumerable<string>> SchemaValidDataGroup(string group)
+  {
+    IEnumerable<Task<IEnumerable<string>>> tasks = SchemaValidData
+      .Files[group]
+      .Select(async file => ReplaceValue(await ReadSchema(file, group), file));
+
+    return (await Task.WhenAll(tasks))
+      .SelectMany(i => i);
+  }
+
+  protected static async Task<IEnumerable<string>> ReplaceSchemaKeys(string group)
+  {
+    IEnumerable<Task<(string input, string file)>> tasks = SchemaValidData
+      .Files[group]
+      .Select(async file => (input: await ReadSchema(file, group), file));
+
+    return (await Task.WhenAll(tasks))
+        .SelectMany(p => IsObjectInput(p.input)
+          ? Replacements.Select(r => p.file + "+" + r.Item1)
+          : [p.file])
+        .Order();
+  }
+
+  protected static async Task WhenAll(params Task[] tasks)
+  {
+    Task all = Task.WhenAll(tasks);
+
+    try {
+      await all;
+    } catch (Exception) {
+      if (all.Exception is not null) {
+        throw all.Exception;
+      }
+
+      throw;
+    }
+  }
 }

Diff for: test/GqlPlus.ComponentTestBase/SampleSchemaChecks.cs

@@ -11,115 +11,15 @@ Parser<IGqlpSchema>.D schemaParser
 {
   private readonly Parser<IGqlpSchema>.L _schemaParser = schemaParser;
 
-  protected IResult<IGqlpSchema> Parse(string schema, string label)
+  public IResult<IGqlpSchema> Parse(string schema, string label)
   {
     Tokenizer tokens = new(schema);
     return _schemaParser.Parse(tokens, label);
   }
 
-  protected async Task<IGqlpSchema> ParseSample(string label, string sample, params string[] dirs)
+  public async Task<IGqlpSchema> ParseSample(string label, string sample, params string[] dirs)
   {
     string schema = await ReadSchema(sample, dirs);
     return Parse(schema, label).Required();
   }
-
-  protected static bool IsObjectInput(string input)
-    => input is not null && input.Contains("object ", StringComparison.Ordinal);
-
-  private static string PascalCase(string? input)
-    => string.Concat(TitleWords(input).Select(s => Abbreviations.TryGetValue(s, out string? abbr) ? abbr : s));
-
-  private static string CamelCase(string? input)
-    => string.Concat(TitleWords(input)
-      .Select(s => Abbreviations.TryGetValue(s, out string? abbr) ? abbr : s)
-      .Select((s, i) => i > 0 ? s : s.ToLowerInvariant()));
-
-  public static readonly (string, string)[] Replacements = [("dual", "Dual"), ("input", "Inp"), ("output", "Outp")];
-
-  protected static string ReplaceName(string? input, string testName)
-    => input is null ? ""
-    : input
-      .Replace("name", CamelCase(testName), StringComparison.InvariantCulture)
-      .Replace("Name", PascalCase(testName), StringComparison.InvariantCulture);
-
-  protected static string ReplaceObject(string? input, string testName, string objectReplace, string objReplace)
-    => input is null ? ""
-    : input
-      .Replace("object", objectReplace, StringComparison.InvariantCulture)
-      .Replace("Obj", objReplace, StringComparison.InvariantCulture)
-      .Replace("name", CamelCase(testName), StringComparison.InvariantCulture)
-      .Replace("Name", PascalCase(testName), StringComparison.InvariantCulture);
-
-  protected static IEnumerable<string> ReplaceValue(string input, string testName)
-    => input
-      .ThrowIfNull()
-      .Contains("object ", StringComparison.Ordinal)
-        ? Replacements.Select(r => ReplaceObject(input, testName, r.Item1, r.Item2))
-        : [ReplaceName(input, testName)];
-
-  protected static async Task ReplaceFile(string testDirectory, string testName, Action<string, string, string> action)
-  {
-    ArgumentNullException.ThrowIfNull(action);
-    string input = await ReadSchema(testName, testDirectory);
-
-    if (IsObjectInput(input)) {
-      action.ShouldSatisfyAllConditions(
-        () => {
-          foreach ((string label, string abbr) in Replacements) {
-            action(ReplaceObject(input, abbr, label, abbr), testDirectory, testName + "+" + label);
-          }
-        });
-    } else {
-      action(ReplaceName(input, testName), testDirectory, testName);
-    }
-  }
-
-  protected static async Task ReplaceFileAsync(string testDirectory, string testName, Func<string, string, string, Task> action)
-  {
-    ArgumentNullException.ThrowIfNull(action);
-    string input = await ReadSchema(testName, testDirectory);
-
-    if (IsObjectInput(input)) {
-      await WhenAll([.. Replacements
-        .Select(r => action(ReplaceObject(input, testName, r.Item1, r.Item2), testDirectory, testName + "+" + r.Item1))]);
-    } else {
-      await action(ReplaceName(input, testName), testDirectory, testName);
-    }
-  }
-
-  protected async Task<IEnumerable<string>> SchemaValidDataAll()
-  {
-    IEnumerable<Task<IEnumerable<string>>> tasks = SchemaValidData
-      .Files
-      .SelectMany(kv => kv.Value.Select(file => (file, dir: kv.Key)))
-      .Select(async p => ReplaceValue(await ReadSchema(p.file, p.dir), p.file));
-
-    return (await Task.WhenAll(tasks))
-      .SelectMany(i => i);
-  }
-
-  protected async Task<IEnumerable<string>> SchemaValidDataGroup(string group)
-  {
-    IEnumerable<Task<IEnumerable<string>>> tasks = SchemaValidData
-      .Files[group]
-      .Select(async file => ReplaceValue(await ReadSchema(file, group), file));
-
-    return (await Task.WhenAll(tasks))
-      .SelectMany(i => i);
-  }
-
-  protected static async Task WhenAll(params Task[] tasks)
-  {
-    Task all = Task.WhenAll(tasks);
-
-    try {
-      await all;
-    } catch (Exception) {
-      if (all.Exception is not null) {
-        throw all.Exception;
-      }
-
-      throw;
-    }
-  }
 }

Diff for: test/GqlPlus.ComponentTestBase/SchemaDataBase.cs

@@ -17,19 +17,6 @@ protected static IEnumerable<string> ReplaceKeys(IDictionary<string, string> inp
         : [k])
       .Order();
 
-  protected static async Task<IEnumerable<string>> ReplaceSchemaKeys(string group)
-  {
-    IEnumerable<Task<(string input, string file)>> tasks = SchemaValidData
-      .Files[group]
-      .Select(async file => (input: await ReadSchema(file, group), file));
-
-    return (await Task.WhenAll(tasks))
-        .SelectMany(p => IsObjectInput(p.input)
-          ? Replacements.Select(r => p.file + "+" + r.Item1)
-          : [p.file])
-        .Order();
-  }
-
   protected static IEnumerable<string> ReplaceValues(IDictionary<string, string> inputs)
     => inputs
       .ThrowIfNull()

Diff for: test/GqlPlus.Converter.Json.ComponentTests/Sample/SampleJsonTests/category-descrs.verified.json renamed to test/GqlPlus.Converter.Json.ComponentTests/Sample/SampleJsonTests/Globals/category-descrs.verified.json

@@ -1,86 +1,11 @@
-using GqlPlus.Abstractions.Schema;
-using GqlPlus.Convert;
-using GqlPlus.Merging;
-using GqlPlus.Parsing;
-using GqlPlus.Result;
+using GqlPlus.Convert;
 
 namespace GqlPlus.Sample;
 
 public class SchemaJsonTests(
-    Parser<IGqlpSchema>.D schemaParser,
-    IMerge<IGqlpSchema> schemaMerger,
-    IModelAndRender schemaRenderer
-) : SchemaDataBase(schemaParser)
+    ISchemaVerifyChecks checks
+) : TestSchemaVerify(checks)
 {
-  [Fact]
-  public async Task Json_All()
-    => await Verify_Model(await SchemaValidDataAll(), "!ALL");
-
-  [Theory]
-  [ClassData(typeof(SchemaValidData))]
-  public async Task Json_Groups(string group)
-    => await Verify_Model(await SchemaValidDataGroup(group), "!" + group);
-
-  [Theory]
-  [ClassData(typeof(SamplesSchemaMergesData))]
-  public async Task Json_Merges(string model)
-    => await ReplaceFileAsync("Merges", model, Verify_Model);
-
-  [Theory]
-  [ClassData(typeof(SamplesSchemaObjectsData))]
-  public async Task Json_Objects(string model)
-    => await ReplaceFileAsync("Objects", model, Verify_Model);
-
-  [Theory]
-  [ClassData(typeof(SamplesSchemaGlobalsData))]
-  public async Task Json_Globals(string global)
-    => await ReplaceFileAsync("Globals", global, Verify_Model);
-
-  [Theory]
-  [ClassData(typeof(SamplesSchemaSimpleData))]
-  public async Task Json_Simple(string simple)
-    => await ReplaceFileAsync("Simple", simple, Verify_Model);
-
-  [Theory]
-  [ClassData(typeof(SamplesSchemaData))]
-  public async Task JsonSchema(string sample)
-  {
-    IGqlpSchema ast = await ParseSample("Schema", sample);
-
-    Structured result = ModelAsts([ast]);
-
-    await Verify(result.ToJson(), "json", CustomSettings("Schema", "Json", sample));
-  }
-
-  [Theory]
-  [ClassData(typeof(SamplesSchemaSpecificationData))]
-  public async Task Json_Spec(string sample)
-  {
-    IGqlpSchema ast = await ParseSample("Spec", sample, "Specification");
-
-    Structured result = ModelAsts([ast]);
-
-    await Verify(result.ToJson(), "json", CustomSettings("Spec", "Json", sample));
-  }
-
-  private async Task Verify_Model(string input, string testDirectory, string test)
-    => await Verify_Model([input], test);
-
-  private async Task Verify_Model(IEnumerable<string> inputs, string test)
-  {
-    IEnumerable<IGqlpSchema> asts = inputs.Select(input => Parse(input, "Sample").Required());
-
-    Structured result = ModelAsts(asts);
-
-    await Verify(result.ToJson(), "json", CustomSettings("Sample", "Json", test));
-  }
-
-  private Structured ModelAsts(IEnumerable<IGqlpSchema> asts)
-  {
-    IGqlpSchema schema = schemaMerger.Merge(asts).First();
-
-    Structured result = schemaRenderer.RenderAst(schema, schemaRenderer.WithBuiltIns());
-
-    return result;
-  }
+  protected override Task VerifyResult(Structured result, string label, string test, string testDirectory)
+    => Verify(result.ToJson(), "json", CustomSettings(label, "Json", test, testDirectory));
 }