Improve Merging tests

NeonGraal · Dec 22, 2023 · 716a16e · 716a16e
1 parent 23b2a92
commit 716a16e
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 41 deletions.
diff --git a/src/GqlPlus.Verifier/Merging/AlternatesMerger.cs b/src/GqlPlus.Verifier/Merging/AlternatesMerger.cs
@@ -14,9 +14,6 @@ protected override TAlternate MergeGroup(TAlternate[] items)
     return first with { Type = first.Type with { Description = items.MergeDescriptions() } };
   }
 
-  public override bool CanMerge(TAlternate[] items)
-    => base.CanMerge(items);
-
   protected override string ItemGroupKey(TAlternate item)
     => item.Type.TypeName;
 

diff --git a/src/GqlPlus.Verifier/Merging/BaseMerger.cs b/src/GqlPlus.Verifier/Merging/BaseMerger.cs
@@ -7,11 +7,7 @@ public virtual bool CanMerge(TItem[] items)
     => items.Length > 0;
 
   public virtual TItem[] Merge(TItem[] items)
-  {
-    if (items is null || items.Length == 0) {
-      throw new InvalidOperationException();
-    }
-
-    return items;
-  }
+    => items is null || items.Length == 0
+      ? throw new InvalidOperationException()
+      : items;
 }
diff --git a/src/GqlPlus.Verifier/Merging/DescribedMerger.cs b/src/GqlPlus.Verifier/Merging/DescribedMerger.cs
@@ -6,7 +6,7 @@ public abstract class DescribedMerger<TItem>
   : DistinctMerger<TItem>
   where TItem : IAstDescribed
 {
-  public override bool CanMerge(TItem[] items)
-    => base.CanMerge(items)
-      && items.CanMerge(item => item.Description);
+  protected override bool CanMergeGroup(IGrouping<string, TItem> group)
+    => base.CanMergeGroup(group)
+    && group.CanMerge(item => item.Description);
 }
diff --git a/src/GqlPlus.Verifier/Merging/FieldsMerger.cs b/src/GqlPlus.Verifier/Merging/FieldsMerger.cs
@@ -1,5 +1,4 @@
-using GqlPlus.Verifier.Ast;
-using GqlPlus.Verifier.Ast.Schema;
+using GqlPlus.Verifier.Ast.Schema;
 
 namespace GqlPlus.Verifier.Merging;
 

diff --git a/src/GqlPlus.Verifier/Merging/MergeDirectives.cs b/src/GqlPlus.Verifier/Merging/MergeDirectives.cs
@@ -12,7 +12,7 @@ protected override string ItemMatchKey(DirectiveDeclAst item)
   public override bool CanMerge(DirectiveDeclAst[] items)
     => base.CanMerge(items)
       && items.CanMerge(item => item.Description)
-      && items.ManyGroupMerge(d => d.Parameters, p => p.Type.FullType, parameters);
+      && items.ManyGroupCanMerge(d => d.Parameters, p => p.Type.FullType, parameters);
 
   protected override DirectiveDeclAst MergeGroup(DirectiveDeclAst[] items)
     => items.First() with { Description = items.MergeDescriptions() };

diff --git a/src/GqlPlus.Verifier/Merging/MergeEnums.cs b/src/GqlPlus.Verifier/Merging/MergeEnums.cs
@@ -12,7 +12,7 @@ protected override string ItemMatchKey(EnumDeclAst item)
   public override bool CanMerge(EnumDeclAst[] items)
     => base.CanMerge(items)
       && items.CanMerge(item => item.Description)
-      && items.ManyMerge(e => e.Values, enumValues);
+      && items.ManyCanMerge(e => e.Values, enumValues);
 
   protected override EnumDeclAst MergeGroup(EnumDeclAst[] items)
     => items.First() with { Description = items.MergeDescriptions() };

diff --git a/src/GqlPlus.Verifier/Merging/MergeExtensions.cs b/src/GqlPlus.Verifier/Merging/MergeExtensions.cs
@@ -50,14 +50,15 @@ public static bool CanMerge<TItem>(this IEnumerable<TItem> items, Func<TItem, st
     return true;
   }
 
-  public static bool ManyGroupMerge<TItem, TGroup>(
+  public static bool ManyGroupCanMerge<TItem, TGroup>(
       this IEnumerable<TItem> items,
       Func<TItem, IEnumerable<TGroup>> many,
       Func<TGroup, string> groupKey,
       IMerge<TGroup> merger)
-    => items.SelectMany(many).GroupBy(groupKey).All(p => merger.CanMerge([.. p]));
+    => items.SelectMany(many).GroupBy(groupKey)
+      .All(p => merger.CanMerge([.. p]));
 
-  public static bool ManyMerge<TItem, TGroup>(
+  public static bool ManyCanMerge<TItem, TGroup>(
       this IEnumerable<TItem> items,
       Func<TItem, IEnumerable<TGroup>> many,
       IMerge<TGroup> merger)

diff --git a/src/GqlPlus.Verifier/Merging/MergeOutputFields.cs b/src/GqlPlus.Verifier/Merging/MergeOutputFields.cs
@@ -9,5 +9,5 @@ IMerge<ParameterAst> parameters
   public override bool CanMerge(OutputFieldAst[] items)
     => base.CanMerge(items)
       && items.CanMerge(item => item.EnumValue ?? "-")
-      && items.ManyMerge(item => item.Parameters, parameters);
+      && items.ManyCanMerge(item => item.Parameters, parameters);
 }
diff --git a/src/GqlPlus.Verifier/Merging/MergeScalars.cs b/src/GqlPlus.Verifier/Merging/MergeScalars.cs
@@ -13,8 +13,8 @@ protected override string ItemMatchKey(ScalarDeclAst item)
   public override bool CanMerge(ScalarDeclAst[] items)
     => base.CanMerge(items)
       && items.CanMerge(item => item.Description)
-      && items.ManyMerge(i => i.Ranges, ranges)
-      && items.ManyGroupMerge(i => i.Regexes, r => r.Regex, regexes);
+      && items.ManyCanMerge(i => i.Ranges, ranges)
+      && items.ManyGroupCanMerge(i => i.Regexes, r => r.Regex, regexes);
 
   protected override ScalarDeclAst MergeGroup(ScalarDeclAst[] items)
     => items.First() with { Description = items.MergeDescriptions() };

diff --git a/src/GqlPlus.Verifier/Merging/ObjectsMerger.cs b/src/GqlPlus.Verifier/Merging/ObjectsMerger.cs
@@ -19,9 +19,9 @@ public override bool CanMerge(TObject[] items)
   {
     var baseCanMerge = base.CanMerge(items);
     var descriptionsCanMerge = items.CanMerge(item => item.Description);
-    var typeParametersCanMerge = items.ManyMerge(item => item.TypeParameters, typeParameters);
-    var fieldsCanMerge = items.ManyGroupMerge(item => item.Fields, f => f.Name, fields);
-    var alternatesCanMerge = items.ManyGroupMerge(item => item.Alternates, a => a.Type.FullType, alternates);
+    var typeParametersCanMerge = items.ManyCanMerge(item => item.TypeParameters, typeParameters);
+    var fieldsCanMerge = items.ManyGroupCanMerge(item => item.Fields, f => f.Name, fields);
+    var alternatesCanMerge = items.ManyGroupCanMerge(item => item.Alternates, a => a.Type.FullType, alternates);
 
     return baseCanMerge && descriptionsCanMerge && typeParametersCanMerge && fieldsCanMerge && alternatesCanMerge;
   }

diff --git a/test/GqlPlus.Verifier.ClassTests/Merging/MergeCategoriesTests.cs b/test/GqlPlus.Verifier.ClassTests/Merging/MergeCategoriesTests.cs
@@ -27,6 +27,12 @@ public void CanMerge_TwoItemsDifferentOption_ReturnsFalse(string category)
       new CategoryDeclAst(AstNulls.At, category) { Option = CategoryOption.Single },
       new CategoryDeclAst(AstNulls.At, category) { Option = CategoryOption.Sequential }]);
 
+  [Theory, RepeatData(Repeats)]
+  public void Merge_TwoItemsSameOutput_ReturnsExpected(string category)
+    => Merge_Expected(
+      [new CategoryDeclAst(AstNulls.At, category), new CategoryDeclAst(AstNulls.At, category)],
+      new CategoryDeclAst(AstNulls.At, category));
+
   protected override CategoryDeclAst MakeDescribed(string name, string description = "")
     => new(AstNulls.At, name, description, name);
 }
diff --git a/test/GqlPlus.Verifier.ClassTests/Merging/TestGroups.cs b/test/GqlPlus.Verifier.ClassTests/Merging/TestGroups.cs
@@ -2,9 +2,33 @@
 
 namespace GqlPlus.Verifier.Merging;
 
-public abstract class TestGroups<TItem> : TestBase<TItem>
+public abstract class TestGroups<TItem>
+  : TestBase<TItem>
   where TItem : AstBase
 {
+  [Theory, RepeatData(Repeats)]
+  public void CanMerge_TwoItemsDifferentNames_ReturnsTrue(string name1, string name2)
+  {
+    if (name1 == name2) {
+      return;
+    }
+
+    CanMerge_True([MakeDistinct(name1), MakeDistinct(name2)]);
+  }
+
+  [Theory, RepeatData(Repeats)]
+  public void Merge_TwoItemsDifferentName_ReturnsItems(string name1, string name2)
+  {
+    if (name1 == name2) {
+      return;
+    }
+
+    var item1 = MakeDistinct(name1);
+    var item2 = MakeDistinct(name2);
+
+    Merge_Expected([item1, item2], item2, item1);
+  }
+
   protected abstract GroupsMerger<TItem> MergerGroups { get; }
 
   protected override IMerge<TItem> MergerBase => MergerGroups;

diff --git a/test/GqlPlus.Verifier.ClassTests/Merging/TestModified.cs b/test/GqlPlus.Verifier.ClassTests/Merging/TestModified.cs
@@ -6,12 +6,17 @@ public abstract class TestModified<TModified>
   : TestDescriptions<TModified>
   where TModified : AstBase, IAstDescribed, IAstModified
 {
-
   [Theory, RepeatData(Repeats)]
   public void CanMerge_TwoItemsSameModifers_ReturnsTrue(string input)
     => CanMerge_True([MakeDescribed(input) with { Modifiers = TestMods() }, MakeDescribed(input) with { Modifiers = TestMods() }]);
 
   [Theory, RepeatData(Repeats)]
   public void CanMerge_TwoItemsDifferentModifers_ReturnsFalse(string input)
     => CanMerge_False([MakeDescribed(input) with { Modifiers = TestMods() }, MakeDescribed(input)]);
+
+  [Theory, RepeatData(Repeats)]
+  public void Merge_TwoItemsSameModifers_ReturnsExpected(string input)
+    => Merge_Expected(
+      [MakeDescribed(input) with { Modifiers = TestMods() }, MakeDescribed(input) with { Modifiers = TestMods() }],
+      MakeDescribed(input) with { Modifiers = TestMods() });
 }
diff --git a/test/GqlPlus.Verifier.ComponentTests/BuiltInTests.cs b/test/GqlPlus.Verifier.ComponentTests/BuiltInTests.cs
@@ -4,14 +4,10 @@
 public class BuiltInTests
 {
   [Fact]
-  public async Task VerifyBasicTypes()
-  {
-    await Verify(BuiltIn.Basic.AsString());
-  }
+  public Task VerifyBasicTypes()
+    => Verify(BuiltIn.Basic.AsString());
 
   [Fact]
-  public async Task VerifyInternalTypes()
-  {
-    await Verify(BuiltIn.Internal.AsString());
-  }
+  public Task VerifyInternalTypes()
+    => Verify(BuiltIn.Internal.AsString());
 }
diff --git a/test/GqlPlus.Verifier.ComponentTests/SampleTests.cs b/test/GqlPlus.Verifier.ComponentTests/SampleTests.cs
@@ -1,5 +1,4 @@
-using DiffEngine;
-using GqlPlus.Verifier.Ast.Operation;
+using GqlPlus.Verifier.Ast.Operation;
 using GqlPlus.Verifier.Ast.Schema;
 using GqlPlus.Verifier.Parse;
 using GqlPlus.Verifier.Parse.Operation;

diff --git a/test/GqlPlus.Verifier.ComponentTests/Startup.cs b/test/GqlPlus.Verifier.ComponentTests/Startup.cs
@@ -12,9 +12,7 @@ namespace GqlPlus.Verifier;
 public class Startup
 {
   static Startup()
-  {
-    DiffRunner.MaxInstancesToLaunch(20);
-  }
+    => DiffRunner.MaxInstancesToLaunch(20);
 
   public static void ConfigureServices(IServiceCollection services)
     => services