You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/07/10 10:08:37 UTC

[tinkerpop] branch master updated: Moved gryo lite test to parameterization option CTR

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

spmallette 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 b207cd3  Moved gryo lite test to parameterization option CTR
     new 06601d9  Merge branch 'tp34'
b207cd3 is described below

commit b207cd3b29947449a3b9409919ebb01bb3c64a6e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Jul 10 06:07:59 2019 -0400

    Moved gryo lite test to parameterization option CTR
---
 .../server/GremlinResultSetIntegrateTest.java      | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index b002d36..bd46679 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
 import org.apache.tinkerpop.gremlin.driver.Tokens;
 import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0;
 import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
 import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
 import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
@@ -90,10 +91,17 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
         gryoV1d0Config.put("custom", Collections.singletonList("groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer"));
         gryoMessageSerializerV1d0.configure(gryoV1d0Config, null);
 
+        final MessageSerializer gryoLiteMessageSerializerV1d0 = new GryoLiteMessageSerializerV1d0();
+        final Map<String,Object> gryoLiteV1d0Config = new HashMap<>();
+        gryoLiteV1d0Config.put("ioRegistries", Collections.singletonList(TinkerIoRegistryV3d0.class.getName()));
+        gryoLiteV1d0Config.put("custom", Collections.singletonList("groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer"));
+        gryoLiteMessageSerializerV1d0.configure(gryoLiteV1d0Config, null);
+
         return Arrays.asList(new Object[][]{
                 {Serializers.GRAPHBINARY_V1D0, graphBinaryMessageSerializerV1},
                 {Serializers.GRYO_V3D0, gryoMessageSerializerV3d0},
-                {Serializers.GRYO_V1D0, gryoMessageSerializerV1d0}
+                {Serializers.GRYO_V1D0, gryoMessageSerializerV1d0},
+                {Serializers.GRYO_LITE_V1D0, gryoLiteMessageSerializerV1d0}
         });
     }
 
@@ -166,18 +174,6 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
     }
 
     @Test
-    public void shouldHandleVertexResultWithLiteSerialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_LITE_V1D0).create();
-        final Client clientLite = cluster.connect();
-        final ResultSet results = clientLite.submit("gmodern.V(1).next()");
-        final Vertex v = results.all().get().get(0).getVertex();
-        assertThat(v, instanceOf(ReferenceVertex.class));
-
-        assertEquals(1, v.id());
-        assertEquals("person", v.label());
-    }
-
-    @Test
     public void shouldHandleVertexPropertyResult() throws Exception {
         final ResultSet results = client.submit("gmodern.V().properties('name').next()");
         final VertexProperty<String> v = results.all().get().get(0).getVertexProperty();