Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63A5318E34 for ; Thu, 3 Dec 2015 16:49:52 +0000 (UTC) Received: (qmail 71202 invoked by uid 500); 3 Dec 2015 16:43:06 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 71176 invoked by uid 500); 3 Dec 2015 16:43:06 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 71166 invoked by uid 99); 3 Dec 2015 16:43:06 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 16:43:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 896EC1A0AD3 for ; Thu, 3 Dec 2015 16:43:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id lJS63hVIrz5Q for ; Thu, 3 Dec 2015 16:42:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 00D9530E17 for ; Thu, 3 Dec 2015 16:42:57 +0000 (UTC) Received: (qmail 70873 invoked by uid 99); 3 Dec 2015 16:42:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 16:42:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C600E6821; Thu, 3 Dec 2015 16:42:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Date: Thu, 03 Dec 2015 16:43:10 -0000 Message-Id: <41d62a90c53e47279ff99fc40f6eda15@git.apache.org> In-Reply-To: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org> References: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] incubator-tinkerpop git commit: Rollback the implicit transaction on multi threaded tests. 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/TINKERPOP3-982 Commit: 8bcebbaef66af670d9226be807a45943120d87c2 Parents: df887ac Author: pieter Authored: Fri Nov 27 21:42:51 2015 +0200 Committer: pieter 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(); }