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/09/11 15:07:44 UTC
incubator-tinkerpop git commit: More tests for Parameters.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master a93e22035 -> 8874ca685
More tests for Parameters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8874ca68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8874ca68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8874ca68
Branch: refs/heads/master
Commit: 8874ca68542b766aa63adf0990cc86141ca02bfb
Parents: a93e220
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 11 09:07:26 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 11 09:07:26 2015 -0400
----------------------------------------------------------------------
.../process/traversal/step/util/Parameters.java | 17 +++++++++-
.../strategy/decoration/ElementIdStrategy.java | 2 +-
.../traversal/step/util/ParametersTest.java | 35 ++++++++++++++++++--
3 files changed, 50 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8874ca68/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
index 7df40f2..f56e690 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
@@ -46,11 +46,23 @@ public final class Parameters implements Cloneable, Serializable {
private Map<Object, List<Object>> parameters = new HashMap<>();
+ /**
+ * Checks for existence of key in parameter set.
+ *
+ * @param key the key to check
+ * @return {@code true} if the key is present and {@code false} otherwise
+ */
public boolean contains(final Object key) {
return this.parameters.containsKey(key);
}
- public void replace(final Object oldKey, final Object newKey) {
+ /**
+ * Renames a key in the parameter set.
+ *
+ * @param oldKey the key to rename
+ * @param newKey the new name of the key
+ */
+ public void rename(final Object oldKey, final Object newKey) {
this.parameters.put(newKey, this.parameters.remove(oldKey));
}
@@ -106,6 +118,9 @@ public final class Parameters implements Cloneable, Serializable {
return Collections.unmodifiableMap(raw);
}
+ /**
+ * Set parameters given key/value pairs.
+ */
public void set(final Object... keyValues) {
for (int i = 0; i < keyValues.length; i = i + 2) {
if (keyValues[i + 1] != null) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8874ca68/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
index 481fb6e..2965c96 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
@@ -105,7 +105,7 @@ public final class ElementIdStrategy extends AbstractTraversalStrategy<Traversal
if (step instanceof AddVertexStep || step instanceof AddVertexStartStep || step instanceof AddEdgeStep) {
final Parameterizing parameterizing = (Parameterizing) step;
if (parameterizing.getParameters().contains(T.id))
- parameterizing.getParameters().replace(T.id, this.idPropertyKey);
+ parameterizing.getParameters().rename(T.id, this.idPropertyKey);
else if (!parameterizing.getParameters().contains(this.idPropertyKey))
parameterizing.getParameters().set(this.idPropertyKey, idMaker.get());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8874ca68/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
index 5bcdedd..338d02e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
@@ -94,11 +95,11 @@ public class ParametersTest {
}
@Test
- public void shouldReplace() {
+ public void shouldRename() {
final Parameters parameters = new Parameters();
parameters.set("a", "axe", "b", "bat", "c", "cat");
- parameters.replace("a", "z");
+ parameters.rename("a", "z");
final Map<Object,List<Object>> before = parameters.getRaw();
assertEquals(3, before.size());
@@ -106,4 +107,34 @@ public class ParametersTest {
assertEquals("bat", before.get("b").get(0));
assertEquals("cat", before.get("c").get(0));
}
+
+ @Test
+ public void shouldContainKey() {
+ final Parameters parameters = new Parameters();
+ parameters.set("a", "axe", "b", "bat", "c", "cat");
+
+ assertThat(parameters.contains("b"), is(true));
+ }
+
+ @Test
+ public void shouldNotContainKey() {
+ final Parameters parameters = new Parameters();
+ parameters.set("a", "axe", "b", "bat", "c", "cat");
+
+ assertThat(parameters.contains("z"), is(false));
+ }
+
+ @Test
+ public void shouldGetSetMultiple() {
+ final Parameters parameters = new Parameters();
+ parameters.set("a", "axe", "a", "ant", "b", "bat", "b", "ball", "c", "cat");
+
+ final Map<Object,List<Object>> params = parameters.getRaw();
+ assertEquals(3, params.size());
+ assertEquals("axe", params.get("a").get(0));
+ assertEquals("ant", params.get("a").get(1));
+ assertEquals("bat", params.get("b").get(0));
+ assertEquals("ball", params.get("b").get(1));
+ assertEquals("cat", params.get("c").get(0));
+ }
}