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 2016/03/16 15:39:50 UTC
[08/50] incubator-tinkerpop git commit: Minor test refactoring and
uncommented tests that were ignored by accident.
Minor test refactoring and uncommented tests that were ignored by accident.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a347cad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a347cad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a347cad8
Branch: refs/heads/TINKERPOP-575
Commit: a347cad865778a752bbd3d643cea423940a73f31
Parents: 281fd43
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Mar 4 13:30:15 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 16 09:22:21 2016 -0400
----------------------------------------------------------------------
.../server/GremlinResultSetIntegrateTest.java | 23 +++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a347cad8/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
----------------------------------------------------------------------
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 5481560..279c09a 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,7 +25,6 @@ import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -44,7 +43,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -67,7 +66,7 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
@Override
public Settings overrideSettings(final Settings settings) {
- settings.scriptEngines.get("gremlin-groovy").scripts = Arrays.asList("scripts/generate-modern.groovy");
+ settings.scriptEngines.get("gremlin-groovy").scripts = Collections.singletonList("scripts/generate-modern.groovy");
return settings;
}
@@ -75,8 +74,8 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
public void beforeTest() {
final MessageSerializer serializer = new GryoMessageSerializerV1d0();
final Map<String,Object> c = new HashMap<>();
- c.put("ioRegistries", Arrays.asList(TinkerIoRegistry.class.getName()));
- c.put("custom", Arrays.asList("groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer"));
+ c.put("ioRegistries", Collections.singletonList(TinkerIoRegistry.class.getName()));
+ c.put("custom", Collections.singletonList("groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer"));
serializer.configure(c, null);
cluster = Cluster.build().serializer(serializer).create();
@@ -108,7 +107,6 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
});
}
- /*
@Test
public void shouldHandleNullResult() throws Exception {
final ResultSet results = client.submit("g.V().drop().iterate();null");
@@ -189,8 +187,8 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
final List<Result> resultList = results.all().get();
final Map m = resultList.get(0).get(HashMap.class);
assertEquals(2, m.size());
- assertEquals(3l, m.get(1l));
- assertEquals(3l, m.get(3l));
+ assertEquals(3L, m.get(1L));
+ assertEquals(3L, m.get(3L));
}
@Test
@@ -200,10 +198,9 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
assertEquals(2, resultList.size());
final Map.Entry firstEntry = resultList.get(0).get(HashMap.Entry.class);
final Map.Entry secondEntry = resultList.get(1).get(HashMap.Entry.class);
- assertThat(firstEntry.getKey(), anyOf(is(3l), is(1l)));
- assertThat(firstEntry.getValue(), is(3l));
- assertThat(secondEntry.getKey(), anyOf(is(3l), is(1l)));
- assertThat(secondEntry.getValue(), is(3l));
+ assertThat(firstEntry.getKey(), anyOf(is(3L), is(1L)));
+ assertThat(firstEntry.getValue(), is(3L));
+ assertThat(secondEntry.getKey(), anyOf(is(3L), is(1L)));
+ assertThat(secondEntry.getValue(), is(3L));
}
- */
}