From fd95dc8b62c02f73c9de8da31fb7a200efe2929a Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Tue, 24 Nov 2015 19:53:45 -0500 Subject: [PATCH 1/2] Removed mixed typing in VertexPropertyTest Converted integer value to string to maintain type --- .../gremlin/structure/VertexPropertyTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java index edb4d8fc2f7..c7f7749cc68 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java @@ -23,22 +23,22 @@ import org.apache.tinkerpop.gremlin.FeatureRequirement; import org.apache.tinkerpop.gremlin.FeatureRequirementSet; import org.apache.tinkerpop.gremlin.process.traversal.P; -import org.apache.tinkerpop.gremlin.util.function.FunctionUtils; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.function.Consumer; import static org.hamcrest.Matchers.hasItem; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author Marko A. Rodriguez (http://markorodriguez.com) @@ -446,7 +446,7 @@ public void shouldRemoveMultiPropertiesWhenVerticesAreRemoved() { }); for (int i = 0; i < 100; i++) { - marko.property(VertexProperty.Cardinality.list, "name", i); + marko.property(VertexProperty.Cardinality.list, "name", "Remove-" + String.valueOf(i)); } tryCommit(graph, graph -> { assertVertexEdgeCounts(1, 0); @@ -455,7 +455,7 @@ public void shouldRemoveMultiPropertiesWhenVerticesAreRemoved() { assertEquals(0, IteratorUtils.count(marko.properties("blah"))); }); - g.V().properties("name").has(T.value, P.test((a, b) -> ((Class) b).isAssignableFrom(a.getClass()), Integer.class)).forEachRemaining(Property::remove); + g.V().properties("name").has(T.value, P.test((a, b) -> ((String) a).startsWith((String) b), "Remove-")).forEachRemaining(Property::remove); tryCommit(graph, graph -> { assertVertexEdgeCounts(1, 0); assertEquals(2, IteratorUtils.count(marko.properties("name"))); From 7626967d01309b3732345ee7d9532e8a5677c647 Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Fri, 27 Nov 2015 16:32:42 -0500 Subject: [PATCH 2/2] Converted int to double for tests consistency reasons. --- .../process/traversal/step/map/GroovyAddEdgeTest.groovy | 4 ++-- .../gremlin/process/traversal/step/map/AddEdgeTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy index 176e73161f9..eb78aa22dee 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy @@ -38,7 +38,7 @@ public abstract class GroovyAddEdgeTest { @Override public Traversal get_g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X( final Object v1Id) { - TraversalScriptHelper.compute("g.V(v1Id).as('a').out('created').addE('createdBy').to('a').property('weight', 2)", g, "v1Id", v1Id) + TraversalScriptHelper.compute("g.V(v1Id).as('a').out('created').addE('createdBy').to('a').property('weight', 2.0d)", g, "v1Id", v1Id) } @Override @@ -64,7 +64,7 @@ public abstract class GroovyAddEdgeTest { @Override public Traversal get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X( final Object v1Id) { - TraversalScriptHelper.compute("g.V(v1Id).as('a').out('created').addOutE('createdBy', 'a', 'weight', 2)", g, "v1Id", v1Id) + TraversalScriptHelper.compute("g.V(v1Id).as('a').out('created').addOutE('createdBy', 'a', 'weight', 2.0d)", g, "v1Id", v1Id) } @Override diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java index f3cb90fcdc3..9bd66959a60 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java @@ -121,7 +121,7 @@ public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X() { while (traversal.hasNext()) { final Edge edge = traversal.next(); assertEquals("createdBy", edge.label()); - assertEquals(2, edge.value("weight").intValue()); + assertEquals(2.0d, edge.value("weight").doubleValue(),0.00001d); assertEquals(1, IteratorUtils.count(edge.properties())); count++; @@ -142,7 +142,7 @@ public void g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X() while (traversal.hasNext()) { final Edge edge = traversal.next(); assertEquals("createdBy", edge.label()); - assertEquals(2, edge.value("weight").intValue()); + assertEquals(2.0d, edge.value("weight").doubleValue(),0.00001d); assertEquals(1, IteratorUtils.count(edge.properties())); count++; @@ -311,7 +311,7 @@ public Traversal get_g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toX @Override public Traversal get_g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X(final Object v1Id) { - return g.V(v1Id).as("a").out("created").addE("createdBy").to("a").property("weight", 2); + return g.V(v1Id).as("a").out("created").addE("createdBy").to("a").property("weight", 2.0d); } @Override @@ -338,7 +338,7 @@ public Traversal get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a @Override public Traversal get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(final Object v1Id) { - return g.V(v1Id).as("a").out("created").addOutE("createdBy", "a", "weight", 2); + return g.V(v1Id).as("a").out("created").addOutE("createdBy", "a", "weight", 2.0d); } @Override