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/03/12 17:34:17 UTC
incubator-tinkerpop git commit: Move gremlin-groovy unit tests out og
gremlin-groovy-test.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d307b964c -> 3b4b39432
Move gremlin-groovy unit tests out og gremlin-groovy-test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3b4b3943
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3b4b3943
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3b4b3943
Branch: refs/heads/master
Commit: 3b4b39432ea2f24dc4b3f0a1786627a6534cac63
Parents: d307b96
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Mar 12 12:33:54 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Mar 12 12:33:54 2015 -0400
----------------------------------------------------------------------
.../DefaultImportCustomizerProviderTest.java | 90 ------------
.../computer/util/ScriptEngineLambdaTest.java | 144 -------------------
gremlin-groovy/pom.xml | 8 ++
.../DefaultImportCustomizerProviderTest.java | 90 ++++++++++++
.../computer/util/ScriptEngineLambdaTest.java | 144 +++++++++++++++++++
5 files changed, 242 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b4b3943/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java b/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java
deleted file mode 100644
index 74df889..0000000
--- a/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.groovy;
-
-import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader;
-import org.junit.Test;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DefaultImportCustomizerProviderTest {
- static {
- SugarLoader.load();
- }
-
- @Test
- public void shouldReturnDefaultImports() {
- final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider();
- assertImportsInProvider(provider);
- }
-
- @Test
- public void shouldReturnWithExtraStaticImports() {
- final Set<String> statics = new HashSet<>();
- statics.add("com.test.This.*");
- statics.add("com.test.That.OTHER");
- final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider(new HashSet<>(), statics);
- assertImportsInProvider(provider);
- }
-
- @Test
- public void shouldReturnWithExtraImports() {
- final Set<String> imports = new HashSet<>();
- imports.add("com.test.that.*");
- imports.add("com.test.that.That");
- final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider(imports, new HashSet<>());
- assertImportsInProvider(provider);
- }
-
- @Test
- public void shouldReturnWithBothImportTypes() {
- final Set<String> imports = new HashSet<>();
- imports.add("com.test.that.*");
- imports.add("com.test.that.That");
-
- final Set<String> statics = new HashSet<>();
- statics.add("com.test.This.*");
- statics.add("com.test.That.OTHER");
-
- final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider(imports, statics);
- assertImportsInProvider(provider);
- }
-
- private static void assertImportsInProvider(DefaultImportCustomizerProvider provider) {
- final Set<String> allImports = provider.getAllImports();
-
- final Set<String> imports = provider.getImports();
- final Set<String> staticImports = provider.getStaticImports();
- final Set<String> extraImports = provider.getExtraImports();
- final Set<String> extraStaticImports = provider.getExtraStaticImports();
-
- assertEquals(imports.size() + staticImports.size() + extraImports.size() + extraStaticImports.size(), allImports.size());
- assertTrue(allImports.containsAll(imports));
- assertTrue(allImports.containsAll(staticImports));
- assertTrue(allImports.containsAll(extraImports));
- assertTrue(allImports.containsAll(extraStaticImports));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b4b3943/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java b/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java
deleted file mode 100644
index 87bbb67..0000000
--- a/gremlin-groovy-test/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.apache.tinkerpop.gremlin.process.computer.util;
-
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Matt Frantz (matthew.h.frantz+tinkerpop@gmail.com)
- */
-public class ScriptEngineLambdaTest {
-
- private final static String GROOVY_SCRIPT_ENGINE_NAME = "Groovy";
-
- // Function.apply
-
- @Test
- public void simpleFunctionWorks() {
- final ScriptEngineLambda lambda = newGroovyLambda("a + 2");
- assertEquals(lambda.apply(5), 7);
- assertEquals(lambda.apply("foo"), "foo2");
- }
-
- // Supplier.get
-
- @Test
- public void simpleSupplierWorks() {
- final ScriptEngineLambda lambda = newGroovyLambda("System.currentTimeMillis()");
- assertNotEquals(lambda.get(), 0);
- }
-
- // Consumer.accept
-
- @Test
- public void simpleConsumerWorks() {
- final Set set = pokeSet();
- final ScriptEngineLambda lambda = newGroovyLambda("set.add(a)");
-
- lambda.accept(1);
- lambda.accept(2);
- lambda.accept(3);
-
- assertEquals(set.size(), 3);
- }
-
- // BiConsumer.accept
-
- @Test
- public void simpleBiConsumerWorks() {
- final Set set = pokeSet();
- final ScriptEngineLambda lambda = newGroovyLambda("set.add([a, b])");
-
- lambda.accept(1, 2);
- lambda.accept(2, 3);
- lambda.accept(3, 4);
-
- assertEquals(set.size(), 3);
- }
-
- // TriConsumer.accept
-
- @Test
- public void simpleTriConsumerWorks() {
- final Set set = pokeSet();
- final ScriptEngineLambda lambda = newGroovyLambda("set.add([a, b, c])");
-
- lambda.accept(1, 2, 3);
- lambda.accept(2, 3, 4);
- lambda.accept(3, 4, 5);
-
- assertEquals(set.size(), 3);
- }
-
- // Predicate.test
-
- @Test
- public void trivialGroovyPredicateWorks() {
- final ScriptEngineLambda lambda = newGroovyLambda("true");
- assertTrue(lambda.test("foo"));
- }
-
- @Test
- public void oneArgGroovyPredicateWorks() {
- final ScriptEngineLambda lambda = newGroovyLambda("a < 100");
- assertTrue(lambda.test(0));
- assertTrue(lambda.test(99));
- assertFalse(lambda.test(100));
- }
-
- @Test
- public void trivialGroovyFunctionWorks() {
- final ScriptEngineLambda lambda = newGroovyLambda("2 + 2");
- assertEquals(lambda.apply("foo"), 4);
- }
-
- @Test
- public void oneArgGroovyFunctionWorks() {
- final ScriptEngineLambda lambda = newGroovyLambda("a + 2");
- assertEquals(lambda.apply(3), 5);
- assertEquals(lambda.apply(10), 12);
- assertEquals(lambda.apply("foo"), "foo2");
- }
-
- @AfterClass
- public static void clearScriptEngineCache() {
- ScriptEngineCache.get(GROOVY_SCRIPT_ENGINE_NAME).getBindings(ScriptContext.GLOBAL_SCOPE).clear();
- }
-
-
- // Utilities
-
- /**
- * Bind a set named "set" in the Groovy engine.
- */
- private static Set pokeSet() {
- final ScriptEngine engine = getEngine();
- final Bindings bindings = engine.createBindings();
- final Set set = new HashSet();
- bindings.put("set", set);
- // Set the global bindings (since ScriptEngineLambda sets the engine bindings on each invocation).
- engine.setBindings(bindings, ScriptContext.GLOBAL_SCOPE);
- return set;
- }
-
- /**
- * Return the engine used by ScriptEngineLambda in these tests.
- */
- private static ScriptEngine getEngine() {
- return ScriptEngineCache.get(GROOVY_SCRIPT_ENGINE_NAME);
- }
-
- /**
- * Create a ScriptEngineLambda that will accept Groovy.
- */
- private static ScriptEngineLambda newGroovyLambda(String groovy) {
- return new ScriptEngineLambda(GROOVY_SCRIPT_ENGINE_NAME, groovy);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b4b3943/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index f05d975..73f7545 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -101,6 +101,14 @@ limitations under the License.
<invokeDynamic>true</invokeDynamic>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b4b3943/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java
new file mode 100644
index 0000000..74df889
--- /dev/null
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/DefaultImportCustomizerProviderTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.groovy;
+
+import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader;
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class DefaultImportCustomizerProviderTest {
+ static {
+ SugarLoader.load();
+ }
+
+ @Test
+ public void shouldReturnDefaultImports() {
+ final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider();
+ assertImportsInProvider(provider);
+ }
+
+ @Test
+ public void shouldReturnWithExtraStaticImports() {
+ final Set<String> statics = new HashSet<>();
+ statics.add("com.test.This.*");
+ statics.add("com.test.That.OTHER");
+ final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider(new HashSet<>(), statics);
+ assertImportsInProvider(provider);
+ }
+
+ @Test
+ public void shouldReturnWithExtraImports() {
+ final Set<String> imports = new HashSet<>();
+ imports.add("com.test.that.*");
+ imports.add("com.test.that.That");
+ final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider(imports, new HashSet<>());
+ assertImportsInProvider(provider);
+ }
+
+ @Test
+ public void shouldReturnWithBothImportTypes() {
+ final Set<String> imports = new HashSet<>();
+ imports.add("com.test.that.*");
+ imports.add("com.test.that.That");
+
+ final Set<String> statics = new HashSet<>();
+ statics.add("com.test.This.*");
+ statics.add("com.test.That.OTHER");
+
+ final DefaultImportCustomizerProvider provider = new DefaultImportCustomizerProvider(imports, statics);
+ assertImportsInProvider(provider);
+ }
+
+ private static void assertImportsInProvider(DefaultImportCustomizerProvider provider) {
+ final Set<String> allImports = provider.getAllImports();
+
+ final Set<String> imports = provider.getImports();
+ final Set<String> staticImports = provider.getStaticImports();
+ final Set<String> extraImports = provider.getExtraImports();
+ final Set<String> extraStaticImports = provider.getExtraStaticImports();
+
+ assertEquals(imports.size() + staticImports.size() + extraImports.size() + extraStaticImports.size(), allImports.size());
+ assertTrue(allImports.containsAll(imports));
+ assertTrue(allImports.containsAll(staticImports));
+ assertTrue(allImports.containsAll(extraImports));
+ assertTrue(allImports.containsAll(extraStaticImports));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b4b3943/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java
new file mode 100644
index 0000000..87bbb67
--- /dev/null
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/process/computer/util/ScriptEngineLambdaTest.java
@@ -0,0 +1,144 @@
+package org.apache.tinkerpop.gremlin.process.computer.util;
+
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Matt Frantz (matthew.h.frantz+tinkerpop@gmail.com)
+ */
+public class ScriptEngineLambdaTest {
+
+ private final static String GROOVY_SCRIPT_ENGINE_NAME = "Groovy";
+
+ // Function.apply
+
+ @Test
+ public void simpleFunctionWorks() {
+ final ScriptEngineLambda lambda = newGroovyLambda("a + 2");
+ assertEquals(lambda.apply(5), 7);
+ assertEquals(lambda.apply("foo"), "foo2");
+ }
+
+ // Supplier.get
+
+ @Test
+ public void simpleSupplierWorks() {
+ final ScriptEngineLambda lambda = newGroovyLambda("System.currentTimeMillis()");
+ assertNotEquals(lambda.get(), 0);
+ }
+
+ // Consumer.accept
+
+ @Test
+ public void simpleConsumerWorks() {
+ final Set set = pokeSet();
+ final ScriptEngineLambda lambda = newGroovyLambda("set.add(a)");
+
+ lambda.accept(1);
+ lambda.accept(2);
+ lambda.accept(3);
+
+ assertEquals(set.size(), 3);
+ }
+
+ // BiConsumer.accept
+
+ @Test
+ public void simpleBiConsumerWorks() {
+ final Set set = pokeSet();
+ final ScriptEngineLambda lambda = newGroovyLambda("set.add([a, b])");
+
+ lambda.accept(1, 2);
+ lambda.accept(2, 3);
+ lambda.accept(3, 4);
+
+ assertEquals(set.size(), 3);
+ }
+
+ // TriConsumer.accept
+
+ @Test
+ public void simpleTriConsumerWorks() {
+ final Set set = pokeSet();
+ final ScriptEngineLambda lambda = newGroovyLambda("set.add([a, b, c])");
+
+ lambda.accept(1, 2, 3);
+ lambda.accept(2, 3, 4);
+ lambda.accept(3, 4, 5);
+
+ assertEquals(set.size(), 3);
+ }
+
+ // Predicate.test
+
+ @Test
+ public void trivialGroovyPredicateWorks() {
+ final ScriptEngineLambda lambda = newGroovyLambda("true");
+ assertTrue(lambda.test("foo"));
+ }
+
+ @Test
+ public void oneArgGroovyPredicateWorks() {
+ final ScriptEngineLambda lambda = newGroovyLambda("a < 100");
+ assertTrue(lambda.test(0));
+ assertTrue(lambda.test(99));
+ assertFalse(lambda.test(100));
+ }
+
+ @Test
+ public void trivialGroovyFunctionWorks() {
+ final ScriptEngineLambda lambda = newGroovyLambda("2 + 2");
+ assertEquals(lambda.apply("foo"), 4);
+ }
+
+ @Test
+ public void oneArgGroovyFunctionWorks() {
+ final ScriptEngineLambda lambda = newGroovyLambda("a + 2");
+ assertEquals(lambda.apply(3), 5);
+ assertEquals(lambda.apply(10), 12);
+ assertEquals(lambda.apply("foo"), "foo2");
+ }
+
+ @AfterClass
+ public static void clearScriptEngineCache() {
+ ScriptEngineCache.get(GROOVY_SCRIPT_ENGINE_NAME).getBindings(ScriptContext.GLOBAL_SCOPE).clear();
+ }
+
+
+ // Utilities
+
+ /**
+ * Bind a set named "set" in the Groovy engine.
+ */
+ private static Set pokeSet() {
+ final ScriptEngine engine = getEngine();
+ final Bindings bindings = engine.createBindings();
+ final Set set = new HashSet();
+ bindings.put("set", set);
+ // Set the global bindings (since ScriptEngineLambda sets the engine bindings on each invocation).
+ engine.setBindings(bindings, ScriptContext.GLOBAL_SCOPE);
+ return set;
+ }
+
+ /**
+ * Return the engine used by ScriptEngineLambda in these tests.
+ */
+ private static ScriptEngine getEngine() {
+ return ScriptEngineCache.get(GROOVY_SCRIPT_ENGINE_NAME);
+ }
+
+ /**
+ * Create a ScriptEngineLambda that will accept Groovy.
+ */
+ private static ScriptEngineLambda newGroovyLambda(String groovy) {
+ return new ScriptEngineLambda(GROOVY_SCRIPT_ENGINE_NAME, groovy);
+ }
+}