diff --git a/test/Core.Tests/Debugging/DefaultDebugGremlinQuerySerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Debugging/DefaultDebugGremlinQuerySerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 3b981dc88..000000000 --- a/test/Core.Tests/Debugging/DefaultDebugGremlinQuerySerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -g.inject('Utc') \ No newline at end of file diff --git a/test/Core.Tests/Serialization/BytecodeQuerySerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/BytecodeQuerySerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 863cd5bba..000000000 --- a/test/Core.Tests/Serialization/BytecodeQuerySerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1,10 +0,0 @@ -{ - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] -} \ No newline at end of file diff --git a/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 863cd5bba..000000000 --- a/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1,10 +0,0 @@ -{ - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] -} \ No newline at end of file diff --git a/test/Core.Tests/Serialization/Graphson2BinaryMessageSerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/Graphson2BinaryMessageSerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index cc8af45de..000000000 --- a/test/Core.Tests/Serialization/Graphson2BinaryMessageSerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -!application/vnd.gremlin-v2.0+json{"requestId":"12345678-9012-3456-7890-123456789012","op":"bytecode","processor":"traversal","args":{"gremlin":{"@type":"g:Bytecode","@value":{"step":[["inject","Utc"]]}},"aliases":{"g":"g"}}} \ No newline at end of file diff --git a/test/Core.Tests/Serialization/Graphson3BinaryMessageSerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/Graphson3BinaryMessageSerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 2a439e240..000000000 --- a/test/Core.Tests/Serialization/Graphson3BinaryMessageSerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -!application/vnd.gremlin-v3.0+json{"requestId":"12345678-9012-3456-7890-123456789012","op":"bytecode","processor":"traversal","args":{"gremlin":{"@type":"g:Bytecode","@value":{"step":[["inject","Utc"]]}},"aliases":{"g":"g"}}} \ No newline at end of file diff --git a/test/Core.Tests/Serialization/GroovyGremlinQuerySerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/GroovyGremlinQuerySerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 27024cd29..000000000 --- a/test/Core.Tests/Serialization/GroovyGremlinQuerySerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1,6 +0,0 @@ -{ - Script: g.inject(_a), - Bindings: { - _a: Utc - } -} \ No newline at end of file diff --git a/test/Core.Tests/Serialization/OuterProjectionTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/OuterProjectionTest.RegisterNativeType.verified.txt deleted file mode 100644 index ad47dbb93..000000000 --- a/test/Core.Tests/Serialization/OuterProjectionTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/test/Core.Tests/Serialization/RequestMessageSerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/RequestMessageSerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 82959718c..000000000 --- a/test/Core.Tests/Serialization/RequestMessageSerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1,20 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: bytecode, - Processor: traversal, - Arguments: { - aliases: { - g: g - }, - gremlin: { - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] - } - } -} \ No newline at end of file diff --git a/test/Core.Tests/Serialization/RequestMessageWithGroovySerializationTest.RegisterNativeType.verified.txt b/test/Core.Tests/Serialization/RequestMessageWithGroovySerializationTest.RegisterNativeType.verified.txt deleted file mode 100644 index 0ad52a77a..000000000 --- a/test/Core.Tests/Serialization/RequestMessageWithGroovySerializationTest.RegisterNativeType.verified.txt +++ /dev/null @@ -1,14 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: eval, - Processor: , - Arguments: { - aliases: { - g: g - }, - bindings: { - _a: Utc - }, - gremlin: g.inject(_a) - } -} \ No newline at end of file diff --git a/test/Providers.CosmosDb.Tests/DebugTests.RegisterNativeType.verified.txt b/test/Providers.CosmosDb.Tests/DebugTests.RegisterNativeType.verified.txt deleted file mode 100644 index 3b981dc88..000000000 --- a/test/Providers.CosmosDb.Tests/DebugTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -g.inject('Utc') \ No newline at end of file diff --git a/test/Providers.CosmosDb.Tests/IntegrationTests.RegisterNativeType.verified.txt b/test/Providers.CosmosDb.Tests/IntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index c24176c64..000000000 --- a/test/Providers.CosmosDb.Tests/IntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ - Utc -] \ No newline at end of file diff --git a/test/Providers.CosmosDb.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt b/test/Providers.CosmosDb.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 0ad52a77a..000000000 --- a/test/Providers.CosmosDb.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,14 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: eval, - Processor: , - Arguments: { - aliases: { - g: g - }, - bindings: { - _a: Utc - }, - gremlin: g.inject(_a) - } -} \ No newline at end of file diff --git a/test/Providers.CosmosDb.Tests/SerializationTests.RegisterNativeType.verified.txt b/test/Providers.CosmosDb.Tests/SerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 27024cd29..000000000 --- a/test/Providers.CosmosDb.Tests/SerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,6 +0,0 @@ -{ - Script: g.inject(_a), - Bindings: { - _a: Utc - } -} \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/DebugTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/DebugTests.RegisterNativeType.verified.txt deleted file mode 100644 index 3b981dc88..000000000 --- a/test/Providers.GremlinServer.Tests/DebugTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -g.inject('Utc') \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/GroovyIntegrationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/GroovyIntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index c24176c64..000000000 --- a/test/Providers.GremlinServer.Tests/GroovyIntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ - Utc -] \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/IntegrationTests.cs b/test/Providers.GremlinServer.Tests/IntegrationTests.cs index b71058f45..17a115956 100644 --- a/test/Providers.GremlinServer.Tests/IntegrationTests.cs +++ b/test/Providers.GremlinServer.Tests/IntegrationTests.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json.Linq; +using ExRam.Gremlinq.Support.NewtonsoftJson; using static ExRam.Gremlinq.Core.Transformation.ConverterFactory; namespace ExRam.Gremlinq.Providers.GremlinServer.Tests @@ -263,5 +264,20 @@ public Task Project_to_null_entity() => _g .By(__ => __ .None())) .Verify(); + + [Fact] + public virtual async Task RegisterNativeType() + { + await _g + .ConfigureEnvironment(env => env + .RegisterNativeType( + (languageCode, env, _, recurse) => languageCode.ToString().ToLower(), + (valueToken, env, _, recurse) => Enum.TryParse(valueToken.Value(), true, out var res) + ? res + : default)) + .Inject("Utc") + .Cast() + .Verify(); + } } } diff --git a/test/Providers.GremlinServer.Tests/IntegrationWithoutProjectionTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/IntegrationWithoutProjectionTests.RegisterNativeType.verified.txt deleted file mode 100644 index c24176c64..000000000 --- a/test/Providers.GremlinServer.Tests/IntegrationWithoutProjectionTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ - Utc -] \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/LoggingIntegrationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/LoggingIntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 0d45c1611..000000000 --- a/test/Providers.GremlinServer.Tests/LoggingIntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - log: { - Level: Debug, - Category: LoggingFixture, - Message: Executing Gremlin query 12345678-9012-3456-7890-123456789012 with groovy script g.inject(_a)., - State: [ - { - requestId: 12345678-9012-3456-7890-123456789012 - }, - { - script: g.inject(_a) - }, - { - {OriginalFormat}: Executing Gremlin query {requestId} with groovy script {script}. - } - ] - } - } -] \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/ObjectQueryIntegrationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/ObjectQueryIntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index c24176c64..000000000 --- a/test/Providers.GremlinServer.Tests/ObjectQueryIntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ - Utc -] \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/PasswordSecuredIntegrationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/PasswordSecuredIntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index c24176c64..000000000 --- a/test/Providers.GremlinServer.Tests/PasswordSecuredIntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ - Utc -] \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 82959718c..000000000 --- a/test/Providers.GremlinServer.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,20 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: bytecode, - Processor: traversal, - Arguments: { - aliases: { - g: g - }, - gremlin: { - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] - } - } -} \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/RequestMessageWithAliasSerializationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/RequestMessageWithAliasSerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index b46cf18de..000000000 --- a/test/Providers.GremlinServer.Tests/RequestMessageWithAliasSerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,20 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: bytecode, - Processor: traversal, - Arguments: { - aliases: { - g: a - }, - gremlin: { - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] - } - } -} \ No newline at end of file diff --git a/test/Providers.GremlinServer.Tests/SerializationTests.RegisterNativeType.verified.txt b/test/Providers.GremlinServer.Tests/SerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 863cd5bba..000000000 --- a/test/Providers.GremlinServer.Tests/SerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,10 +0,0 @@ -{ - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] -} \ No newline at end of file diff --git a/test/Providers.JanusGraph.Tests/IntegrationTests.RegisterNativeType.verified.txt b/test/Providers.JanusGraph.Tests/IntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index ad47dbb93..000000000 --- a/test/Providers.JanusGraph.Tests/IntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/test/Providers.JanusGraph.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt b/test/Providers.JanusGraph.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 82959718c..000000000 --- a/test/Providers.JanusGraph.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,20 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: bytecode, - Processor: traversal, - Arguments: { - aliases: { - g: g - }, - gremlin: { - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] - } - } -} \ No newline at end of file diff --git a/test/Providers.JanusGraph.Tests/SerializationTests.RegisterNativeType.verified.txt b/test/Providers.JanusGraph.Tests/SerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 863cd5bba..000000000 --- a/test/Providers.JanusGraph.Tests/SerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,10 +0,0 @@ -{ - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] -} \ No newline at end of file diff --git a/test/Providers.Neptune.Tests/ElasticSearchSerializationTests.RegisterNativeType.verified.txt b/test/Providers.Neptune.Tests/ElasticSearchSerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index dc5d165aa..000000000 --- a/test/Providers.Neptune.Tests/ElasticSearchSerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,26 +0,0 @@ -{ - SourceInstructions: [ - { - OperatorName: withSideEffect, - Arguments: [ - Neptune#fts.endpoint, - http://elastic.search.server - ] - }, - { - OperatorName: withSideEffect, - Arguments: [ - Neptune#fts.queryType, - query_string - ] - } - ], - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] -} \ No newline at end of file diff --git a/test/Providers.Neptune.Tests/IntegrationTests.RegisterNativeType.verified.txt b/test/Providers.Neptune.Tests/IntegrationTests.RegisterNativeType.verified.txt deleted file mode 100644 index c24176c64..000000000 --- a/test/Providers.Neptune.Tests/IntegrationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ - Utc -] \ No newline at end of file diff --git a/test/Providers.Neptune.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt b/test/Providers.Neptune.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 82959718c..000000000 --- a/test/Providers.Neptune.Tests/RequestMessageSerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,20 +0,0 @@ -{ - RequestId: 12345678-9012-3456-7890-123456789012, - Operation: bytecode, - Processor: traversal, - Arguments: { - aliases: { - g: g - }, - gremlin: { - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] - } - } -} \ No newline at end of file diff --git a/test/Providers.Neptune.Tests/SerializationTests.RegisterNativeType.verified.txt b/test/Providers.Neptune.Tests/SerializationTests.RegisterNativeType.verified.txt deleted file mode 100644 index 863cd5bba..000000000 --- a/test/Providers.Neptune.Tests/SerializationTests.RegisterNativeType.verified.txt +++ /dev/null @@ -1,10 +0,0 @@ -{ - StepInstructions: [ - { - OperatorName: inject, - Arguments: [ - Utc - ] - } - ] -} \ No newline at end of file diff --git a/test/Support.NewtonsoftJson.Tests/RegisterNativeTypeTests.Serialization.verified.txt b/test/Support.NewtonsoftJson.Tests/RegisterNativeTypeTests.Serialization.verified.txt deleted file mode 100644 index f74f5e11c..000000000 --- a/test/Support.NewtonsoftJson.Tests/RegisterNativeTypeTests.Serialization.verified.txt +++ /dev/null @@ -1 +0,0 @@ -g.inject('fancyId') \ No newline at end of file diff --git a/test/Support.NewtonsoftJson.Tests/RegisterNativeTypeTests.cs b/test/Support.NewtonsoftJson.Tests/RegisterNativeTypeTests.cs deleted file mode 100644 index edcf38e4a..000000000 --- a/test/Support.NewtonsoftJson.Tests/RegisterNativeTypeTests.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Newtonsoft.Json.Linq; - -using static ExRam.Gremlinq.Core.GremlinQuerySource; - -namespace ExRam.Gremlinq.Support.NewtonsoftJson.Tests -{ - public class RegisterNativeTypeTests : VerifyBase - { - private readonly struct FancyId - { - public FancyId(string wrappedId) - { - WrappedId = wrappedId; - } - - public string WrappedId { get; } - } - - public RegisterNativeTypeTests() : base() - { - } - - [Fact] - public Task Serialization() => Verify(g - .ConfigureEnvironment(env => env - .UseNewtonsoftJson() - .RegisterNativeType( - (fancyId, env, _, recurse) => fancyId.WrappedId, - (jValue, env, _, recurse) => new FancyId(jValue.Value()!))) - .Inject(new FancyId("fancyId")) - .Debug()); - - //TODO: DeserializationTests - } -} diff --git a/test/Tests.Infrastructure/QueryExecutionTest.cs b/test/Tests.Infrastructure/QueryExecutionTest.cs index d3a326784..6e6acca24 100644 --- a/test/Tests.Infrastructure/QueryExecutionTest.cs +++ b/test/Tests.Infrastructure/QueryExecutionTest.cs @@ -6,7 +6,6 @@ using ExRam.Gremlinq.Tests.Entities; using static ExRam.Gremlinq.Core.Transformation.ConverterFactory; using ExRam.Gremlinq.Core; -using ExRam.Gremlinq.Support.NewtonsoftJson; using Newtonsoft.Json.Linq; using FluentAssertions; @@ -4909,20 +4908,5 @@ public virtual Task WithSideEffect2() => _g .WithSideEffect("sideEffectLabel", 36) .V() .Verify(); - - [Fact] - public virtual async Task RegisterNativeType() - { - await _g - .ConfigureEnvironment(env => env - .RegisterNativeType( - (languageCode, env, _, recurse) => languageCode.ToString().ToLower(), - (valueToken, env, _, recurse) => Enum.TryParse(valueToken.Value(), true, out var res) - ? res - : default)) - .Inject("Utc") - .Cast() - .Verify(); - } } }