From commits-return-32479-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Mon Oct 1 22:20:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 48A851807A6 for ; Mon, 1 Oct 2018 22:20:24 +0200 (CEST) Received: (qmail 58893 invoked by uid 500); 1 Oct 2018 20:20:23 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 58801 invoked by uid 99); 1 Oct 2018 20:20:23 -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; Mon, 01 Oct 2018 20:20:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 19D1AE1138; Mon, 1 Oct 2018 20:20:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Mon, 01 Oct 2018 20:20:32 -0000 Message-Id: <11b451df01e04b458ea0cf5bf0b357e5@git.apache.org> In-Reply-To: <8d6731a683564e82b12467c5d347d0bc@git.apache.org> References: <8d6731a683564e82b12467c5d347d0bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/13] tinkerpop git commit: TINKERPOP-2040 Added more tests to cover more GraphSON types TINKERPOP-2040 Added more tests to cover more GraphSON types Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/67e2ee85 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/67e2ee85 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/67e2ee85 Branch: refs/heads/TINKERPOP-2040 Commit: 67e2ee85dd8048ca21a72889cf8a0218f2add081 Parents: 774371d Author: Stephen Mallette Authored: Tue Sep 25 13:46:38 2018 -0400 Committer: Stephen Mallette Committed: Mon Oct 1 16:18:28 2018 -0400 ---------------------------------------------------------------------- .../groovy/jsr223/GroovyTranslatorTest.java | 30 ++++++++++++++++++++ .../gremlin/groovy/jsr223/GroovyTranslator.java | 4 +++ 2 files changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67e2ee85/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java index 686c7bd..c224642 100644 --- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java @@ -22,6 +22,9 @@ package org.apache.tinkerpop.gremlin.groovy.jsr223; import org.apache.commons.configuration.MapConfiguration; import org.apache.tinkerpop.gremlin.AbstractGremlinTest; import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.apache.tinkerpop.gremlin.process.traversal.Order; +import org.apache.tinkerpop.gremlin.process.traversal.Pop; +import org.apache.tinkerpop.gremlin.process.traversal.Scope; import org.apache.tinkerpop.gremlin.process.traversal.Translator; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; @@ -31,6 +34,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy; +import org.apache.tinkerpop.gremlin.structure.Column; +import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; @@ -185,6 +190,31 @@ public class GroovyTranslatorTest extends AbstractGremlinTest { } @Test + public void shouldHandleColumn() { + assertTranslation("Column.keys", Column.keys); + } + + @Test + public void shouldHandleDirection() { + assertTranslation("Direction.BOTH", Direction.BOTH); + } + + @Test + public void shouldHandleOrder() { + assertTranslation("Order.decr", Order.decr); + } + + @Test + public void shouldHandlePop() { + assertTranslation("Pop.last", Pop.last); + } + + @Test + public void shouldHandleScope() { + assertTranslation("Scope.local", Scope.local); + } + + @Test public void shouldOverrideDefaultTypeTranslationWithSomethingBonkers() { final String thingToSuffixAllStringsWith = "-why-would-anyone-do-this"; final String script = GroovyTranslator.of("g", x -> x instanceof String ? x + thingToSuffixAllStringsWith : x). http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67e2ee85/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java index 1d122c6..9cd7791 100644 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java @@ -22,7 +22,9 @@ package org.apache.tinkerpop.gremlin.groovy.jsr223; import groovy.json.StringEscapeUtils; import org.apache.commons.configuration.ConfigurationConverter; import org.apache.tinkerpop.gremlin.process.traversal.Bytecode; +import org.apache.tinkerpop.gremlin.process.traversal.Order; import org.apache.tinkerpop.gremlin.process.traversal.P; +import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions; import org.apache.tinkerpop.gremlin.process.traversal.Translator; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; @@ -32,6 +34,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy; import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP; import org.apache.tinkerpop.gremlin.process.traversal.util.OrP; +import org.apache.tinkerpop.gremlin.structure.Column; +import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Vertex;