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 2019/07/30 14:54:23 UTC
[tinkerpop] branch master updated (0af88d5 -> 64fce34)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 0af88d5 Merge branch 'tp34'
new 31deb7e Moved iterator leak assertion after "test end" event
new 18e9752 Merge branch 'tp33' into tp34
new 64fce34 Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 18e9752ec2e9120397b6f069e67948fdbfa0bc07
Merge: c3fa4b5 31deb7e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 30 10:54:00 2019 -0400
Merge branch 'tp33' into tp34
.../main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 933be7c,9bfbc7b..69f53db
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@@ -149,10 -143,7 +151,8 @@@ public abstract class AbstractGremlinTe
assertEquals("Iterator leak detected. Open iterator count=" + openItrCount, 0, openItrCount);
}
- graphProvider.getTestListener().ifPresent(l -> l.onTestEnd(this.getClass(), name.getMethodName()));
-
// GraphProvider that has implemented the clear method must check null for graph and config.
+ // If #assumeRequirementsAreMetForTest returns false in #setup, graph and config will be null.
graphProvider.clear(graph, config);
// All GraphProvider objects should be an instance of ManagedGraphProvider, as this is handled by GraphManager
[tinkerpop] 01/03: Moved iterator leak assertion after "test end"
event
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 31deb7e33f2a2912449e8e633f72b8d6036d1f69
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 30 10:36:07 2019 -0400
Moved iterator leak assertion after "test end" event
This change should give providers a chance to do any additional cleanup prior to testing for iterator leaks. CTR
---
.../java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 95cfbb4..9bfbc7b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.gremlin.util.iterator.StoreIteratorCounter;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TestName;
@@ -137,13 +136,13 @@ public abstract class AbstractGremlinTest {
@After
public void tearDown() throws Exception {
if (null != graphProvider) {
+ graphProvider.getTestListener().ifPresent(l -> l.onTestEnd(this.getClass(), name.getMethodName()));
+
if (shouldTestIteratorLeak) {
- long openItrCount = StoreIteratorCounter.INSTANCE.getOpenIteratorCount();
+ final long openItrCount = StoreIteratorCounter.INSTANCE.getOpenIteratorCount();
assertEquals("Iterator leak detected. Open iterator count=" + openItrCount, 0, openItrCount);
}
- graphProvider.getTestListener().ifPresent(l -> l.onTestEnd(this.getClass(), name.getMethodName()));
-
// GraphProvider that has implemented the clear method must check null for graph and config.
graphProvider.clear(graph, config);
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 64fce343d3c3c44565e3ff5e447f1433a37ab557
Merge: 0af88d5 18e9752
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 30 10:54:06 2019 -0400
Merge branch 'tp34'
.../main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)