.

Author: SimonCropp

src/Tests/ConnectionConverter/ConnectionConverterTests.cs

@@ -42,7 +42,7 @@ public async Task Queryable(int? first, int? after, int? last, int? before)
         var fieldContext = new ResolveFieldContext<string>();
         await using var database = await sqlInstance.Build(databaseSuffix: $"{first.GetValueOrDefault(0)}{after.GetValueOrDefault(0)}{last.GetValueOrDefault(0)}{before.GetValueOrDefault(0)}");
         var entities = database.Context.Entities;
-        var connection = await ConnectionConverter.ApplyConnectionContext<string, Entity>(entities.OrderBy(x=>x.Property), first, after, last, before, fieldContext, new());
+        var connection = await ConnectionConverter.ApplyConnectionContext<MyContext, string, Entity>(entities.OrderBy(x=>x.Property), first, after, last, before, fieldContext, new(), Cancel.None,database.Context);
         await Verify(connection.Items!.OrderBy(_ => _!.Property))
             .UseParameters(first, after, last, before);
     }

src/Tests/GlobalFiltersTests.cs

@@ -1,30 +1,30 @@
-using Filters = GraphQL.EntityFramework.Filters<T>;
-
-public class GlobalFiltersTests
+public class GlobalFiltersTests
 {
     [Fact]
     public async Task Simple()
     {
-        var filters = new Filters();
-        filters.Add<Target>((_, _, target) => target.Property != "Ignore");
-        Assert.True(await filters.ShouldInclude(new(), null, new Target()));
-        Assert.False(await filters.ShouldInclude<object>(new(), null, null));
-        Assert.True(await filters.ShouldInclude(new(), null, new Target {Property = "Include"}));
-        Assert.False(await filters.ShouldInclude(new(), null, new Target {Property = "Ignore"}));
-
-        filters.Add<BaseTarget>((_, _, target) => target.Property != "Ignore");
-        Assert.True(await filters.ShouldInclude(new(), null, new ChildTarget()));
-        Assert.True(await filters.ShouldInclude(new(), null, new ChildTarget {Property = "Include"}));
-        Assert.False(await filters.ShouldInclude(new(), null, new ChildTarget {Property = "Ignore"}));
-
-        filters.Add<ITarget>((_, _, target) => target.Property != "Ignore");
-        Assert.True(await filters.ShouldInclude(new(), null, new ImplementationTarget()));
-        Assert.True(await filters.ShouldInclude(new(), null, new ImplementationTarget { Property = "Include"}));
-        Assert.False(await filters.ShouldInclude(new(), null, new ImplementationTarget { Property = "Ignore" }));
-
-        Assert.True(await filters.ShouldInclude(new(), null, new NonTarget { Property = "Foo" }));
+        var filters = new Filters<MyContext>();
+        filters.Add<Target>((_, _, _, target) => target.Property != "Ignore");
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new Target()));
+        Assert.False(await filters.ShouldInclude<object>(new(), new(), null, null));
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new Target {Property = "Include"}));
+        Assert.False(await filters.ShouldInclude(new(), new(), null, new Target {Property = "Ignore"}));
+
+        filters.Add<BaseTarget>((_, _, _,  target) => target.Property != "Ignore");
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new ChildTarget()));
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new ChildTarget {Property = "Include"}));
+        Assert.False(await filters.ShouldInclude(new(), new(), null, new ChildTarget {Property = "Ignore"}));
+
+        filters.Add<ITarget>((_, _, _,  target) => target.Property != "Ignore");
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new ImplementationTarget()));
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new ImplementationTarget { Property = "Include"}));
+        Assert.False(await filters.ShouldInclude(new(), new(), null, new ImplementationTarget { Property = "Ignore" }));
+
+        Assert.True(await filters.ShouldInclude(new(), new(), null, new NonTarget { Property = "Foo" }));
     }
 
+    public class MyContext : DbContext;
+
     public class NonTarget
     {
         public string? Property { get; set; }

src/Tests/IntegrationTests/IntegrationTests_filtered.cs

@@ -1,6 +1,4 @@
-using Filters = GraphQL.EntityFramework.Filters;
-
-public partial class IntegrationTests
+public partial class IntegrationTests
 {
     [Fact]
     public async Task Child_filtered()
@@ -39,11 +37,11 @@ public async Task Child_filtered()
         await RunQuery(database, query, null, BuildFilters(), false, [entity1, entity2, entity3]);
     }
 
-    static Filters BuildFilters()
+    static Filters<IntegrationDbContext> BuildFilters()
     {
-        var filters = new Filters();
-        filters.Add<FilterParentEntity>((_, _, item) => item.Property != "Ignore");
-        filters.Add<FilterChildEntity>((_, _, item) => item.Property != "Ignore");
+        var filters = new Filters<IntegrationDbContext>();
+        filters.Add<FilterParentEntity>((_, _, _, item) => item.Property != "Ignore");
+        filters.Add<FilterChildEntity>((_, _, _, item) => item.Property != "Ignore");
         return filters;
     }