[Fusion] Updated tests to use the SourceSchemaParser (#8712)

Author: glen-84

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/HotChocolate.Fusion.Composition.csproj

@@ -8,6 +8,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="HotChocolate.Fusion.Composition.Tests" />
     <InternalsVisibleTo Include="HotChocolate.Fusion.Execution.Tests" />
+    <InternalsVisibleTo Include="HotChocolate.Fusion.Utilities.Tests" />
   </ItemGroup>
 
   <ItemGroup>

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/SchemaComposer.cs

@@ -122,8 +122,7 @@ public CompositionResult<MutableSchemaDefinition> Compose()
         new RequireInvalidSyntaxRule(),
         new RootMutationUsedRule(),
         new RootQueryUsedRule(),
-        new RootSubscriptionUsedRule(),
-        new TypeDefinitionInvalidRule()
+        new RootSubscriptionUsedRule()
     ];
 
     private static readonly ImmutableArray<object> s_preMergeRules =

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/SourceSchemaValidationRules/TypeDefinitionInvalidRule.cs

@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
-using HotChocolate.Fusion.Comparers;
+using HotChocolate.Fusion.Logging;
 using HotChocolate.Types.Mutable;
-using HotChocolate.Types.Mutable.Serialization;
 
 namespace HotChocolate.Fusion;
 
@@ -10,16 +9,11 @@ internal static class CompositionTestHelper
     internal static ImmutableSortedSet<MutableSchemaDefinition> CreateSchemaDefinitions(
         string[] sdl)
     {
-        var schemaDefinitions =
-            sdl.Select((s, i) =>
-            {
-                var schemaDefinition = SchemaParser.Parse(s);
-                schemaDefinition.Name = ((char)('A' + i)).ToString();
+        var sourceSchemaParser =
+            new SourceSchemaParser(
+                sdl.Select((s, i) => new SourceSchemaText(((char)('A' + i)).ToString(), s)),
+                new CompositionLog());
 
-                return schemaDefinition;
-            });
-
-        return schemaDefinitions.ToImmutableSortedSet(
-            new SchemaByNameComparer<MutableSchemaDefinition>());
+        return sourceSchemaParser.Parse().Value;
     }
 }

src/HotChocolate/Fusion-vnext/test/Fusion.Composition.Tests/CompositionTestHelper.cs

@@ -967,7 +967,7 @@ type A
                     pId: ID!
                     compositeId: CompositeID!
                     name: String! @external
-                    nameInB: String! @requires(fields: "name")
+                    nameInB: String! @require(fields: "name")
                 }
 
                 type CompositeID {
@@ -1026,7 +1026,7 @@ type Product @key(fields: "id") {
                 type Product @key(fields: "id") {
                     id: ID!
                     price: Float! @external
-                    isExpensive: Boolean! @requires(fields: "price")
+                    isExpensive: Boolean! @require(fields: "price")
                     isAvailable: Boolean!
                 }
 

src/HotChocolate/Fusion-vnext/test/Fusion.Composition.Tests/SatisfiabilityValidatorTests.cs

@@ -1,5 +1,6 @@
 using System.Collections.Immutable;
 using HotChocolate.Fusion.Comparers;
+using HotChocolate.Fusion.Logging;
 using HotChocolate.Types.Mutable;
 using HotChocolate.Types.Mutable.Serialization;
 using static HotChocolate.Fusion.WellKnownTypeNames;
@@ -102,8 +103,9 @@ public void Merge_FourNamedSchemas_AddsFusionDefinitions()
     public void Merge_WithRequireInputObject_RetainsInputObjectType()
     {
         // arrange
-        var schemaA =
-            SchemaParser.Parse(
+        var sourceSchemaTextA =
+            new SourceSchemaText(
+                "A",
                 """
                 type Query {
                     product: Product
@@ -113,9 +115,9 @@ type Product {
                     weight: Int!
                 }
                 """);
-        schemaA.Name = "A";
-        var schemaB =
-            SchemaParser.Parse(
+        var sourceSchemaTextB =
+            new SourceSchemaText(
+                "B",
                 """
                 type Product {
                     deliveryEstimate(
@@ -128,11 +130,8 @@ input ProductDimensionInput @inaccessible {
                     weight: Int!
                 }
                 """);
-        schemaB.Name = "B";
-        IEnumerable<MutableSchemaDefinition> schemas = [schemaA, schemaB];
-        var merger = new SourceSchemaMerger(
-            schemas.ToImmutableSortedSet(
-                new SchemaByNameComparer<MutableSchemaDefinition>()));
+        var sourceSchemaParser = new SourceSchemaParser([sourceSchemaTextA, sourceSchemaTextB], new CompositionLog());
+        var merger = new SourceSchemaMerger(sourceSchemaParser.Parse().Value);
 
         // act
         var result = merger.Merge();

src/HotChocolate/Fusion-vnext/test/Fusion.Composition.Tests/SourceSchemaMergerTests.cs

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Fusion.Composition\HotChocolate.Fusion.Composition.csproj" />
     <ProjectReference Include="..\..\src\Fusion.Utilities\HotChocolate.Fusion.Utilities.csproj" />
     <ProjectReference Include="..\..\..\Mutable\src\Types.Mutable\HotChocolate.Types.Mutable.csproj" />
   </ItemGroup>