You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/11/30 19:44:39 UTC
[1/3] incubator-tinkerpop git commit: Rollback the implicit
transaction on multi threaded tests.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 677cc500c -> b0e1f660f
Rollback the implicit transaction on multi threaded tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8bcebbae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8bcebbae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8bcebbae
Branch: refs/heads/master
Commit: 8bcebbaef66af670d9226be807a45943120d87c2
Parents: df887ac
Author: pieter <pi...@gmail.com>
Authored: Fri Nov 27 21:42:51 2015 +0200
Committer: pieter <pi...@gmail.com>
Committed: Fri Nov 27 21:42:51 2015 +0200
----------------------------------------------------------------------
.../GremlinGroovyScriptEngineOverGraphTest.java | 21 ++++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8bcebbae/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
index f1838ce..ebbc306 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
@@ -36,21 +36,10 @@ import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
import java.util.concurrent.CountDownLatch;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -195,6 +184,9 @@ public class GremlinGroovyScriptEngineOverGraphTest extends AbstractGremlinTest
assertNotNull(result);
} catch (ScriptException e) {
assertFalse(true);
+ } finally {
+ if (graph.features().graph().supportsTransactions())
+ g.tx().rollback();
}
latch.countDown();
}
@@ -230,6 +222,9 @@ public class GremlinGroovyScriptEngineOverGraphTest extends AbstractGremlinTest
} catch (ScriptException e) {
//System.out.println(e);
assertFalse(true);
+ } finally {
+ if (graph.features().graph().supportsTransactions())
+ g.tx().rollback();
}
latch.countDown();
}
[2/3] incubator-tinkerpop git commit: remove static wildcard imports
Posted by sp...@apache.org.
remove static wildcard imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4d885d1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4d885d1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4d885d1f
Branch: refs/heads/master
Commit: 4d885d1f18bd213b3a1385dbc1576b23a2b3fbe7
Parents: 8bcebba
Author: pieter <pi...@gmail.com>
Authored: Fri Nov 27 22:26:06 2015 +0200
Committer: pieter <pi...@gmail.com>
Committed: Fri Nov 27 22:26:06 2015 +0200
----------------------------------------------------------------------
.../jsr223/GremlinGroovyScriptEngineOverGraphTest.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4d885d1f/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
index ebbc306..5e93d1c 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineOverGraphTest.java
@@ -36,10 +36,19 @@ import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
import java.util.concurrent.CountDownLatch;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
[3/3] incubator-tinkerpop git commit: Merge branch 'master' of
https://github.com/pietermartin/incubator-tinkerpop
Posted by sp...@apache.org.
Merge branch 'master' of https://github.com/pietermartin/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b0e1f660
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b0e1f660
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b0e1f660
Branch: refs/heads/master
Commit: b0e1f660fbaf507a41facf8607084878fda0dbc0
Parents: 677cc50 4d885d1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 30 13:44:16 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Nov 30 13:44:16 2015 -0500
----------------------------------------------------------------------
.../jsr223/GremlinGroovyScriptEngineOverGraphTest.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------