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/05/08 22:46:53 UTC
[1/2] incubator-tinkerpop git commit: Add a test for MultiMap methods.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 80e511c74 -> 81d348d8c
Add a test for MultiMap methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2fb5ed92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2fb5ed92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2fb5ed92
Branch: refs/heads/master
Commit: 2fb5ed92bc86d4e657d7aeec5e4b871e367fb67d
Parents: 134984e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 8 16:46:21 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 8 16:46:21 2015 -0400
----------------------------------------------------------------------
.../gremlin/util/tools/MultiMapTest.java | 136 +++++++++++++++++++
1 file changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2fb5ed92/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java
new file mode 100644
index 0000000..6f65bb0
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.tools;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class MultiMapTest {
+ @Test
+ public void shouldPutValueInNewSet() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 2);
+
+ final Set<Object> expected = new HashSet<Object>() {{
+ add(1);
+ }};
+ assertEquals(expected, multi.get("here"));
+ }
+
+ @Test
+ public void shouldPutValueInExistingSet() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 3);
+
+ final Set<Object> expected1 = new HashSet<Object>() {{
+ add(1);
+ }};
+ assertEquals(expected1, multi.get("here"));
+
+ MultiMap.put(multi, "here", 2);
+
+ final Set<Object> expected2 = new HashSet<Object>() {{
+ add(1);
+ add(2);
+ }};
+ assertEquals(expected2, multi.get("here"));
+ }
+
+ @Test
+ public void shouldPutCollectionInSet() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ final Set<Object> expected = new HashSet<Object>() {{
+ add(1);
+ add(2);
+ }};
+ MultiMap.putAll(multi, "here", expected);
+ assertEquals(expected, multi.get("here"));
+ }
+
+ @Test
+ public void shouldContainEntry() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 2);
+ MultiMap.put(multi, "here", 2);
+
+ assertThat(MultiMap.containsEntry(multi, "here", 1), is(true));
+ }
+
+ @Test
+ public void shouldNotContainEntryValue() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 2);
+
+ assertThat(MultiMap.containsEntry(multi, "here", 2), is(false));
+ }
+
+ @Test
+ public void shouldNotContainEntryKey() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 2);
+
+ assertThat(MultiMap.containsEntry(multi, "that", 2), is(false));
+ }
+
+ @Test
+ public void shouldGetAnEntry() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 3);
+
+ final Set<Object> expected1 = new HashSet<Object>() {{
+ add(1);
+ }};
+ assertEquals(expected1, MultiMap.get(multi, "here"));
+
+ MultiMap.put(multi, "here", 2);
+
+ final Set<Object> expected2 = new HashSet<Object>() {{
+ add(1);
+ add(2);
+ }};
+ assertEquals(expected2, MultiMap.get(multi, "here"));
+ }
+
+ @Test
+ public void shouldGetEmptyIfKeyNotPresent() {
+ final Map<String,Set<Object>> multi = new HashMap<>();
+ MultiMap.put(multi, "here", 1);
+ MultiMap.put(multi, "there", 3);
+
+ assertEquals(Collections.emptySet(), MultiMap.get(multi, "not-here"));
+ }
+}
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/81d348d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/81d348d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/81d348d8
Branch: refs/heads/master
Commit: 81d348d8caad5cf963b423a0c377c83d7b3ec61e
Parents: 2fb5ed9 80e511c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 8 16:46:44 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 8 16:46:44 2015 -0400
----------------------------------------------------------------------
.../peerpressure/PeerPressureVertexProgram.java | 34 +--
.../ranking/pagerank/PageRankVertexProgram.java | 38 +--
.../traversal/TraversalObjectFunction.java | 47 +++
.../traversal/TraversalScriptFunction.java | 69 +++++
.../traversal/TraversalScriptSupplier.java | 67 -----
.../computer/traversal/TraversalSupplier.java | 43 ---
.../traversal/TraversalVertexProgram.java | 35 +--
.../traversal/step/map/ComputerResultStep.java | 2 +-
.../computer/util/ConfigurationTraversal.java | 82 ++++++
.../process/computer/util/LambdaHolder.java | 114 --------
.../process/computer/util/ShellGraph.java | 283 -------------------
.../process/traversal/TraversalStrategies.java | 5 -
.../dsl/graph/GraphTraversalSource.java | 2 +-
.../traversal/step/util/ComputerAwareStep.java | 2 +-
.../step/util/ReducingBarrierStep.java | 3 +-
.../traversal/util/DefaultTraversal.java | 2 +-
.../process/computer/ComputerTestHelper.groovy | 6 +-
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +-
.../computer/example/TraversalSupplier1.java | 12 +-
.../computer/example/TraversalSupplier2.java | 3 +-
.../computer/example/TraversalSupplier3.java | 3 +-
21 files changed, 265 insertions(+), 589 deletions(-)
----------------------------------------------------------------------