Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75396183B5 for ; Thu, 3 Mar 2016 20:08:08 +0000 (UTC) Received: (qmail 74728 invoked by uid 500); 3 Mar 2016 20:08:08 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 74703 invoked by uid 500); 3 Mar 2016 20:08:08 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 74694 invoked by uid 99); 3 Mar 2016 20:08:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 20:08:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id E6A06C63BD for ; Thu, 3 Mar 2016 20:08:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id psu0CyS5XVLu for ; Thu, 3 Mar 2016 20:08:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 5A16C5F572 for ; Thu, 3 Mar 2016 20:08:06 +0000 (UTC) Received: (qmail 74690 invoked by uid 99); 3 Mar 2016 20:08:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 20:08:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9A223E78D1; Thu, 3 Mar 2016 20:08:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Message-Id: <2f1044f03b1d48c89ff0302ddb78876f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-tinkerpop git commit: added test to make sure declared SideEffect is ultimate returned class. Date: Thu, 3 Mar 2016 20:08:05 +0000 (UTC) Repository: incubator-tinkerpop Updated Branches: refs/heads/TINKERPOP-1192 5ec7dd063 -> ff390381b added test to make sure declared SideEffect is ultimate returned class. Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ff390381 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ff390381 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ff390381 Branch: refs/heads/TINKERPOP-1192 Commit: ff390381b9896a16c73a056f167e84f2beb8f1d6 Parents: 5ec7dd0 Author: Marko A. Rodriguez Authored: Thu Mar 3 13:07:52 2016 -0700 Committer: Marko A. Rodriguez Committed: Thu Mar 3 13:07:52 2016 -0700 ---------------------------------------------------------------------- .../step/sideEffect/GroovySideEffectTest.groovy | 7 +++ .../step/sideEffect/SideEffectTest.java | 47 +++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff390381/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy index 68135f9..5870457 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy @@ -50,5 +50,12 @@ public abstract class GroovySideEffectTest { public Traversal get_g_VX1X_out_sideEffectXX_name(final Object v1Id) { new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).out().sideEffect {}.name", "v1Id", v1Id) } + + @Override + public Traversal> get_g_withSideEffectXa__linkedhashmapX_V_out_groupCountXaX_byXlabelX_out_out_capXaX() { + new ScriptTraversal<>(g, "gremlin-groovy", "g.withSideEffect('a'){[:] as LinkedHashMap}.V.out.groupCount('a').by(label).out.out.cap('a')"); + } + + } } http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff390381/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java index e1990b6..d0b4e19 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java @@ -24,16 +24,23 @@ import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner; import org.apache.tinkerpop.gremlin.process.IgnoreEngine; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine; +import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects; +import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.function.Supplier; import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Marko A. Rodriguez (http://markorodriguez.com) @@ -48,6 +55,8 @@ public abstract class SideEffectTest extends AbstractGremlinProcessTest { public abstract Traversal get_g_VX1X_out_sideEffectXX_name(final Object v1Id); + public abstract Traversal> get_g_withSideEffectXa__linkedhashmapX_V_out_groupCountXaX_byXlabelX_out_out_capXaX(); + @Test @LoadGraphWith(MODERN) @IgnoreEngine(TraversalEngine.Type.COMPUTER) @@ -88,6 +97,28 @@ public abstract class SideEffectTest extends AbstractGremlinProcessTest { assert_g_v1_out_sideEffectXincr_cX_valueXnameX(traversal); } + @Test + @LoadGraphWith(MODERN) + public void g_withSideEffectXa__linkedhashmapX_V_out_groupCountXaX_byXlabelX_out_out_capXaX() { + final Traversal> traversal = get_g_withSideEffectXa__linkedhashmapX_V_out_groupCountXaX_byXlabelX_out_out_capXaX(); + printTraversalForm(traversal); + Map map = traversal.next(); + assertFalse(traversal.hasNext()); + assertEquals(2, map.size()); + assertEquals(4l, map.get("software").longValue()); + assertEquals(2l, map.get("person").longValue()); + final TraversalSideEffects sideEffects = traversal.asAdmin().getSideEffects(); + map = sideEffects.get("a"); + assertEquals(2, map.size()); + assertEquals(4l, map.get("software").longValue()); + assertEquals(2l, map.get("person").longValue()); + /// + assertEquals(1, sideEffects.keys().size()); + assertTrue(sideEffects.keys().contains("a")); + assertTrue(sideEffects.exists("a")); + assertTrue(sideEffects.get("a") instanceof LinkedHashMap); + } + public static class Traversals extends SideEffectTest { @Override @@ -116,5 +147,19 @@ public abstract class SideEffectTest extends AbstractGremlinProcessTest { return g.V(v1Id).out().sideEffect(traverser -> { }).values("name"); } + + @Override + public Traversal> get_g_withSideEffectXa__linkedhashmapX_V_out_groupCountXaX_byXlabelX_out_out_capXaX() { + return g.withSideEffect("a", new LinkedHashMapSupplier()).V().out().groupCount("a").by(T.label).out().out().cap("a"); + } + } + + private static class LinkedHashMapSupplier implements Supplier { + + @Override + public LinkedHashMap get() { + return new LinkedHashMap(); + } + } }