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 2021/09/15 19:02:24 UTC
[tinkerpop] branch master updated (e92250c -> 431d1b2)
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 e92250c Merge branch '3.5-dev'
new 05f3f49 Backported some test assertion adjustments that make them work more consistently across OS/JVM CTR
new 8a9cade Merge branch '3.4-dev' into 3.5-dev
new 431d1b2 Merge branch '3.5-dev'
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:
.../org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch '3.5-dev'
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 431d1b213de7b2b90115636276b7a78201e961d5
Merge: e92250c 8a9cade
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Sep 15 15:02:12 2021 -0400
Merge branch '3.5-dev'
.../org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 01/03: Backported some test assertion adjustments that
make them work more consistently across OS/JVM CTR
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 05f3f49d2c7fdf03891bdbdabf37a23b0f39130b
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Sep 15 15:00:47 2021 -0400
Backported some test assertion adjustments that make them work more consistently across OS/JVM CTR
---
.../gremlin/server/GremlinDriverIntegrateTest.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 0e03486..b57f029 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -588,7 +588,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
try {
results.all().join();
- fail("Should have thrown exception over bad serialization");
+ fail("Should have thrown exception over division by zero");
} catch (Exception ex) {
final Throwable inner = ExceptionUtils.getRootCause(ex);
assertTrue(inner instanceof ResponseException);
@@ -597,7 +597,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final ResponseException rex = (ResponseException) inner;
assertEquals("java.lang.ArithmeticException", rex.getRemoteExceptionHierarchy().get().get(0));
assertEquals(1, rex.getRemoteExceptionHierarchy().get().size());
- assertThat(rex.getRemoteStackTrace().get(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.math.BigDecimal.divide(BigDecimal.java"));
+ assertThat(rex.getRemoteStackTrace().get(), containsString("Division by zero"));
}
// should not die completely just because we had a bad serialization error. that kind of stuff happens
@@ -1082,12 +1082,11 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
- final Instant now = Instant.now();
- final List<Result> r = client.submit("java.time.Instant.ofEpochMilli(" + now.toEpochMilli() + ")").all().join();
+ final List<Result> r = client.submit("java.time.Instant.EPOCH").all().join();
assertEquals(1, r.size());
final Instant then = r.get(0).get(Instant.class);
- assertEquals(now, then);
+ assertEquals(Instant.EPOCH, then);
} finally {
cluster.close();
}
@@ -1120,12 +1119,11 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
- final Instant now = Instant.now();
- final List<Result> r = client.submit("java.time.Instant.ofEpochMilli(" + now.toEpochMilli() + ")").all().join();
+ final List<Result> r = client.submit("java.time.Instant.EPOCH").all().join();
assertEquals(1, r.size());
final Instant then = r.get(0).get(Instant.class);
- assertEquals(now, then);
+ assertEquals(Instant.EPOCH, then);
} finally {
cluster.close();
}
[tinkerpop] 02/03: Merge branch '3.4-dev' into 3.5-dev
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 8a9cade74e9f45c66bbe043c527afef7f16dac12
Merge: 730f70c 05f3f49
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Sep 15 15:01:36 2021 -0400
Merge branch '3.4-dev' into 3.5-dev
.../org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 7a5d097,b57f029..bb870fc
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@@ -565,10 -584,11 +565,10 @@@ public class GremlinDriverIntegrateTes
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
- final ResultSet results = client.submit("1/0");
-
try {
+ final ResultSet results = client.submit("1/0");
results.all().join();
- fail("Should have thrown exception over bad serialization");
+ fail("Should have thrown exception over division by zero");
} catch (Exception ex) {
final Throwable inner = ExceptionUtils.getRootCause(ex);
assertTrue(inner instanceof ResponseException);