Gremlinq · danielcweber · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024
diff --git a/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.cs b/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.cs
@@ -7,7 +7,7 @@ public class EmptyProjectionValueProtectionSerializationTest : QueryExecutionTes
     {
         public class EmptyProjectionValueProtectionFixture : GremlinqFixture
         {
-            protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+            protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
                 .ConfigureEnvironment(_ => _
                     .ConfigureOptions(o => o.SetValue(GremlinqOption.EnableEmptyProjectionValueProtection, true)));
         }

diff --git a/test/Providers.CosmosDb.Tests/NoPasswordIntegrationTests.cs b/test/Providers.CosmosDb.Tests/NoPasswordIntegrationTests.cs
@@ -20,7 +20,7 @@ public class NoPasswordFixture : GremlinqFixture
             private const string CosmosDbEmulatorDatabaseName = "db";
             private const string CosmosDbEmulatorCollectionName = "graph";
 
-            protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+            protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
                 .UseCosmosDb<Vertex, Edge>(conf => conf
                     .At(new Uri("ws://localhost:8901"), CosmosDbEmulatorDatabaseName, CosmosDbEmulatorCollectionName)
                     .WithPartitionKey(x => x.Label!)

diff --git a/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs b/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs
@@ -23,7 +23,7 @@ public WrongPasswordGremlinServerContainerFixture() : base("PasswordSecureGremli
             {
             }
 
-            protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
+            protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
                 .UseGremlinServer<Vertex, Edge>(_ => _
                     .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)
                     .ConfigureClientFactory(factory => factory

diff --git a/test/Tests.Fixtures/CosmosDbEmulatorFixture.cs b/test/Tests.Fixtures/CosmosDbEmulatorFixture.cs
@@ -18,8 +18,10 @@ public class CosmosDbEmulatorFixture : GremlinqFixture
         private readonly string _collectionName = Guid.NewGuid().ToString("N");
         private bool _containerCreated;
 
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g)
+        public override async Task InitializeAsync()
         {
+            await base.InitializeAsync();
+
             using (var cosmosClient = new CosmosClient("https://localhost:8081", CosmosDbEmulatorAuthKey))
             {
                 await Policy
@@ -33,22 +35,6 @@ await Policy
                     });
 
                 _containerCreated = true;
-
-                return g
-                    .UseCosmosDb<Vertex, Edge>(conf => conf
-                        .At(new Uri("ws://localhost:8901"), CosmosDbEmulatorDatabaseName, _collectionName)
-                        .AuthenticateBy(CosmosDbEmulatorAuthKey)
-                        .WithPartitionKey(x => x.PartitionKey!)
-                        .UseNewtonsoftJson()
-                        .ConfigureClientFactory(factory => factory
-                            .ConfigureClient(client => client
-                                .ObserveResultStatusAttributes((_, attributes) =>
-                                {
-                                    Console.WriteLine(JsonSerializer.Serialize(attributes));
-                                }))))
-                    .ConfigureEnvironment(env => env
-                        .ConfigureOptions(options => options
-                            .SetValue(GremlinqOption.StringComparisonTranslationStrictness, StringComparisonTranslationStrictness.Lenient)));
             }
         }
 
@@ -67,5 +53,21 @@ await cosmosClient
 
             await base.DisposeAsync();
         }
+
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
+            .UseCosmosDb<Vertex, Edge>(conf => conf
+                .At(new Uri("ws://localhost:8901"), CosmosDbEmulatorDatabaseName, _collectionName)
+                .AuthenticateBy(CosmosDbEmulatorAuthKey)
+                .WithPartitionKey(x => x.PartitionKey!)
+                .UseNewtonsoftJson()
+                .ConfigureClientFactory(factory => factory
+                    .ConfigureClient(client => client
+                        .ObserveResultStatusAttributes((_, attributes) =>
+                        {
+                            Console.WriteLine(JsonSerializer.Serialize(attributes));
+                        }))))
+            .ConfigureEnvironment(env => env
+                .ConfigureOptions(options => options
+                    .SetValue(GremlinqOption.StringComparisonTranslationStrictness, StringComparisonTranslationStrictness.Lenient)));
     }
 }
diff --git a/test/Tests.Fixtures/CosmosDbFixture.cs b/test/Tests.Fixtures/CosmosDbFixture.cs
@@ -8,7 +8,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures
 {
     public class CosmosDbFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .UseCosmosDb<Vertex, Edge>(
                 builder => builder
                     .AtLocalhost("db", "graph")

diff --git a/test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs b/test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs
@@ -8,7 +8,7 @@ namespace ExRam.Gremlinq.Providers.Neptune.Tests
 {
     public class ElasticSearchNeptuneFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .UseNeptune<Vertex, Edge>(builder => builder
                 .AtLocalhost()
                 .UseElasticSearch(new Uri("http://elastic.search.server")))

diff --git a/test/Tests.Fixtures/GremlinServerContainerFixture.cs b/test/Tests.Fixtures/GremlinServerContainerFixture.cs
@@ -13,7 +13,7 @@ public GremlinServerContainerFixture() : base("tinkerpop/gremlin-server:3.7.2")
         {
         }
 
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
             .UseGremlinServer<Vertex, Edge>(_ => _
                 .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/GremlinServerFixture.cs b/test/Tests.Fixtures/GremlinServerFixture.cs
@@ -9,7 +9,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures
 {
     public class GremlinServerFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .UseGremlinServer<Vertex, Edge>(_ => _
                 .AtLocalhost()
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/GremlinServerWithoutProjectionContainerFixture.cs b/test/Tests.Fixtures/GremlinServerWithoutProjectionContainerFixture.cs
@@ -13,7 +13,7 @@ public GremlinServerWithoutProjectionContainerFixture() : base("tinkerpop/gremli
         {
         }
 
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
             .UseGremlinServer<Vertex, Edge>(_ => _
                 .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/GroovyGremlinQuerySerializationFixture.cs b/test/Tests.Fixtures/GroovyGremlinQuerySerializationFixture.cs
@@ -10,7 +10,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures
 {
     public class GroovyGremlinQuerySerializationFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .ConfigureEnvironment(env => env
                 .ConfigureSerializer(ser => ser
                     .Add(ConverterFactory

diff --git a/test/Tests.Fixtures/JanusGraphContainerFixture.cs b/test/Tests.Fixtures/JanusGraphContainerFixture.cs
@@ -15,7 +15,7 @@ public JanusGraphContainerFixture() : base("janusgraph/janusgraph:1.0.0")
 
         }
 
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
             .UseJanusGraph<Vertex, Edge>(builder => builder
                 .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/JanusGraphFixture.cs b/test/Tests.Fixtures/JanusGraphFixture.cs
@@ -9,7 +9,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures
 {
     public class JanusGraphFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .UseJanusGraph<Vertex, Edge>(builder => builder
                 .AtLocalhost()
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/NeptuneContainerFixture.cs b/test/Tests.Fixtures/NeptuneContainerFixture.cs
@@ -13,7 +13,7 @@ public NeptuneContainerFixture() : base("tinkerpop/gremlin-server:3.7.2")
         {
         }
 
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
             .UseNeptune<Vertex, Edge>(_ => _
                 .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/NeptuneFixture.cs b/test/Tests.Fixtures/NeptuneFixture.cs
@@ -9,7 +9,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures
 {
     public class NeptuneFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .UseNeptune<Vertex, Edge>(_ => _
                 .AtLocalhost()
                 .UseNewtonsoftJson())

diff --git a/test/Tests.Fixtures/PasswordSecuredGremlinServerContainerFixture.cs b/test/Tests.Fixtures/PasswordSecuredGremlinServerContainerFixture.cs
@@ -13,7 +13,7 @@ public PasswordSecuredGremlinServerContainerFixture() : base("PasswordSecureGrem
         {
         }
 
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
             .UseGremlinServer<Vertex, Edge>(_ => _
                 .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)
                 .ConfigureClientFactory(factory => factory

diff --git a/test/Tests.Fixtures/RequestMessageWithAliasGremlinServerFixture.cs b/test/Tests.Fixtures/RequestMessageWithAliasGremlinServerFixture.cs
@@ -8,7 +8,7 @@ namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
 {
     public class RequestMessageWithAliasGremlinServerFixture : GremlinqFixture
     {
-        protected override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g
+        protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g
             .UseGremlinServer<Vertex, Edge>(builder => builder
                 .AtLocalhost())
             .ConfigureEnvironment(env => env

diff --git a/test/Tests.Fixtures/TestContainerFixture.cs b/test/Tests.Fixtures/TestContainerFixture.cs
@@ -115,10 +115,10 @@ protected TestContainerFixtureBase(int port = 8182)
             _port = port;
         }
 
-        protected sealed override async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g)
+        protected sealed override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g)
         {
             if (_container is { } container)
-                return await TransformQuerySource(_container, new ContainerAttachedGremlinQuerySource(container, g));
+                return TransformQuerySource(_container, new ContainerAttachedGremlinQuerySource(container, g));
 
             throw new InvalidOperationException();
         }
@@ -168,6 +168,6 @@ public override async Task DisposeAsync()
 
         protected virtual ContainerBuilder CustomizeContainer(ContainerBuilder builder) => builder;
 
-        protected abstract Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g);
+        protected abstract IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g);
     }
 }
diff --git a/test/Tests.Infrastructure/GremlinqFixture.cs b/test/Tests.Infrastructure/GremlinqFixture.cs
@@ -11,11 +11,11 @@ public class GremlinqFixture : IAsyncLifetime
     {
         private IGremlinQuerySource? _g;
 
-        protected virtual async Task<IGremlinQuerySource> TransformQuerySource(IGremlinQuerySource g) => g;
+        protected virtual IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g;
 
         public virtual async Task InitializeAsync()
         {
-            _g = await TransformQuerySource(g
+            _g = TransformQuerySource(g
                 .ConfigureEnvironment(env => env
                     .UseModel(GraphModel.FromBaseTypes<Vertex, Edge>())
                     .AddGraphSonBinarySupport()));