You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/09/01 10:40:19 UTC
[1/2] tinkerpop git commit: Test setup logic leaking into traversal
construction.
Repository: tinkerpop
Updated Branches:
refs/heads/master 0f16a85a6 -> fbde4e2ae
Test setup logic leaking into traversal construction.
Moved the setup logic back to the test itself CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3ed45d5d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3ed45d5d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3ed45d5d
Branch: refs/heads/master
Commit: 3ed45d5d80f1bf617519e5ffd871ac658cdd18af
Parents: 0f16a85
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 1 06:29:03 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 1 06:29:03 2016 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/VertexTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3ed45d5d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index f5ca088..fbc735a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -552,7 +552,9 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1_2_3_4X_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1_2_3_4X_name(convertToVertexId("marko"), convertToVertexId("vadas"), convertToVertexId("lop"), convertToVertexId("josh"));
+ final Object vLop = convertToVertexId("lop");
+ g.V(vLop).drop().iterate();
+ final Traversal<Vertex, String> traversal = get_g_VX1_2_3_4X_name(convertToVertexId("marko"), convertToVertexId("vadas"), vLop, convertToVertexId("josh"));
printTraversalForm(traversal);
checkResults(Arrays.asList("marko", "vadas", "josh"), traversal);
assertFalse(traversal.hasNext());
@@ -697,7 +699,6 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, String> get_g_VX1_2_3_4X_name(final Object v1Id, final Object v2Id, final Object v3Id, final Object v4Id) {
- g.V(v3Id).drop().iterate();
return g.V(v1Id, v2Id, v3Id, v4Id).values("name");
}
[2/2] tinkerpop git commit: Add log4j as test dependency to modules
that didn't have it
Posted by sp...@apache.org.
Add log4j as test dependency to modules that didn't have it
Can't believe this was still messed up - unreal CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fbde4e2a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fbde4e2a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fbde4e2a
Branch: refs/heads/master
Commit: fbde4e2ae67b52ad56b4c33f8b3c7eb56a1a5fea
Parents: 3ed45d5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 1 06:39:18 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 1 06:39:18 2016 -0400
----------------------------------------------------------------------
giraph-gremlin/pom.xml | 6 ++++++
gremlin-benchmark/pom.xml | 6 ++++++
hadoop-gremlin/pom.xml | 6 ++++++
neo4j-gremlin/pom.xml | 6 ++++++
spark-gremlin/pom.xml | 6 ++++++
tinkergraph-gremlin/pom.xml | 6 ++++++
6 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbde4e2a/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 3684c44..2e83f89 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -175,6 +175,12 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbde4e2a/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index adc0a24..e00144c 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -66,6 +66,12 @@ limitations under the License.
<version>${jmh.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbde4e2a/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index dcfac2f..88133eb 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -149,6 +149,12 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbde4e2a/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index b2a5de1..51590d7 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -54,6 +54,12 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbde4e2a/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index a8bc9ae..fe8988c 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -309,6 +309,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbde4e2a/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 85f7cc9..84821bc 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -49,6 +49,12 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${basedir}/target</directory>