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/04/24 17:46:01 UTC
[15/31] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/refactor-io' into refactor-io
Merge remote-tracking branch 'origin/refactor-io' into refactor-io
Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/358690f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/358690f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/358690f7
Branch: refs/heads/master
Commit: 358690f7c57b3543becafb2244cc1368915214fc
Parents: eba4eb9 a3fc746
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 23 18:51:56 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 23 18:51:56 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/util/Attachable.java | 14 +-
.../apache/tinkerpop/gremlin/TestHelper.java | 179 +++++++++----------
.../tinkerpop/gremlin/structure/IoTest.java | 8 +-
.../structure/util/star/StarGraphTest.java | 136 +++-----------
4 files changed, 124 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/358690f7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
index 21394a4,bb284c6..3445d40
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
@@@ -1285,11 -1285,9 +1285,9 @@@ public class IoTest extends AbstractGre
final AtomicInteger called = new AtomicInteger(0);
final GryoReader reader = graph.io(gryo).reader().workingDirectory(tempPath).create();
--
- final byte[] x = os.toByteArray();
try (final VertexByteArrayInputStream vbais = new VertexByteArrayInputStream(new ByteArrayInputStream(os.toByteArray()))) {
- reader.readVertex(new ByteArrayInputStream(vbais.readVertexBytes().toByteArray()),
+ final byte[] y = vbais.readVertexBytes().toByteArray();
+ reader.readVertex(new ByteArrayInputStream(y),
attachable -> {
final Vertex detachedVertex = attachable.get();
called.incrementAndGet();
@@@ -1386,9 -1383,12 +1384,9 @@@
final GryoReader reader = graph.io(gryo).reader().workingDirectory(tempPath).create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
- reader.readVertex(bais, Direction.OUT, attachable -> {
+ reader.readVertex(bais, attachable -> {
final Vertex detachedVertex = attachable.get();
- TestHelper.validateVertex(v1, detachedVertex);
- assertEquals(v1.id(), detachedVertex.id());
- assertEquals(v1.label(), detachedVertex.label());
- assertEquals(1, IteratorUtils.count(detachedVertex.properties()));
- assertEquals(v1.value("name"), detachedVertex.value("name").toString());
++ TestHelper.validateVertexEquality(v1, detachedVertex);
calledVertex.set(true);
return detachedVertex;
},
@@@ -1481,10 -1482,14 +1479,10 @@@
final GryoReader reader = graph.io(gryo).reader().workingDirectory(tempPath).create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
- reader.readVertex(bais, Direction.IN, attachable -> {
+ reader.readVertex(bais, attachable -> {
final Vertex detachedVertex = attachable.get();
- TestHelper.validateVertex(v1, detachedVertex);
- assertEquals(v1.id(), detachedVertex.id());
- assertEquals(v1.label(), detachedVertex.label());
- assertEquals(1, IteratorUtils.count(detachedVertex.properties()));
- assertEquals(v1.value("name"), detachedVertex.value("name").toString());
++ TestHelper.validateVertexEquality(v1, detachedVertex);
calledVertex.set(true);
-
return detachedVertex;
}, attachable -> {
final Edge detachedEdge = attachable.get();
@@@ -1578,10 -1584,14 +1576,10 @@@
final GryoReader reader = graph.io(gryo).reader().workingDirectory(tempPath).create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
- reader.readVertex(bais, Direction.BOTH, attachable -> {
+ reader.readVertex(bais, attachable -> {
final Vertex detachedVertex = attachable.get();
- TestHelper.validateVertex(v1, detachedVertex);
- assertEquals(v1.id(), detachedVertex.id());
- assertEquals(v1.label(), detachedVertex.label());
- assertEquals(1, IteratorUtils.count(detachedVertex.properties()));
- assertEquals(v1.value("name"), detachedVertex.value("name").toString());
++ TestHelper.validateVertexEquality(v1, detachedVertex);
calledVertex.set(true);
-
return detachedVertex;
},attachable -> {
final Edge detachedEdge = attachable.get();