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/02/20 00:17:45 UTC
incubator-tinkerpop git commit: test tweaks.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 1d3fed256 -> 800d772c3
test tweaks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/800d772c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/800d772c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/800d772c
Branch: refs/heads/master
Commit: 800d772c3c075024a87049bc5b2a91d3f8393627
Parents: 1d3fed2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 19 16:17:41 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 19 16:17:41 2015 -0700
----------------------------------------------------------------------
.../process/GroovyProcessComputerSuite.java | 50 ++++++++++++++++--
.../process/GroovyProcessStandardSuite.java | 55 ++++++++++++++++++--
.../gremlin/process/ProcessComputerSuite.java | 5 +-
.../gremlin/process/ProcessStandardSuite.java | 2 +-
.../graph/traversal/step/filter/DedupTest.java | 8 ++-
5 files changed, 103 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/800d772c/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
index 5ba57ed..3f8d926 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
@@ -23,10 +23,49 @@ import org.apache.tinkerpop.gremlin.GraphManager;
import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader;
import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper;
import org.apache.tinkerpop.gremlin.process.computer.ranking.PageRankVertexProgramTest;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyBranchTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyChooseTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyLocalTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyRepeatTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyUnionTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyAndTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyCoinTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyCyclicPathTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyDedupTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyFilterTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyHasNotTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyHasTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyIsTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyOrTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyRangeTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovySampleTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovySimplePathTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyWhereTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyBackTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCoalesceTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyFoldTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMapTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMaxTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMeanTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMinTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyOrderTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyPathTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyPropertiesTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovySelectTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovySumTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyUnfoldTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyValueMapTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyVertexTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyAggregateTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyGroupCountTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyGroupTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyInjectTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyProfileTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovySackTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovySideEffectCapTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyStoreTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyTreeTest;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
@@ -69,6 +108,7 @@ public class GroovyProcessComputerSuite extends ProcessComputerSuite {
// map
GroovyBackTest.ComputerTraversals.class,
+ GroovyCoalesceTest.ComputerTraversals.class,
GroovyCountTest.ComputerTraversals.class,
GroovyFoldTest.ComputerTraversals.class,
GroovyMapTest.ComputerTraversals.class,
@@ -84,7 +124,7 @@ public class GroovyProcessComputerSuite extends ProcessComputerSuite {
GroovyUnfoldTest.ComputerTraversals.class,
GroovyValueMapTest.ComputerTraversals.class,
GroovyVertexTest.ComputerTraversals.class,
- GroovyCoalesceTest.ComputerTraversals.class,
+
// sideEffect
// TODO: GroovyAddEdgeTest.ComputerTest.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/800d772c/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
index 303b96c..086b725 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
@@ -22,10 +22,55 @@ import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.GraphManager;
import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader;
import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyBranchTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyChooseTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyLocalTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyRepeatTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.GroovyUnionTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyAndTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyCoinTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyCyclicPathTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyDedupTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyExceptTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyFilterTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyHasNotTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyHasTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyIsTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyOrTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyRangeTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyRetainTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovySampleTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovySimplePathTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.GroovyWhereTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyBackTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCoalesceTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyCountTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyFoldTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMapTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMatchTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMaxTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMeanTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyMinTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyOrderTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyPathTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyPropertiesTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovySelectTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovySumTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyUnfoldTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyValueMapTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyVertexTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyAddEdgeTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyAggregateTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyGroupCountTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyGroupTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyInjectTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyProfileTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovySackTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovySideEffectCapTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovySideEffectTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyStoreTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovySubgraphTest;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroovyTreeTest;
import org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
@@ -66,6 +111,7 @@ public class GroovyProcessStandardSuite extends ProcessStandardSuite {
GroovyWhereTest.StandardTraversals.class,
// map
GroovyBackTest.StandardTraversals.class,
+ GroovyCoalesceTest.StandardTraversals.class,
GroovyCountTest.StandardTraversals.class,
GroovyFoldTest.StandardTraversals.class,
GroovyMapTest.StandardTraversals.class,
@@ -81,7 +127,6 @@ public class GroovyProcessStandardSuite extends ProcessStandardSuite {
GroovyUnfoldTest.StandardTraversals.class,
GroovyValueMapTest.StandardTraversals.class,
GroovyVertexTest.StandardTraversals.class,
- GroovyCoalesceTest.StandardTraversals.class,
// sideEffect
GroovyAddEdgeTest.StandardTraversals.class,
GroovyAggregateTest.StandardTraversals.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/800d772c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index a6ce57a..883fcb6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -111,9 +111,6 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
*/
private static final Class<?>[] allTests = new Class<?>[]{
- // basic api semantics testing
- // GraphComputerTest.ComputerTest.class, // todo: not sure this should be here as it forces retest of GraphComputer without an "implementation"
-
// branch
BranchTest.Traversals.class,
ChooseTest.Traversals.class,
@@ -140,6 +137,7 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
// map
BackTest.Traversals.class,
+ CoalesceTest.Traversals.class,
CountTest.Traversals.class,
FoldTest.Traversals.class,
MapTest.Traversals.class,
@@ -155,7 +153,6 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
UnfoldTest.Traversals.class,
ValueMapTest.Traversals.class,
VertexTest.Traversals.class,
- CoalesceTest.Traversals.class,
// sideEffect
// TODO: AddEdgeTest.ComputerTest.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/800d772c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index 163e467..0e11ecd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -95,6 +95,7 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
// map
BackTest.Traversals.class,
+ CoalesceTest.Traversals.class,
CountTest.Traversals.class,
FoldTest.Traversals.class,
MapTest.Traversals.class,
@@ -110,7 +111,6 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
VertexTest.Traversals.class,
UnfoldTest.Traversals.class,
ValueMapTest.Traversals.class,
- CoalesceTest.Traversals.class,
// sideEffect
AddEdgeTest.Traversals.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/800d772c/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
index 748028b..76904f6 100644
--- 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
@@ -30,7 +30,11 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.StreamFactory;
import org.junit.Test;
-import java.util.*;
+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;
@@ -136,7 +140,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
@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));
+ return g.V().<String, Set<Double>>group().by(T.label).by(bothE().values("weight").fold()).by(dedup(Scope.local));
}
}
}