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 2016/12/28 13:37:24 UTC
[1/2] tinkerpop git commit: Fixed broken GryoMapper test CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 6c09b722c -> a086fbe96
Fixed broken GryoMapper test CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1634b996
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1634b996
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1634b996
Branch: refs/heads/master
Commit: 1634b996830ef54cabeb7d54908336412b0cddf5
Parents: fabc4b3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 28 08:36:36 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Dec 28 08:36:36 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1634b996/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
index 9f5ba41..1dc9b48 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
@@ -57,6 +57,7 @@ import java.time.YearMonth;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -64,6 +65,7 @@ import java.util.function.Supplier;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -362,7 +364,7 @@ public class GryoMapperTest {
@Test
public void shouldHandleByteBuffer() throws Exception {
final ByteBuffer bb = ByteBuffer.wrap("some bytes for you".getBytes());
- assertEquals(bb, serializeDeserialize(bb, ByteBuffer.class));
+ assertThat(Arrays.equals(bb.array(), serializeDeserialize(bb, ByteBuffer.class).array()), is(true));
}
public <T> T serializeDeserialize(final Object o, final Class<T> clazz) throws Exception {
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a086fbe9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a086fbe9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a086fbe9
Branch: refs/heads/master
Commit: a086fbe96201b82cdc70aa395e208061cd0bf85c
Parents: 6c09b72 1634b99
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 28 08:37:03 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Dec 28 08:37:03 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------