You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by xi...@apache.org on 2024/09/24 19:48:20 UTC

(tinkerpop) branch master updated: CTR fix serializer test failures from merging

This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/master by this push:
     new a99b58cc48 CTR fix serializer test failures from merging
a99b58cc48 is described below

commit a99b58cc4890ff1adeda8f1dd5226afd41239d33
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Tue Sep 24 12:48:11 2024 -0700

    CTR fix serializer test failures from merging
---
 .../Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs | 6 +++---
 .../lib/structure/io/binary/internals/EdgeSerializer.js             | 5 ++++-
 .../gremlin-javascript/test/integration/traversal-test.js           | 4 ++--
 .../gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js  | 4 ++--
 .../gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js | 6 +++---
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
index d736a139f6..3fde6ba121 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
@@ -296,7 +296,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
         public void shouldUseMaterializedPropertiesTokenInV()
         {
             var connection = _connectionFactory.CreateRemoteConnection();
-            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+            var g = AnonymousTraversalSource.Traversal().With(connection);
             var vertices = g.With("materializeProperties", "tokens").V().ToList();
             foreach (var v in vertices)
             {
@@ -310,7 +310,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
         public void shouldUseMaterializedPropertiesTokenInE()
         {
             var connection = _connectionFactory.CreateRemoteConnection();
-            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+            var g = AnonymousTraversalSource.Traversal().With(connection);
             var edges = g.With("materializeProperties", "tokens").E().ToList();
             foreach (var e in edges)
             {
@@ -324,7 +324,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
         public void shouldUseMaterializedPropertiesTokenInVP()
         {
             var connection = _connectionFactory.CreateRemoteConnection();
-            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+            var g = AnonymousTraversalSource.Traversal().With(connection);
             var vps = g.With("materializeProperties", "tokens").V().Properties<VertexProperty>().ToList();
             foreach (var vp in vps)
             {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
index d93cbfdc10..d32b4a0ef6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
@@ -200,7 +200,10 @@ export default class EdgeSerializer {
       }
       cursor = cursor.slice(properties_len);
 
-      const v = new Edge(id, new Vertex(outVId, outVLabel, null), label, new Vertex(inVId, inVLabel, null), properties);
+      // null properties are deserialized into empty lists
+      const edge_props = properties ? properties : [];
+
+      const v = new Edge(id, new Vertex(outVId, outVLabel, null), label, new Vertex(inVId, inVLabel, null), edge_props);
       return { v, len };
     } catch (err) {
       throw this.ioc.utils.des_error({ serializer: this, args: arguments, cursor, err });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
index 4634e7e43a..6a3b51fd29 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
@@ -23,7 +23,7 @@
 
 import assert from 'assert';
 import { AssertionError } from 'assert';
-import { Vertex } from '../../lib/structure/graph.js';
+import {Edge, Vertex, VertexProperty} from '../../lib/structure/graph.js';
 import anon from '../../lib/process/anonymous-traversal.js';
 import { GraphTraversalSource, GraphTraversal, statics } from '../../lib/process/graph-traversal.js';
 import { SubgraphStrategy, ReadOnlyStrategy, SeedStrategy, ReservedKeysVerificationStrategy, EdgeLabelVerificationStrategy } from '../../lib/process/traversal-strategy.js';
@@ -141,7 +141,7 @@ describe('Traversal', function () {
         assert.ok(list);
         assert.strictEqual(list.length, 6);
         list.forEach(e => assert.ok(e instanceof Edge));
-        // due to the way edge is constructed, edge properties will be {} regardless if it's null or []
+        // due to the way edge is constructed, edge properties will be {} or []
         list.forEach(e => assert.strictEqual(Object.keys(e.properties).length, 0));
       });
     });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
index 89467ad8d1..35e7d737f9 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
@@ -202,7 +202,7 @@ describe('GraphBinary.AnySerializer', () => {
       },
 
       // EdgeSerializer
-      { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), null),
+      { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), []),
         b:[
           DataType.EDGE,0x00,
           DataType.STRING,0x00, 0x00,0x00,0x00,0x01, 0x41, // id
@@ -404,7 +404,7 @@ describe('GraphBinary.AnySerializer', () => {
 
       // EDGE
       { v:null,                                   b:[0x0D,0x01] },
-      { v:new Edge(1, new Vertex(2,'Person',null), 'has', new Vertex(3,'Pet',null), null),
+      { v:new Edge(1, new Vertex(2,'Person',null), 'has', new Vertex(3,'Pet',null), []),
         b:[
           0x0D,0x00,
           0x01,0x00, 0x00,0x00,0x00,0x01, // id
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js
index d217204bd3..b4426ce731 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/EdgeSerializer-test.js
@@ -47,7 +47,7 @@ describe('GraphBinary.EdgeSerializer', () => {
         0xFE,0x01, // parent
         0xFE,0x01, // properties
       ],
-      av:new Edge('', new Vertex('','',null), '', new Vertex('','',null), null),
+      av:new Edge('', new Vertex('','',null), '', new Vertex('','',null), []),
     },
     { v:null, fq:1, b:[0x0D,0x01] },
     { v:null, fq:0,
@@ -61,10 +61,10 @@ describe('GraphBinary.EdgeSerializer', () => {
         0xFE,0x01, // parent
         0xFE,0x01, // properties
       ],
-      av:new Edge('', new Vertex('','',null), '', new Vertex('','',null), null),
+      av:new Edge('', new Vertex('','',null), '', new Vertex('','',null), []),
     },
 
-    { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), null),
+    { v:new Edge('A', new Vertex('B','Person',null), 'has', new Vertex('C','Pet',null), []),
       b:[
         0x03,0x00, 0x00,0x00,0x00,0x01, 0x41, // id
         0x00,0x00,0x00,0x03, ...from('has'), // label