You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/03/19 19:26:30 UTC
[12/40] incubator-tinkerpop git commit: the traversal steps provided
by TinkerPop are the foundation for all dsl. GraphTraversal is just a dsl of
traversal. Refactored the process API to reflect this concept. Fixed #592.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
deleted file mode 100644
index 76904f6..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
+++ /dev/null
@@ -1,146 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Scope;
-import org.apache.tinkerpop.gremlin.process.T;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.bothE;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.dedup;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public abstract class DedupTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, String> get_g_V_both_dedup_name();
-
- public abstract Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name();
-
- public abstract Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup();
-
- public abstract Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX();
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_both_dedup_name() {
- final Traversal<Vertex, String> traversal = get_g_V_both_dedup_name();
- printTraversalForm(traversal);
- final List<String> names = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(6, names.size());
- assertTrue(names.contains("marko"));
- assertTrue(names.contains("vadas"));
- assertTrue(names.contains("lop"));
- assertTrue(names.contains("josh"));
- assertTrue(names.contains("ripple"));
- assertTrue(names.contains("peter"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name();
- printTraversalForm(traversal);
- final List<String> names = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(1, names.size());
- assertTrue(names.contains("lop") || names.contains("ripple"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_both_name_orderXa_bX_dedup() {
- final Traversal<Vertex, String> traversal = get_g_V_both_name_orderXa_bX_dedup();
- printTraversalForm(traversal);
- final List<String> names = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(6, names.size());
- assertEquals("josh", names.get(0));
- assertEquals("lop", names.get(1));
- assertEquals("marko", names.get(2));
- assertEquals("peter", names.get(3));
- assertEquals("ripple", names.get(4));
- assertEquals("vadas", names.get(5));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX() {
- final Traversal<Vertex, Map<String, Set<Double>>> traversal =
- get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX();
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- final Map<String, Set<Double>> map = traversal.next();
- assertFalse(traversal.hasNext());
- assertEquals(2, map.size());
- assertEquals(3, map.get("software").size());
- assertEquals(4, map.get("person").size());
- assertEquals(new HashSet<>(Arrays.asList(0.2, 0.4, 1.0)), map.get("software"));
- assertEquals(new HashSet<>(Arrays.asList(0.2, 0.4, 0.5, 1.0)), map.get("person"));
- }
-
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends DedupTest {
- @Override
- public Traversal<Vertex, String> get_g_V_both_dedup_name() {
- return g.V().both().dedup().values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
- return g.V().both().has(T.label, "software").dedup().by("lang").values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup() {
- return g.V().both().<String>properties("name").order().by((a, b) -> a.value().compareTo(b.value())).dedup().value();
- }
-
- @Override
- public Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX() {
- return g.V().<String, Set<Double>>group().by(T.label).by(bothE().values("weight").fold()).by(dedup(Scope.local));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java
deleted file mode 100644
index 8ff327f..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ExceptTest.java
+++ /dev/null
@@ -1,187 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Path;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.bothE;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public abstract class ExceptTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_exceptXg_v2X(final Object v1Id, final Object v2Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_exceptXxX(final Object v1Id);
-
- public abstract Traversal<Vertex, String> get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_exceptXg_V_toListX();
-
- public abstract Traversal<Vertex, Vertex> get_g_V_exceptXX();
-
- public abstract Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(final Object v1Id);
-
- public abstract Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_exceptXaX_name(final Object v1Id);
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_out_exceptXg_v2X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_exceptXg_v2X(convertToVertexId("marko"), convertToVertexId("vadas"));
- printTraversalForm(traversal);
- int counter = 0;
- Set<Vertex> vertices = new HashSet<>();
- while (traversal.hasNext()) {
- counter++;
- Vertex vertex = traversal.next();
- vertices.add(vertex);
- assertTrue(vertex.value("name").equals("josh") || vertex.value("name").equals("lop"));
- }
- assertEquals(2, counter);
- assertEquals(2, vertices.size());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_out_aggregateXxX_out_exceptXxX() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_exceptXxX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertEquals("ripple", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name() {
- Traversal<Vertex, String> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(convertToVertexId("marko"));
- printTraversalForm(traversal);
- List<String> names = Arrays.asList(traversal.next(), traversal.next());
- assertFalse(traversal.hasNext());
- assertEquals(2, names.size());
- assertTrue(names.contains("peter"));
- assertTrue(names.contains("josh"));
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_exceptXg_V_toListX() {
- Traversal<Vertex, Vertex> traversal = get_g_V_exceptXg_V_toListX();
- printTraversalForm(traversal);
- final List<Vertex> vertices = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(0, vertices.size());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_exceptXX() {
- Traversal<Vertex, Vertex> traversal = get_g_V_exceptXX();
- printTraversalForm(traversal);
- final List<Vertex> vertices = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(6, vertices.size());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path() {
- Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(convertToVertexId("marko"));
- printTraversalForm(traversal);
- final List<Path> paths = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(4, paths.size());
- assertEquals(1, paths.stream().filter(path -> path.size() == 3).count());
- assertEquals(2, paths.stream().filter(path -> path.size() == 5).count());
- assertEquals(1, paths.stream().filter(path -> path.size() == 7).count());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_exceptXaX_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_exceptXaX_name(convertToVertexId("marko"));
- printTraversalForm(traversal);
- checkResults(Arrays.asList("peter", "josh"), traversal);
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class StandardTest extends ExceptTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_exceptXg_v2X(final Object v1Id, final Object v2Id) {
- return g.V(v1Id).out().except(g.V(v2Id).next());
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_exceptXxX(final Object v1Id) {
- return g.V(v1Id).out().aggregate("x").out().except("x");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(final Object v1Id) {
- return g.V(v1Id).out("created").in("created").except(g.V(v1Id).next()).values("name");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_exceptXg_V_toListX() {
- return g.V().except(g.V().toList());
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_exceptXX() {
- return g.V().except(Collections.emptyList());
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(final Object v1Id) {
- return g.V(v1Id).repeat(bothE("created").except("e").aggregate("e").otherV()).emit().path();
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_exceptXaX_name(final Object v1Id) {
- return g.V(v1Id).as("a").out("created").in("created").except("a").values("name");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java
deleted file mode 100644
index e4610de..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/FilterTest.java
+++ /dev/null
@@ -1,222 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class FilterTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Vertex> get_g_V_filterXfalseX();
-
- public abstract Traversal<Vertex, Vertex> get_g_V_filterXtrueX();
-
- public abstract Traversal<Vertex, Vertex> get_g_V_filterXlang_eq_javaX();
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_filterXage_gt_30X(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_filterXage_gt_30X(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX();
-
- public abstract Traversal<Edge, Edge> get_g_E_filterXfalseX();
-
- public abstract Traversal<Edge, Edge> get_g_E_filterXtrueX();
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_filterXfalseX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_filterXfalseX();
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_filterXtrueX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_filterXtrueX();
- printTraversalForm(traversal);
- int counter = 0;
- final Set<Vertex> vertices = new HashSet<>();
- while (traversal.hasNext()) {
- counter++;
- vertices.add(traversal.next());
- }
- assertEquals(6, counter);
- assertEquals(6, vertices.size());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_filterXlang_eq_javaX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_filterXlang_eq_javaX();
- printTraversalForm(traversal);
- int counter = 0;
- Set<Vertex> vertices = new HashSet<>();
- while (traversal.hasNext()) {
- counter++;
- Vertex vertex = traversal.next();
- vertices.add(vertex);
- assertTrue(vertex.value("name").equals("ripple") ||
- vertex.value("name").equals("lop"));
- }
- assertEquals(2, counter);
- assertEquals(2, vertices.size());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_filterXage_gt_30X() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_filterXage_gt_30X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- traversal = get_g_VX1X_filterXage_gt_30X(convertToVertexId("josh"));
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- assertEquals(Integer.valueOf(32), traversal.next().<Integer>value("age"));
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_out_filterXage_gt_30X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_filterXage_gt_30X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertEquals(Integer.valueOf(32), traversal.next().<Integer>value("age"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_filterXname_startsWith_m_OR_name_startsWith_pX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX();
- printTraversalForm(traversal);
- int counter = 0;
- Set<Vertex> vertices = new HashSet<>();
- while (traversal.hasNext()) {
- counter++;
- Vertex vertex = traversal.next();
- vertices.add(vertex);
- assertTrue(vertex.value("name").equals("marko") ||
- vertex.value("name").equals("peter"));
- }
- assertEquals(counter, 2);
- assertEquals(vertices.size(), 2);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_E_filterXfalseX() {
- final Traversal<Edge, Edge> traversal = get_g_E_filterXfalseX();
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_E_filterXtrueX() {
- final Traversal<Edge, Edge> traversal = get_g_E_filterXtrueX();
- printTraversalForm(traversal);
- int counter = 0;
- final Set<Edge> edges = new HashSet<>();
- while (traversal.hasNext()) {
- counter++;
- edges.add(traversal.next());
- }
- assertEquals(6, counter);
- assertEquals(6, edges.size());
- assertFalse(traversal.hasNext());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends FilterTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXfalseX() {
- return g.V().filter(v -> false);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXtrueX() {
- return g.V().filter(v -> true);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXlang_eq_javaX() {
- return g.V().filter(v -> v.get().<String>property("lang").orElse("none").equals("java"));
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_filterXage_gt_30X(final Object v1Id) {
- return g.V(v1Id).filter(v -> v.get().<Integer>property("age").orElse(0) > 30);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_filterXage_gt_30X(final Object v1Id) {
- return g.V(v1Id).out().filter(v -> v.get().<Integer>property("age").orElse(0) > 30);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX() {
- return g.V().filter(v -> {
- final String name = v.get().value("name");
- return name.startsWith("m") || name.startsWith("p");
- });
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_filterXfalseX() {
- return g.E().filter(e -> false);
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_filterXtrueX() {
- return g.E().filter(e -> true);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
deleted file mode 100644
index 65eb52f..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
+++ /dev/null
@@ -1,98 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.__;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-/**
- * @author Joshua Shinavier (http://fortytwo.net)
- */
-public abstract class HasNotTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey);
-
- public abstract Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX();
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_hasNotXprop() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_hasNotXprop(convertToVertexId("marko"), "circumference");
- printTraversalForm(traversal);
- assertEquals("marko", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- traversal = get_g_VX1X_hasNotXprop(convertToVertexId("marko"), "name");
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasNotXprop() {
- Traversal<Vertex, Vertex> traversal = get_g_V_hasNotXprop("circumference");
- printTraversalForm(traversal);
- final List<Element> list = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(6, list.size());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasNotXoutXcreatedXX() {
- Traversal<Vertex, String> traversal = get_g_V_hasNotXoutXcreatedXX();
- checkResults(Arrays.asList("vadas", "lop", "ripple"), traversal);
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends HasNotTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {
- return g.V(v1Id).hasNot(propertyKey);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
- return g.V().hasNot(propertyKey);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX() {
- return g.V().hasNot(__.out("created")).values("name");
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java
deleted file mode 100644
index f7165da..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTest.java
+++ /dev/null
@@ -1,325 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW;
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
-import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class HasTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, String> get_g_V_outXknowsX_hasXoutXcreatedXX_name();
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_hasXkeyX(final Object v1Id, final String key);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_hasXname_markoX(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_hasXname_markoX();
-
- public abstract Traversal<Vertex, Vertex> get_g_V_hasXname_blahX();
-
- public abstract Traversal<Vertex, Vertex> get_g_V_hasXblahX();
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_hasXage_gt_30X(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2X(final Object v1Id, final Object v2Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_hasXage_gt_30X();
-
- public abstract Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id);
-
- public abstract Traversal<Edge, Edge> get_g_E_hasLabelXknowsX();
-
- public abstract Traversal<Edge, Edge> get_g_E_hasLabelXuses_traversesX();
-
- public abstract Traversal<Vertex, Vertex> get_g_V_hasLabelXperson_software_blahX();
-
- public abstract Traversal<Vertex, Integer> get_g_V_hasXperson_name_markoX_age();
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id);
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_outXknowsX_hasXoutXcreatedXX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_V_outXknowsX_hasXoutXcreatedXX_name();
- printTraversalForm(traversal);
- checkResults(Arrays.asList("josh"), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_hasXkeyX() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_hasXkeyX(convertToVertexId("marko"), "name");
- printTraversalForm(traversal);
- assertEquals("marko", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- //
- traversal = get_g_VX1X_hasXkeyX(convertToVertexId("marko"), "circumference");
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_hasXname_markoX() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_hasXname_markoX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertEquals("marko", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- traversal = get_g_VX1X_hasXname_markoX(convertToVertexId("vadas"));
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXname_markoX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_hasXname_markoX();
- printTraversalForm(traversal);
- assertEquals("marko", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXname_blahX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_hasXname_blahX();
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXage_gt_30X() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_hasXage_gt_30X();
- printTraversalForm(traversal);
- final List<Element> list = StreamFactory.stream(traversal).collect(Collectors.toList());
- assertEquals(2, list.size());
- for (final Element v : list) {
- assertTrue(v.<Integer>value("age") > 30);
- }
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_hasXage_gt_30X() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_hasXage_gt_30X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- traversal = get_g_VX1X_hasXage_gt_30X(convertToVertexId("josh"));
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_out_hasXid_2X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_hasIdX2X(convertToVertexId("marko"), convertToVertexId("vadas"));
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- assertEquals(convertToVertexId("vadas"), traversal.next().id());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXblahX() {
- assumeTrue(graphMeetsTestRequirements());
- final Traversal<Vertex, Vertex> traversal = get_g_V_hasXblahX();
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- }
-
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_EX7X_hasXlabelXknowsX() {
- //System.out.println(convertToEdgeId("marko", "knows", "vadas"));
- Traversal<Edge, Edge> traversal = get_g_EX7X_hasLabelXknowsX(convertToEdgeId("marko", "knows", "vadas"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- assertEquals("knows", traversal.next().label());
- }
- assertEquals(1, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_E_hasXlabelXknowsX() {
- final Traversal<Edge, Edge> traversal = get_g_E_hasLabelXknowsX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- assertEquals("knows", traversal.next().label());
- }
- assertEquals(2, counter);
- }
-
- @Test
- @LoadGraphWith(CREW)
- public void g_E_hasXlabelXuses_traversesX() {
- final Traversal<Edge, Edge> traversal = get_g_E_hasLabelXuses_traversesX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final String label = traversal.next().label();
- assertTrue(label.equals("uses") || label.equals("traverses"));
- }
- assertEquals(9, counter);
- }
-
- @Test
- @LoadGraphWith(CREW)
- public void g_V_hasXlabelXperson_software_blahX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_hasLabelXperson_software_blahX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final String label = traversal.next().label();
- assertTrue(label.equals("software") || label.equals("person"));
- }
- assertEquals(6, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXperson_name_markoX_age() {
- final Traversal<Vertex, Integer> traversal = get_g_V_hasXperson_name_markoX_age();
- printTraversalForm(traversal);
- assertEquals(29, traversal.next().intValue());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_outE_hasXweight_inside_0_06X_inV() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outE_hasXweight_inside_0_06X_inV(convertToVertexId("marko"));
- printTraversalForm(traversal);
- while (traversal.hasNext()) {
- Vertex vertex = traversal.next();
- assertTrue(vertex.value("name").equals("vadas") || vertex.value("name").equals("lop"));
- }
- assertFalse(traversal.hasNext());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends HasTest {
- @Override
- public Traversal<Vertex, String> get_g_V_outXknowsX_hasXoutXcreatedXX_name() {
- return g.V().out("knows").has(out("created")).values("name");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasXkeyX(final Object v1Id, final String key) {
- return g.V(v1Id).has(key);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasXname_markoX(final Object v1Id) {
- return g.V(v1Id).has("name", "marko");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXname_markoX() {
- return g.V().has("name", "marko");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXname_blahX() {
- return g.V().has("name", "blah");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXblahX() {
- return g.V().has("blah");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasXage_gt_30X(final Object v1Id) {
- return g.V(v1Id).has("age", Compare.gt, 30);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2X(final Object v1Id, final Object v2Id) {
- return g.V(v1Id).out().hasId(v2Id);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXage_gt_30X() {
- return g.V().has("age", Compare.gt, 30);
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
- return g.E(e7Id).hasLabel("knows");
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_hasLabelXknowsX() {
- return g.E().hasLabel("knows");
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_hasLabelXuses_traversesX() {
- return g.E().hasLabel("uses", "traverses");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasLabelXperson_software_blahX() {
- return g.V().hasLabel("person", "software", "blah");
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_hasXperson_name_markoX_age() {
- return g.V().has("person", "name", "marko").values("age");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
- return g.V(v1Id).outE().has("weight", Compare.inside, Arrays.asList(0.0d, 0.6d)).inV();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java
deleted file mode 100644
index 065f1f7..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/IsTest.java
+++ /dev/null
@@ -1,125 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
-import static org.junit.Assert.*;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public abstract class IsTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Integer> get_g_V_valuesXageX_isX32X();
-
- public abstract Traversal<Vertex, Integer> get_g_V_valuesXageX_isXlte_30X();
-
- public abstract Traversal<Vertex, Integer> get_g_V_valuesXageX_isXgte_29X_isXlt_34X();
-
- public abstract Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX();
-
- public abstract Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX();
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_valuesXageX_isX32X() {
- Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isX32X();
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- assertEquals(Integer.valueOf(32), traversal.next());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_valuesXageX_isXlte_30X() {
- Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXlte_30X();
- printTraversalForm(traversal);
- checkResults(Arrays.asList(27, 29), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_valuesXageX_isXgte_29X_isXlt_34X() {
- Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXgte_29X_isXlt_34X();
- printTraversalForm(traversal);
- checkResults(Arrays.asList(29, 32), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX();
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- assertEquals("ripple", traversal.next());
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX();
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- assertEquals("lop", traversal.next());
- assertFalse(traversal.hasNext());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends IsTest {
- @Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_isX32X() {
- return g.V().<Integer>values("age").is(32);
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXlte_30X() {
- return g.V().<Integer>values("age").is(Compare.lte, 30);
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXgte_29X_isXlt_34X() {
- return g.V().<Integer>values("age").is(Compare.gte, 29).is(Compare.lt, 34);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- return g.V().has(in("created").count().is(1l)).values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
- return g.V().has(in("created").count().is(Compare.gte, 2l)).values("name");
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java
deleted file mode 100644
index 0038ddd..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/OrTest.java
+++ /dev/null
@@ -1,77 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.T;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.has;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE;
-import static org.apache.tinkerpop.gremlin.structure.Compare.gt;
-import static org.apache.tinkerpop.gremlin.structure.Compare.gte;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class OrTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, String> get_g_V_orXhasXage_gt_27X__outE_count_gte_2X_name();
-
- public abstract Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name();
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_orXhasXage_gt_27X__outE_count_gte_2X_name() {
- final Traversal<Vertex, String> traversal = get_g_V_orXhasXage_gt_27X__outE_count_gte_2X_name();
- printTraversalForm(traversal);
- checkResults(Arrays.asList("marko", "josh", "peter"), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name();
- printTraversalForm(traversal);
- checkResults(Arrays.asList("marko", "ripple", "lop", "peter"), traversal);
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends OrTest {
- @Override
- public Traversal<Vertex, String> get_g_V_orXhasXage_gt_27X__outE_count_gte_2X_name() {
- return g.V().or(has("age", gt, 27), outE().count().is(gte, 2l)).values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name() {
- return g.V().or(outE("knows"), has(T.label, "software").or().has("age", Compare.gte, 35)).values("name");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
deleted file mode 100644
index 9726b62..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
+++ /dev/null
@@ -1,265 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Scope;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class RangeTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_limitX2X(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_localXoutE_limitX1X_inVX_limitX3X();
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV(final Object v1Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_rangeX5_11X();
-
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by();
-
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by();
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_out_limitX2X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_limitX2X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- traversal.next();
- }
- assertEquals(2, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_localXoutE_limitX1X_inVX_limitX3X() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_localXoutE_limitX1X_inVX_limitX3X();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- traversal.next();
- }
- assertEquals(3, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final String name = traversal.next().value("name");
- assertTrue(name.equals("lop") || name.equals("ripple"));
- }
- assertEquals(1, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final String name = traversal.next().value("name");
- assertTrue(name.equals("lop") || name.equals("ripple"));
- }
- assertEquals(1, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final String name = traversal.next().value("name");
- assertTrue(name.equals("marko") || name.equals("josh") || name.equals("peter"));
- }
- assertEquals(2, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final String name = traversal.next().value("name");
- assertTrue(name.equals("marko") || name.equals("josh") || name.equals("peter"));
- }
- assertEquals(2, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_repeatXbothX_timesX3X_rangeX5_11X() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_repeatXbothX_timesX3X_rangeX5_11X();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- traversal.next();
- counter++;
- }
- assertEquals(6, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- //@IgnoreEngine(TraversalEngine.Type.COMPUTER)
- @Ignore("This should not work cause fold kills the path history")
- public void g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- final Map<String, Object> map = traversal.next();
- final List<Double> weights = (List<Double>) map.get("w");
- if (map.get("s").equals("lop")) {
- assertEquals(1, weights.size());
- assertTrue(Arrays.asList(0.4, 0.2).contains(weights.get(0)));
- } else if (map.get("s").equals("ripple")) {
- assertEquals(1, weights.size());
- assertEquals(1.0, weights.get(0), 0.0);
- } else {
- assertTrue(false);
- }
- counter++;
- }
- assertEquals(2, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- //@IgnoreEngine(TraversalEngine.Type.COMPUTER)
- @Ignore("This should not work cause fold kills the path history")
- public void g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- final Map<String, Object> map = traversal.next();
- final List<Double> weights = (List<Double>) map.get("w");
- if (map.get("s").equals("lop")) {
- assertEquals(2, weights.size());
- assertTrue(Arrays.asList(0.2, 0.4).contains(weights.get(0)));
- assertTrue(Arrays.asList(0.2, 0.4).contains(weights.get(1)));
- assertNotEquals(weights.get(0), weights.get(1));
- } else if (map.get("s").equals("ripple")) {
- assertEquals(0, weights.size());
- } else {
- assertTrue(false);
- }
- counter++;
- }
- assertEquals(2, counter);
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends RangeTest {
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_limitX2X(final Object v1Id) {
- return g.V(v1Id).out().limit(2);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_localXoutE_limitX1X_inVX_limitX3X() {
- return g.V().local(outE().limit(1)).inV().limit(3);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV(final Object v1Id) {
- return g.V(v1Id).out("knows").outE("created").range(0, 1).inV();
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X(final Object v1Id) {
- return g.V(v1Id).out("knows").out("created").range(0, 1);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X(final Object v1Id) {
- return g.V(v1Id).out("created").in("created").range(1, 3);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV(final Object v1Id) {
- return g.V(v1Id).out("created").inE("created").range(1, 3).outV();
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_rangeX5_11X() {
- return g.V().repeat(both()).times(3).range(5, 11);
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by() {
- return g.V().hasLabel("software").as("s").local(inE("created").values("weight").fold().limit(Scope.local, 1)).as("w").select().by("name").by();
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
- return g.V().hasLabel("software").as("s").local(inE("created").values("weight").fold().range(Scope.local, 1, 3)).as("w").select().by("name").by();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
deleted file mode 100644
index edbb91e..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
+++ /dev/null
@@ -1,94 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class RetainTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id);
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_retainXxX(final Object v1Id);
-
- public abstract Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(final Object v1Id);
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_VX1X_out_retainXg_v2X() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_retainXg_v2X(convertToVertexId("marko"), convertToVertexId("vadas"));
- printTraversalForm(traversal);
- assertEquals("vadas", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_out_aggregateXxX_out_retainXxX() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_retainXxX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertEquals("lop", traversal.next().<String>value("name"));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertEquals("marko", traversal.next());
- assertFalse(traversal.hasNext());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends RetainTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {
- return g.V(v1Id).out().retain(g.V(v2Id).next());
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_retainXxX(final Object v1Id) {
- return g.V(v1Id).out().aggregate("x").out().retain("x");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(final Object v1Id) {
- return g.V(v1Id).as("a").out("created").in("created").retain("a").values("name");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java
deleted file mode 100644
index df65486..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SampleTest.java
+++ /dev/null
@@ -1,148 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Scope;
-import org.apache.tinkerpop.gremlin.process.T;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import java.util.Collection;
-import java.util.Map;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class SampleTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Edge, Edge> get_g_E_sampleX1X();
-
- public abstract Traversal<Edge, Edge> get_g_E_sampleX2X_byXweightX();
-
- public abstract Traversal<Vertex, Edge> get_g_V_localXoutE_sampleX1X_byXweightXX();
-
- public abstract Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_2XX();
-
- public abstract Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_5XX();
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_E_sampleX1X() {
- final Traversal<Edge, Edge> traversal = get_g_E_sampleX1X();
- assertTrue(traversal.hasNext());
- traversal.next();
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_E_sampleX2X_byXweightX() {
- final Traversal<Edge, Edge> traversal = get_g_E_sampleX2X_byXweightX();
- assertTrue(traversal.hasNext());
- traversal.next();
- assertTrue(traversal.hasNext());
- traversal.next();
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_localXoutE_sampleX1X_byXweightXX() {
- final Traversal<Vertex, Edge> traversal = get_g_V_localXoutE_sampleX1X_byXweightXX();
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- traversal.next();
- }
- assertEquals(3, counter);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_2XX() {
- final Traversal<Vertex, Map<String, Collection<Double>>> traversal =
- get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_2XX();
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- final Map<String, Collection<Double>> map = traversal.next();
- assertFalse(traversal.hasNext());
- assertEquals(2, map.size());
- assertEquals(2, map.get("software").size());
- assertEquals(2, map.get("person").size());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_5XX() {
- final Traversal<Vertex, Map<String, Collection<Double>>> traversal =
- get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_5XX();
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- final Map<String, Collection<Double>> map = traversal.next();
- assertFalse(traversal.hasNext());
- assertEquals(2, map.size());
- assertEquals(4, map.get("software").size());
- assertEquals(5, map.get("person").size());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends SampleTest {
- @Override
- public Traversal<Edge, Edge> get_g_E_sampleX1X() {
- return g.E().sample(1);
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_sampleX2X_byXweightX() {
- return g.E().sample(2).by("weight");
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_V_localXoutE_sampleX1X_byXweightXX() {
- return g.V().local(outE().sample(1).by("weight"));
- }
-
- @Override
- public Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_2XX() {
- return g.V().<String,Collection<Double>>group().by(T.label).by(bothE().values("weight").fold()).by(sample(Scope.local, 2));
- }
-
- @Override
- public Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_5XX() {
- return g.V().<String,Collection<Double>>group().by(T.label).by(bothE().values("weight").fold()).by(sample(Scope.local, 5));
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java
deleted file mode 100644
index 38a629d..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/SimplePathTest.java
+++ /dev/null
@@ -1,86 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.Path;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class SimplePathTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(final Object v1Id);
-
- public abstract Traversal<Vertex, Path> get_g_V_repeatXboth_simplePathX_timesX3X_path();
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_outXcreatedX_inXcreatedX_simplePath() {
- final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- Vertex vertex = traversal.next();
- assertTrue(vertex.value("name").equals("josh") || vertex.value("name").equals("peter"));
- }
- assertEquals(2, counter);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_repeatXboth_simplePathX_timesX3X_path() {
- final Traversal<Vertex, Path> traversal = get_g_V_repeatXboth_simplePathX_timesX3X_path();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- assertTrue(traversal.next().isSimple());
- }
- assertEquals(18, counter);
- assertFalse(traversal.hasNext());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends SimplePathTest {
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(final Object v1Id) {
- return g.V(v1Id).out("created").in("created").simplePath();
- }
-
-
- @Override
- public Traversal<Vertex, Path> get_g_V_repeatXboth_simplePathX_timesX3X_path() {
- return g.V().repeat(both().simplePath()).times(3).path();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c97e964/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java
deleted file mode 100644
index 89ab5d1..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/WhereTest.java
+++ /dev/null
@@ -1,162 +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.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import java.util.Map;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class WhereTest extends AbstractGremlinProcessTest {
-
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX();
-
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_neq_bX();
-
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX();
-
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX();
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- Map<String, Object> map = traversal.next();
- assertEquals(2, map.size());
- assertTrue(map.containsKey("a"));
- assertTrue(map.containsKey("b"));
- assertEquals(map.get("a"), map.get("b"));
- }
- assertEquals(6, counter);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_b_neqX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_neq_bX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- Map<String, Object> map = traversal.next();
- assertEquals(2, map.size());
- assertTrue(map.containsKey("a"));
- assertTrue(map.containsKey("b"));
- assertNotEquals(map.get("a"), map.get("b"));
- assertTrue(((Vertex) map.get("a")).id().equals(convertToVertexId("marko")) ||
- ((Vertex) map.get("a")).id().equals(convertToVertexId("peter")) ||
- ((Vertex) map.get("a")).id().equals(convertToVertexId("josh")));
- assertTrue(((Vertex) map.get("b")).id().equals(convertToVertexId("marko")) ||
- ((Vertex) map.get("b")).id().equals(convertToVertexId("peter")) ||
- ((Vertex) map.get("b")).id().equals(convertToVertexId("josh")));
- }
- assertEquals(6, counter);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX();
- printTraversalForm(traversal);
- int counter = 0;
- int markoCounter = 0;
- while (traversal.hasNext()) {
- counter++;
- Map<String, Object> map = traversal.next();
- assertEquals(2, map.size());
- assertTrue(map.containsKey("a"));
- assertTrue(map.containsKey("b"));
- assertEquals(convertToVertexId("marko"), ((Vertex) map.get("b")).id());
- if (((Vertex) map.get("a")).id().equals(convertToVertexId("marko")))
- markoCounter++;
- else
- assertTrue(((Vertex) map.get("a")).id().equals(convertToVertexId("josh")) || ((Vertex) map.get("a")).id().equals(convertToVertexId("peter")));
- }
- assertEquals(3, markoCounter);
- assertEquals(5, counter);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- Map<String, Object> map = traversal.next();
- assertEquals(2, map.size());
- assertTrue(map.containsKey("a"));
- assertTrue(map.containsKey("b"));
- assertEquals(convertToVertexId("marko"), ((Vertex) map.get("a")).id());
- assertEquals(convertToVertexId("josh"), ((Vertex) map.get("b")).id());
- }
- assertEquals(1, counter);
- assertFalse(traversal.hasNext());
- }
-
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class Traversals extends WhereTest {
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX() {
- return g.V().has("age").as("a").out().in().has("age").as("b").select().where("a", Compare.eq, "b");
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_neq_bX() {
- return g.V().has("age").as("a").out().in().has("age").as("b").select().where("a", Compare.neq, "b");
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX() {
- return g.V().has("age").as("a").out().in().has("age").as("b").select().where(as("b").has("name", "marko"));
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX() {
- return g.V().has("age").as("a").out().in().has("age").as("b").select().where(as("a").out("knows").as("b"));
- }
- }
-}
\ No newline at end of file