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 2015/03/11 19:26:38 UTC
[22/50] [abbrv] incubator-tinkerpop git commit: more more tests..
more more tests..
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3b2c35fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3b2c35fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3b2c35fe
Branch: refs/heads/master
Commit: 3b2c35fe035b8d684a1521c5dadf2c2864e043aa
Parents: 899429c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 9 16:06:45 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 9 16:06:45 2015 -0600
----------------------------------------------------------------------
.../process/computer/GraphComputerTest.java | 30 +++---
.../gremlin/structure/FeatureSupportTest.java | 108 +++++++++----------
.../structure/GraphConstructionTest.java | 4 +-
.../structure/GraphReadPerformanceTest.java | 4 +-
.../gremlin/structure/SerializationTest.java | 38 +++----
.../util/detached/DetachedEdgeTest.java | 8 +-
.../detached/DetachedVertexPropertyTest.java | 20 ++--
7 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 4dbf2e0..5ce2e26 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -131,7 +131,7 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
public void shouldNotAllowBadGraphComputers() {
try {
- g.compute(BadGraphComputer.class);
+ graph.compute(BadGraphComputer.class);
fail("Providing a bad graph computer class should fail");
} catch (Exception ex) {
validateException(Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(BadGraphComputer.class), ex);
@@ -247,9 +247,9 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
} catch (IllegalArgumentException e) {
assertEquals(Memory.Exceptions.memoryDoesNotExist("BAD").getMessage(), e.getMessage());
}
- assertEquals(Long.valueOf(6), results.graph().V().count().next());
+ assertEquals(Long.valueOf(6), results.graph().traversal().V().count().next());
- results.graph().V().forEachRemaining(v -> {
+ results.graph().traversal().V().forEachRemaining(v -> {
assertTrue(v.property("nameLengthCounter").isPresent());
assertEquals(Integer.valueOf(v.<String>value("name").length() * 2), Integer.valueOf(v.<Integer>value("nameLengthCounter")));
});
@@ -320,39 +320,39 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
public static class ComputerTest extends GraphComputerTest {
@Override
public GraphComputer get_g_compute() {
- return g.compute();
+ return graph.compute();
}
@Override
public GraphComputer get_g_compute_setupXX_executeXX_terminateXtrueX() {
- return g.compute().program(LambdaVertexProgram.build().create());
+ return graph.compute().program(LambdaVertexProgram.build().create());
}
@Override
public GraphComputer get_g_compute_setupXX_executeXX_terminateXtrueX_memoryKeysXset_incr_and_orX() {
- return g.compute().program(LambdaVertexProgram.build().memoryComputeKeys("set", "incr", "and", "or").create());
+ return graph.compute().program(LambdaVertexProgram.build().memoryComputeKeys("set", "incr", "and", "or").create());
}
@Override
public GraphComputer get_g_compute_setupXX_executeXX_terminateXtrueX_memoryKeysXnullX() {
- return g.compute().program(LambdaVertexProgram.build().memoryComputeKeys(new HashSet<String>() {{
+ return graph.compute().program(LambdaVertexProgram.build().memoryComputeKeys(new HashSet<String>() {{
add(null);
}}).create());
}
@Override
public GraphComputer get_g_compute_setupXX_executeXX_terminateXtrueX_memoryKeysX_X() {
- return g.compute().program(LambdaVertexProgram.build().memoryComputeKeys("").create());
+ return graph.compute().program(LambdaVertexProgram.build().memoryComputeKeys("").create());
}
@Override
public GraphComputer get_g_compute_setupXsetXa_trueXX_executeXX_terminateXtrueX() {
- return g.compute().program(LambdaVertexProgram.build().setup(m -> m.set("a", true)).create());
+ return graph.compute().program(LambdaVertexProgram.build().setup(m -> m.set("a", true)).create());
}
@Override
public GraphComputer get_g_compute_setupXX_executeXv_blah_m_incrX_terminateX1X_elementKeysXnameLengthCounterX_memoryKeysXa_bX() {
- return g.compute().program(LambdaVertexProgram.build().
+ return graph.compute().program(LambdaVertexProgram.build().
setup(memory -> {
}).
execute((vertex, messenger, memory) -> {
@@ -381,7 +381,7 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public GraphComputer get_g_compute_setupXabcdeX_executeXtestMemoryX_terminateXtestMemoryXmemoryKeysXabcdeX() {
- return g.compute().program(LambdaVertexProgram.build().
+ return graph.compute().program(LambdaVertexProgram.build().
setup(memory -> {
memory.set("a", 0l);
memory.set("b", 0l);
@@ -436,7 +436,7 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public GraphComputer get_g_compute_mapXageX_reduceXsumX_memoryXnextX_memoryKeyXageSumX() {
- return g.compute().mapReduce(LambdaMapReduce.<MapReduce.NullObject, Integer, MapReduce.NullObject, Integer, Integer>build()
+ return graph.compute().mapReduce(LambdaMapReduce.<MapReduce.NullObject, Integer, MapReduce.NullObject, Integer, Integer>build()
.map((v, e) -> v.<Integer>property("age").ifPresent(age -> e.emit(MapReduce.NullObject.instance(), age)))
.reduce((k, vv, e) -> e.emit(StreamFactory.stream(vv).mapToInt(i -> i).sum()))
.memory(i -> i.next().getValue())
@@ -445,7 +445,7 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public GraphComputer get_g_compute_executeXcounterX_terminateX8X_mapreduceXcounter_aX_mapreduceXcounter_bX() {
- return g.compute().program(LambdaVertexProgram.build()
+ return graph.compute().program(LambdaVertexProgram.build()
.execute((vertex, messenger, memory) -> {
vertex.property(VertexProperty.Cardinality.single, "counter", memory.isInitialIteration() ? 1 : vertex.<Integer>value("counter") + 1);
})
@@ -474,7 +474,7 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public GraphComputer get_g_compute_mapXidX_reduceXidX_reduceKeySortXreverseX_memoryKeyXidsX() {
- return g.compute().mapReduce(LambdaMapReduce.<Long, Long, Long, Long, List<Long>>build()
+ return graph.compute().mapReduce(LambdaMapReduce.<Long, Long, Long, Long, List<Long>>build()
.map((vertex, emitter) -> emitter.emit(Long.valueOf(vertex.id().toString()), Long.valueOf(vertex.id().toString())))
.reduce((key, values, emitter) -> values.forEachRemaining(id -> emitter.emit(id, id)))
.memoryKey("ids")
@@ -489,7 +489,7 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public GraphComputer get_g_compute_programXTraversalVertexProgram_build_traversalXg_V_both_hasXlabel_personX_age_groupCountXaXX_create() {
- return g.compute().program(TraversalVertexProgram.build().
+ return graph.compute().program(TraversalVertexProgram.build().
// TODO: need to set the engine to be computer
traversal("GraphFactory.open(['gremlin.graph':'" + g.getClass().getCanonicalName() + "']).V().both().has(label,'person').values('age').groupCount('a')").
create());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
index d8fc09d..69dea3c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
@@ -63,7 +63,7 @@ public class FeatureSupportTest {
*/
@Test
public void shouldHaveStandardToStringRepresentation() {
- assertTrue(g.features().toString().startsWith("FEATURES"));
+ assertTrue(graph.features().toString().startsWith("FEATURES"));
}
}
@@ -85,7 +85,7 @@ public class FeatureSupportTest {
@Test
public void shouldPrintTheFeatureList() {
System.out.println(String.format("Printing Features of %s for reference: ", g.getClass().getSimpleName()));
- System.out.println(g.features());
+ System.out.println(graph.features());
assertTrue(true);
}
@@ -97,7 +97,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = GraphFeatures.class, feature = FEATURE_COMPUTER, supported = false)
public void shouldSupportComputerIfAGraphCanCompute() throws Exception {
try {
- g.compute();
+ graph.compute();
fail(String.format(INVALID_FEATURE_SPECIFICATION, GraphFeatures.class.getSimpleName(), FEATURE_COMPUTER));
} catch (Exception e) {
validateException(Graph.Exceptions.graphComputerNotSupported(), e);
@@ -112,7 +112,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = GraphFeatures.class, feature = FEATURE_TRANSACTIONS, supported = false)
public void shouldSupportTransactionsIfAGraphConstructsATx() throws Exception {
try {
- g.tx();
+ graph.tx();
fail(String.format(INVALID_FEATURE_SPECIFICATION, GraphFeatures.class.getSimpleName(), FEATURE_TRANSACTIONS));
} catch (Exception e) {
validateException(Graph.Exceptions.transactionsNotSupported(), e);
@@ -127,7 +127,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VariableFeatures.class, feature = FEATURE_VARIABLES, supported = false)
public void shouldSupportMemoryIfAGraphAcceptsMemory() throws Exception {
try {
- g.variables();
+ graph.variables();
fail(String.format(INVALID_FEATURE_SPECIFICATION, Graph.Features.VariableFeatures.class.getSimpleName(), FEATURE_VARIABLES));
} catch (Exception e) {
validateException(Graph.Exceptions.variablesNotSupported(), e);
@@ -139,7 +139,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_THREADED_TRANSACTIONS, supported = false)
public void shouldThrowOnThreadedTransactionNotSupported() {
try {
- g.tx().create();
+ graph.tx().create();
fail("An exception should be thrown since the threaded transaction feature is not supported");
} catch (Exception e) {
validateException(Transaction.Exceptions.threadedTransactionsNotSupported(), e);
@@ -169,7 +169,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES, supported = false)
public void shouldSupportAddVerticesIfAVertexCanBeAdded() throws Exception {
try {
- g.addVertex();
+ graph.addVertex();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_ADD_VERTICES));
} catch (Exception e) {
validateException(Graph.Exceptions.vertexAdditionsNotSupported(), e);
@@ -181,7 +181,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
public void shouldSupportUserSuppliedIdsIfAnIdCanBeAssignedToVertex() throws Exception {
try {
- g.addVertex(T.id, GraphManager.getGraphProvider().convertId(99999943835l));
+ graph.addVertex(T.id, GraphManager.getGraphProvider().convertId(99999943835l));
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_USER_SUPPLIED_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsNotSupported(), e);
@@ -194,7 +194,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_STRING_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeString() throws Exception {
try {
- g.addVertex(T.id, "this-is-a-valid-id");
+ graph.addVertex(T.id, "this-is-a-valid-id");
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_STRING_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), e);
@@ -207,14 +207,14 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_NUMERIC_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeNumeric() throws Exception {
try {
- g.addVertex(T.id, 123456);
+ graph.addVertex(T.id, 123456);
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), e);
}
try {
- g.addVertex(T.id, 123456l);
+ graph.addVertex(T.id, 123456l);
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), e);
@@ -227,7 +227,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_UUID_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeUuid() throws Exception {
try {
- g.addVertex(T.id, UUID.randomUUID());
+ graph.addVertex(T.id, UUID.randomUUID());
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_UUID_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), e);
@@ -240,7 +240,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_ANY_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeAny() throws Exception {
try {
- g.addVertex(T.id, new Date());
+ graph.addVertex(T.id, new Date());
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_ANY_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), e);
@@ -252,7 +252,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_STRING_IDS, supported = false)
public void shouldSupportStringIdsIfStringIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
if (v.id() instanceof String)
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_STRING_IDS));
}
@@ -262,7 +262,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_UUID_IDS, supported = false)
public void shouldSupportStringIdsIfUuidIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
if (v.id() instanceof UUID)
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_UUID_IDS));
}
@@ -272,7 +272,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_NUMERIC_IDS, supported = false)
public void shouldSupportStringIdsIfNumericIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
if (v.id() instanceof Number)
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
}
@@ -282,7 +282,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_ADD_PROPERTY, supported = false)
public void shouldSupportAddVertexPropertyIfItCanBeAdded() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("should", "not-add-property");
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_ADD_PROPERTY));
} catch (Exception e) {
@@ -295,7 +295,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldSupportRemoveVerticesIfAVertexCanBeRemoved() throws Exception {
try {
- g.addVertex().remove();
+ graph.addVertex().remove();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_REMOVE_VERTICES));
} catch (Exception e) {
validateException(Vertex.Exceptions.vertexRemovalNotSupported(), e);
@@ -307,7 +307,7 @@ public class FeatureSupportTest {
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldSupportRemovePropertyIfAPropertyCanBeRemoved() throws Exception {
try {
- final Vertex v = g.addVertex("name", "me");
+ final Vertex v = graph.addVertex("name", "me");
v.property("name").remove();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_REMOVE_PROPERTY));
} catch (Exception e) {
@@ -339,7 +339,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldSupportAddEdgesIfEdgeCanBeAdded() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("friend", v);
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_ADD_EDGES));
} catch (Exception e) {
@@ -353,7 +353,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = EdgeFeatures.FEATURE_USER_SUPPLIED_IDS, supported = false)
public void shouldSupportUserSuppliedIdsIfAnIdCanBeAssignedToEdge() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("friend", v, T.id, GraphManager.getGraphProvider().convertId(99999943835l));
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_USER_SUPPLIED_IDS));
} catch (Exception e) {
@@ -367,7 +367,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = FEATURE_STRING_IDS, supported = false)
public void shouldSupportStringIdsIfStringIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("knows", v);
if (e.id() instanceof String)
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_STRING_IDS));
@@ -379,7 +379,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = FEATURE_UUID_IDS, supported = false)
public void shouldSupportStringIdsIfUuidIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("knows", v);
if (e.id() instanceof UUID)
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_UUID_IDS));
@@ -391,7 +391,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = EdgeFeatures.class, feature = FEATURE_NUMERIC_IDS, supported = false)
public void shouldSupportStringIdsIfNumericIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("knows", v);
if (e.id() instanceof Number)
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
@@ -403,7 +403,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_STRING_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeString() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("test", v, T.id, "this-is-a-valid-id");
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_STRING_IDS));
} catch (Exception e) {
@@ -417,7 +417,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_NUMERIC_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeNumeric() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("test", v, T.id, 123456);
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
} catch (Exception e) {
@@ -425,7 +425,7 @@ public class FeatureSupportTest {
}
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("test", v, T.id, 123456l);
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
} catch (Exception e) {
@@ -439,7 +439,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_UUID_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeUuid() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("test", v, T.id, UUID.randomUUID());
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_ANY_IDS));
} catch (Exception e) {
@@ -454,7 +454,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_ANY_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeAny() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("test", v, T.id, new Date());
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), FEATURE_ANY_IDS));
} catch (Exception e) {
@@ -468,7 +468,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = EdgeFeatures.FEATURE_ADD_PROPERTY, supported = false)
public void shouldSupportAddVertexPropertyIfItCanBeAdded() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("test", v);
e.property("should", "not-add-property");
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgePropertyFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_ADD_PROPERTY));
@@ -483,7 +483,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldSupportRemoveEdgesIfEdgeCanBeRemoved() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.addEdge("friend", v);
v.remove();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_REMOVE_EDGES));
@@ -497,7 +497,7 @@ public class FeatureSupportTest {
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldSupportRemovePropertyIfAPropertyCanBeRemoved() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("label", v);
e.property("name").remove();
fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_REMOVE_PROPERTY));
@@ -534,7 +534,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = EdgeFeatures.FEATURE_ADD_PROPERTY)
public void shouldEnableFeatureOnEdgeIfNotEnabled() throws Exception {
- assumeThat(g.features().supports(EdgePropertyFeatures.class, featureName), is(false));
+ assumeThat(graph.features().supports(EdgePropertyFeatures.class, featureName), is(false));
try {
final Edge edge = createEdgeForPropertyFeatureTests();
edge.property("aKey", value);
@@ -547,9 +547,9 @@ public class FeatureSupportTest {
@Test
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldEnableFeatureOnVertexIfNotEnabled() throws Exception {
- assumeThat(g.features().supports(VertexPropertyFeatures.class, featureName), is(false));
+ assumeThat(graph.features().supports(VertexPropertyFeatures.class, featureName), is(false));
try {
- g.addVertex("aKey", value);
+ graph.addVertex("aKey", value);
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), featureName));
} catch (Exception e) {
validateException(Property.Exceptions.dataTypeOfPropertyValueNotSupported(value), e);
@@ -557,8 +557,8 @@ public class FeatureSupportTest {
}
private Edge createEdgeForPropertyFeatureTests() {
- final Vertex vertexA = g.addVertex();
- final Vertex vertexB = g.addVertex();
+ final Vertex vertexA = graph.addVertex();
+ final Vertex vertexB = graph.addVertex();
return vertexA.addEdge(GraphManager.getGraphProvider().convertLabel("knows"), vertexB);
}
}
@@ -592,9 +592,9 @@ public class FeatureSupportTest {
@Test
@FeatureRequirement(featureClass = Graph.Features.VariableFeatures.class, feature = Graph.Features.VariableFeatures.FEATURE_VARIABLES)
public void shouldEnableFeatureOnGraphIfNotEnabled() throws Exception {
- assumeThat(g.features().supports(Graph.Features.VariableFeatures.class, featureName), is(false));
+ assumeThat(graph.features().supports(Graph.Features.VariableFeatures.class, featureName), is(false));
try {
- final Graph.Variables variables = g.variables();
+ final Graph.Variables variables = graph.variables();
variables.set("aKey", value);
fail(String.format(INVALID_FEATURE_SPECIFICATION, Graph.Features.VariableFeatures.class.getSimpleName(), featureName));
} catch (Exception e) {
@@ -619,7 +619,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS, supported = false)
public void shouldSupportUserSuppliedIdsIfAnIdCanBeAssigned() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("name", "me", T.id, GraphManager.getGraphProvider().convertId(99999943835l));
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS));
} catch (Exception ex) {
@@ -633,7 +633,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_STRING_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeString() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("test", v, T.id, "this-is-a-valid-id");
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_STRING_IDS));
} catch (Exception ex) {
@@ -647,7 +647,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_NUMERIC_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeNumeric() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("test", v, T.id, 123456);
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
} catch (Exception ex) {
@@ -655,7 +655,7 @@ public class FeatureSupportTest {
}
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("test", v, T.id, 123456l);
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS));
} catch (Exception ex) {
@@ -669,7 +669,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_UUID_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeUuid() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("test", v, T.id, UUID.randomUUID());
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_ANY_IDS));
} catch (Exception ex) {
@@ -684,7 +684,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_ANY_IDS, supported = false)
public void shouldSupportUserSuppliedIdsOfTypeAny() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("test", v, T.id, new Date());
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_ANY_IDS));
} catch (Exception ex) {
@@ -697,7 +697,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_STRING_IDS, supported = false)
public void shouldSupportStringIdsIfStringIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty p = v.property("name", "stephen");
if (p.id() instanceof String)
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), VertexPropertyFeatures.FEATURE_STRING_IDS));
@@ -708,7 +708,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_UUID_IDS, supported = false)
public void shouldSupportStringIdsIfUuidIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty p = v.property("name", "stephen");
if (p.id() instanceof UUID)
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), VertexPropertyFeatures.FEATURE_UUID_IDS));
@@ -719,7 +719,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_NUMERIC_IDS, supported = false)
public void shouldSupportStringIdsIfNumericIdsAreGeneratedFromTheGraph() throws Exception {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty p = v.property("name", "stephen");
if (p.id() instanceof Number)
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), VertexPropertyFeatures.FEATURE_NUMERIC_IDS));
@@ -732,7 +732,7 @@ public class FeatureSupportTest {
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldSupportRemovePropertyIfAPropertyCanBeRemoved() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty p = v.property("name", "me", "test", "this");
p.property("test").remove();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), VertexPropertyFeatures.FEATURE_REMOVE_PROPERTY));
@@ -747,7 +747,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_MULTI_PROPERTIES, supported = false)
public void shouldSupportMultiPropertyIfTheSameKeyCanBeAssignedMoreThanOnce() throws Exception {
try {
- final Vertex v = g.addVertex("name", "stephen", "name", "steve");
+ final Vertex v = graph.addVertex("name", "stephen", "name", "steve");
if (2 == IteratorUtils.count(v.properties()))
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_MULTI_PROPERTIES));
} catch (Exception ex) {
@@ -762,7 +762,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = VertexPropertyFeatures.FEATURE_ADD_PROPERTY)
public void shouldSupportMetaPropertyIfPropertiesCanBePutOnProperties() throws Exception {
try {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
v.property("name", "stephen", "property", "on-property");
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_META_PROPERTIES));
} catch (Exception ex) {
@@ -777,7 +777,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = VertexPropertyFeatures.FEATURE_ADD_PROPERTY)
public void shouldSupportMetaPropertyIfPropertiesCanBePutOnPropertiesViaVertexProperty() throws Exception {
try {
- final Vertex v = g.addVertex("name", "stephen");
+ final Vertex v = graph.addVertex("name", "stephen");
v.property("name").property("property", "on-property");
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_META_PROPERTIES));
} catch (Exception ex) {
@@ -792,7 +792,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = VertexPropertyFeatures.FEATURE_ADD_PROPERTY)
public void shouldSupportMetaPropertyIfPropertiesHaveAnIteratorViaVertexProperty() throws Exception {
try {
- final Vertex v = g.addVertex("name", "stephen");
+ final Vertex v = graph.addVertex("name", "stephen");
v.property("name").properties();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_META_PROPERTIES));
} catch (Exception ex) {
@@ -816,7 +816,7 @@ public class FeatureSupportTest {
@Before
public void innerSetup() {
- final Graph.Features f = g.features();
+ final Graph.Features f = graph.features();
edgeFeatures = f.edge();
edgePropertyFeatures = edgeFeatures.properties();
graphFeatures = f.graph();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java
index 82c6e25..9243c28 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphConstructionTest.java
@@ -41,7 +41,7 @@ public class GraphConstructionTest extends AbstractGremlinTest {
*/
@Test
public void shouldOpenGraphThroughGraphFactoryViaApacheConfig() throws Exception {
- final Graph expectedGraph = g;
+ final Graph expectedGraph = graph;
final Configuration c = graphProvider.newGraphConfiguration("temp1", this.getClass(), name.getMethodName());
final Graph createdGraph = GraphFactory.open(c);
@@ -56,7 +56,7 @@ public class GraphConstructionTest extends AbstractGremlinTest {
*/
@Test
public void shouldConstructAnEmptyGraph() {
- assertVertexEdgeCounts(0, 0).accept(g);
+ assertVertexEdgeCounts(0, 0).accept(graph);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java
index 813ffc7..164c944 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphReadPerformanceTest.java
@@ -88,7 +88,7 @@ public class GraphReadPerformanceTest {
// read the vertices 10 times over
for (int ix = 0; ix < 10; ix++) {
- g.vertices().forEachRemaining(vertex -> {
+ graph.vertices().forEachRemaining(vertex -> {
assertNotNull(vertex.value("name"));
counter.incrementAndGet();
});
@@ -105,7 +105,7 @@ public class GraphReadPerformanceTest {
// read the vertices 10 times over
for (int ix = 0; ix < 10; ix++) {
- g.edges().forEachRemaining(edge -> {
+ graph.edges().forEachRemaining(edge -> {
assertNotNull(edge.value("weight"));
counter.incrementAndGet();
});
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index 373f50b..c0593d0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -53,9 +53,9 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeVertexAsDetached() throws Exception {
- final GryoMapper gryoMapper = g.io().gryoMapper().create();
+ final GryoMapper gryoMapper = graph.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
- final Vertex v = g.vertices(convertToVertexId("marko")).next();
+ final Vertex v = graph.vertices(convertToVertexId("marko")).next();
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
final Output output = new Output(stream);
kryo.writeObject(output, v);
@@ -74,7 +74,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeEdgeAsDetached() throws Exception {
- final GryoMapper gryoMapper = g.io().gryoMapper().create();
+ final GryoMapper gryoMapper = graph.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
final Edge e = g.E(convertToEdgeId("marko", "knows", "vadas")).next();
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -93,7 +93,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializePropertyAsDetached() throws Exception {
- final GryoMapper gryoMapper = g.io().gryoMapper().create();
+ final GryoMapper gryoMapper = graph.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -111,9 +111,9 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeVertexPropertyAsDetached() throws Exception {
- final GryoMapper gryoMapper = g.io().gryoMapper().create();
+ final GryoMapper gryoMapper = graph.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
- final VertexProperty vp = g.vertices(convertToVertexId("marko")).next().property("name");
+ final VertexProperty vp = graph.vertices(convertToVertexId("marko")).next().property("name");
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
final Output output = new Output(stream);
kryo.writeObject(output, vp);
@@ -131,9 +131,9 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.CREW)
public void shouldSerializeVertexPropertyWithPropertiesAsDetached() throws Exception {
- final GryoMapper gryoMapper = g.io().gryoMapper().create();
+ final GryoMapper gryoMapper = graph.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
- final VertexProperty<?> vp = g.vertices(convertToVertexId("marko")).next().properties("location").next();
+ final VertexProperty<?> vp = graph.vertices(convertToVertexId("marko")).next().properties("location").next();
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
final Output output = new Output(stream);
kryo.writeObject(output, vp);
@@ -155,7 +155,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializePathAsDetached() throws Exception {
- final GryoMapper gryoMapper = g.io().gryoMapper().create();
+ final GryoMapper gryoMapper = graph.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
final Path p = g.V(convertToVertexId("marko")).as("a").outE().as("b").inV().as("c").path()
.filter(t -> ((Vertex) t.get().objects().get(2)).value("name").equals("lop")).next();
@@ -207,8 +207,8 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeVertex() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
- final Vertex v = g.vertices(convertToVertexId("marko")).next();
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
+ final Vertex v = graph.vertices(convertToVertexId("marko")).next();
final String json = mapper.writeValueAsString(v);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -222,7 +222,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeEdge() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
final Edge e = g.E(convertToEdgeId("marko", "knows", "vadas")).next();
final String json = mapper.writeValueAsString(e);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -236,7 +236,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeProperty() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
final String json = mapper.writeValueAsString(p);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -247,8 +247,8 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeVertexProperty() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
- final VertexProperty vp = g.vertices(convertToVertexId("marko")).next().property("name");
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
+ final VertexProperty vp = graph.vertices(convertToVertexId("marko")).next().property("name");
final String json = mapper.writeValueAsString(vp);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -260,8 +260,8 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.CREW)
public void shouldSerializeVertexPropertyWithProperties() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
- final VertexProperty vp = g.vertices(convertToVertexId("marko")).next().properties("location").next();
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
+ final VertexProperty vp = graph.vertices(convertToVertexId("marko")).next().properties("location").next();
final String json = mapper.writeValueAsString(vp);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -275,7 +275,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializePath() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
final Path p = g.V(convertToVertexId("marko")).as("a").outE().as("b").inV().as("c").path()
.filter(t -> ((Vertex) t.get().objects().get(2)).value("name").equals("lop")).next();
final String json = mapper.writeValueAsString(p);
@@ -302,7 +302,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeTraversalMetrics() throws Exception {
- final ObjectMapper mapper = g.io().graphSONMapper().create().createMapper();
+ final ObjectMapper mapper = graph.io().graphSONMapper().create().createMapper();
final TraversalMetrics tm = (TraversalMetrics) g.V().both().profile().cap(TraversalMetrics.METRICS_KEY).next();
final String json = mapper.writeValueAsString(tm);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java
index cd3973f..2a6a526 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdgeTest.java
@@ -44,7 +44,7 @@ public class DetachedEdgeTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldNotConstructNewWithSomethingAlreadyDetached() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("test", v);
final DetachedEdge de = DetachedFactory.detach(e, false);
assertSame(de, DetachedFactory.detach(de, false));
@@ -107,7 +107,7 @@ public class DetachedEdgeTest extends AbstractGremlinTest {
public void shouldAttachToGraph() {
final Edge toDetach = g.E(convertToEdgeId("josh", "created", "lop")).next();
final DetachedEdge detachedEdge = DetachedFactory.detach(toDetach, true);
- final Edge attached = detachedEdge.attach(g);
+ final Edge attached = detachedEdge.attach(graph);
assertEquals(toDetach, attached);
assertFalse(attached instanceof DetachedEdge);
@@ -165,7 +165,7 @@ public class DetachedEdgeTest extends AbstractGremlinTest {
@Test(expected = UnsupportedOperationException.class)
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldNotAllowSetProperty() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("test", v);
final DetachedEdge detachedEdge = DetachedFactory.detach(e, false);
detachedEdge.property("test", "test");
@@ -174,7 +174,7 @@ public class DetachedEdgeTest extends AbstractGremlinTest {
@Test(expected = UnsupportedOperationException.class)
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldNotAllowRemove() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final Edge e = v.addEdge("test", v);
final DetachedEdge detachedEdge = DetachedFactory.detach(e, false);
detachedEdge.remove();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b2c35fe/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java
index df76ffb..83a8f3b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexPropertyTest.java
@@ -36,7 +36,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldNotConstructNewWithSomethingAlreadyDetached() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty vp = v.property("test", "this");
final DetachedVertexProperty dvp = DetachedFactory.detach(vp, true);
assertSame(dvp, DetachedFactory.detach(dvp, true));
@@ -45,7 +45,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldConstructDetachedPropertyWithPropertyFromVertex() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty vp = v.property("test", "this");
final DetachedVertexProperty mp = DetachedFactory.detach(vp, true);
assertEquals("test", mp.key());
@@ -56,7 +56,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldConstructDetachedPropertyWithHiddenFromVertex() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty vp = v.property("test", "this");
final DetachedVertexProperty mp = DetachedFactory.detach(vp, true);
assertEquals("test", mp.key());
@@ -67,7 +67,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test(expected = UnsupportedOperationException.class)
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldNotSupportRemove() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty vp = v.property("test", "this");
DetachedFactory.detach(vp, true).remove();
}
@@ -75,7 +75,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldBeEqualsPropertiesAsIdIsTheSame() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty vp = v.property("test", "this");
final DetachedVertexProperty mp1 = DetachedFactory.detach(vp, true);
final DetachedVertexProperty mp2 = DetachedFactory.detach(vp, true);
@@ -85,7 +85,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldNotBeEqualsPropertiesAsIdIsDifferent() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty vp1 = v.property("test", "this");
final DetachedVertexProperty mp1 = DetachedFactory.detach(vp1, true);
final VertexProperty vp2 = v.property("testing", "this");
@@ -96,7 +96,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.CREW)
public void shouldDetachMultiPropertiesAndMetaProperties() {
- final Vertex v1 = convertToVertex(g, "marko");
+ final Vertex v1 = convertToVertex(graph, "marko");
v1.properties("location").forEachRemaining(vp -> {
final DetachedVertexProperty detached = DetachedFactory.detach(vp, true);
if (detached.value().equals("san diego")) {
@@ -123,10 +123,10 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldAttachToGraph() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty toDetach = v.property("test", "this");
final DetachedVertexProperty detached = DetachedFactory.detach(toDetach, true);
- final VertexProperty attached = detached.attach(g);
+ final VertexProperty attached = detached.attach(graph);
assertEquals(toDetach, attached);
assertFalse(attached instanceof DetachedVertexProperty);
@@ -135,7 +135,7 @@ public class DetachedVertexPropertyTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void shouldAttachToVertex() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final VertexProperty toDetach = v.property("test", "this");
final DetachedVertexProperty detached = DetachedFactory.detach(toDetach, true);
final VertexProperty attached = detached.attach(v);