Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 99989f98f -> 6410240bc
Add some javadoc to the gremlin-driver testers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/88e1117a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/88e1117a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/88e1117a
Branch: refs/heads/master
Commit: 88e1117acb99d95c87cd891bded3381f24106284
Parents: 73a719d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 14 10:43:18 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 14 10:43:18 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java | 2 ++
.../tinkerpop/gremlin/driver/util/ProfilingApplication.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/88e1117a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
index 084f71a..fea23bf 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
@@ -26,6 +26,8 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
/**
+ * An internal application used to test out ranges of configuration parameters for Gremlin Driver.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class ConfigurationEvaluator {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/88e1117a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
index 1b0e211..beb6d17 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
@@ -39,6 +39,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.IntStream;
/**
+ * An internal application used to test out configuration parameters for Gremlin Driver.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class ProfilingApplication {
@@ -166,7 +168,7 @@ public class ProfilingApplication {
System.out.println(String.format("avg req/sec: %s", averageRequestPerSecond));
if (f != null) {
try (final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(f, true)))) {
- writer.println(String.join("\t", String.valueOf(parallelism), "\t", String.valueOf(nioPoolSize), String.valueOf(minConnectionPoolSize), String.valueOf(maxConnectionPoolSize), String.valueOf(minSimultaneousUsagePerConnection), String.valueOf(maxSimultaneousUsagePerConnection), String.valueOf(minInProcessPerConnection), String.valueOf(maxInProcessPerConnection), String.valueOf(workerPoolSize), String.valueOf(averageRequestPerSecond)));
+ writer.println(String.join("\t", String.valueOf(parallelism), String.valueOf(nioPoolSize), String.valueOf(minConnectionPoolSize), String.valueOf(maxConnectionPoolSize), String.valueOf(minSimultaneousUsagePerConnection), String.valueOf(maxSimultaneousUsagePerConnection), String.valueOf(minInProcessPerConnection), String.valueOf(maxInProcessPerConnection), String.valueOf(workerPoolSize), String.valueOf(averageRequestPerSecond)));
}
}
Assert exception for ReadOnlyStrategy if not testing OLAP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6410240b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6410240b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6410240b
Branch: refs/heads/master
Commit: 6410240bc1bb8405f15711563789edf3f91ea26b
Parents: 6858def
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 14 12:57:17 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 14 12:57:17 2015 -0400
----------------------------------------------------------------------
.../process/AbstractGremlinProcessTest.java | 2 +-
.../gremlin/process/ProcessComputerSuite.java | 2 --
.../verification/ReadOnlyStrategyProcessTest.java | 18 ++++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6410240b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 494dbf8..8f453a9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -53,7 +53,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
/**
* Determines if this test suite has "computer" requirements.
*/
- private boolean hasGraphComputerRequirement() {
+ protected boolean hasGraphComputerRequirement() {
// do the negation of STANDARD as we expect a future type of REASONING that would infer COMPUTER support
return !GraphManager.getTraversalEngineType().equals(TraversalEngine.Type.STANDARD);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6410240b/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 19e807e..0b0828a 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
@@ -48,8 +48,6 @@ import org.junit.runners.model.RunnerBuilder;
*/
public class ProcessComputerSuite extends AbstractGremlinSuite {
- // todo: all tests are not currently passing. see specific todos in each test
-
/**
* This list of tests in the suite that will be executed as part of this suite.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6410240b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyProcessTest.java
index 24fd73c..12ad2c5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategyProcessTest.java
@@ -21,15 +21,14 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -100,15 +99,18 @@ public class ReadOnlyStrategyProcessTest extends AbstractGremlinProcessTest {
return graphProvider.traversal(graph, ReadOnlyStrategy.instance());
}
- private void assertTraversal(final Traversal t, final boolean hasMutatingStep) {
+ private void assertTraversal(final Traversal t, final boolean expectMutatingStep) {
try {
t.asAdmin().applyStrategies();
- if (hasMutatingStep) fail("The strategy should have found a mutating step.");
+ if (expectMutatingStep) fail("The strategy should have found a mutating step.");
} catch (final IllegalStateException ise) {
- if (!hasMutatingStep)
+ if (!expectMutatingStep)
fail("The traversal should not have failed as there is no mutating step.");
- //else TODO: Stephen, TraversalVerificationStrategy fails before this as mutating operations are not allowed in OLAP
- // assertEquals("The provided traversal has a mutating step and thus is not read only", ise.getMessage());
+ else {
+ // TraversalVerificationStrategy fails before this as mutating operations are not allowed in OLAP
+ if (!hasGraphComputerRequirement())
+ assertThat(ise.getMessage(), startsWith("The provided traversal has a mutating step and thus is not read only"));
+ }
}
}
}
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6858defc Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6858defc Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6858defc Branch: refs/heads/master Commit: 6858defc8ab414ad46db48b3ee66c09312745b51 Parents: 88e1117 99989f9 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu May 14 12:47:05 2015 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu May 14 12:47:05 2015 -0400 ---------------------------------------------------------------------- .../gremlin/process/traversal/step/sideEffect/StoreTest.java | 2 +- .../hadoop/process/computer/giraph/GiraphComputeVertex.java | 3 --- .../hadoop/process/computer/giraph/GiraphGraphComputer.java | 7 +++---- 3 files changed, 4 insertions(+), 8 deletions(-) ----------------------------------------------------------------------