This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a commit to branch v4-io-test
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/v4-io-test by this push:
new 8e84c15b85 python updates
8e84c15b85 is described below
commit 8e84c15b8571854ecfaf1015f51567631410b943
Author: Ken Hu <[email protected]>
AuthorDate: Sun Aug 18 21:49:31 2024 -0700
python updates
---
.../src/main/python/tests/structure/io/model.py | 56 ++--
.../tests/structure/io/test_graphbinaryv4model.py | 143 ++++++----
.../graphson/bulked-traverser-v4-no-types.json | 14 -
.../graphson/edge-property-v4-no-types.json | 4 -
.../graphson/empty-binary-v4-no-types.json | 1 -
.../graphson/empty-bulkset-v4-no-types.json | 1 -
.../structure/graphson/empty-list-v4-no-types.json | 1 -
.../structure/graphson/empty-map-v4-no-types.json | 1 -
.../structure/graphson/empty-path-v4-no-types.json | 4 -
.../structure/graphson/empty-set-v4-no-types.json | 1 -
.../graphson/empty-traverser-v4-no-types.json | 4 -
.../graphson/forever-duration-v4-no-types.json | 1 -
.../structure/graphson/max-byte-v4-no-types.json | 1 -
.../structure/graphson/max-date-v4-no-types.json | 1 -
.../structure/graphson/max-double-v4-no-types.json | 1 -
.../structure/graphson/max-float-v4-no-types.json | 1 -
.../structure/graphson/max-int-v4-no-types.json | 1 -
.../structure/graphson/max-long-v4-no-types.json | 1 -
.../graphson/max-offsetdatetime-v4-no-types.json | 1 -
.../structure/graphson/max-short-v4-no-types.json | 1 -
.../graphson/meta-vertexproperty-v4-no-types.json | 8 -
.../structure/graphson/min-byte-v4-no-types.json | 1 -
.../structure/graphson/min-date-v4-no-types.json | 1 -
.../structure/graphson/min-double-v4-no-types.json | 1 -
.../structure/graphson/min-float-v4-no-types.json | 1 -
.../structure/graphson/min-int-v4-no-types.json | 1 -
.../structure/graphson/min-long-v4-no-types.json | 1 -
.../graphson/min-offsetdatetime-v4-no-types.json | 1 -
.../structure/graphson/min-short-v4-no-types.json | 1 -
.../structure/graphson/nan-double-v4-no-types.json | 1 -
.../structure/graphson/nan-float-v4-no-types.json | 1 -
.../graphson/neg-bigdecimal-v4-no-types.json | 1 -
.../graphson/neg-biginteger-v4-no-types.json | 1 -
.../graphson/neg-inf-double-v4-no-types.json | 1 -
.../graphson/neg-inf-float-v4-no-types.json | 1 -
.../graphson/neg-max-double-v4-no-types.json | 1 -
.../graphson/neg-max-float-v4-no-types.json | 1 -
.../graphson/neg-min-double-v4-no-types.json | 1 -
.../graphson/neg-min-float-v4-no-types.json | 1 -
.../structure/graphson/nil-uuid-v4-no-types.json | 1 -
.../graphson/no-prop-edge-v4-no-types.json | 9 -
.../graphson/no-prop-vertex-v4-no-types.json | 5 -
.../graphson/null-property-v4-no-types.json | 4 -
.../graphson/pos-bigdecimal-v4-no-types.json | 1 -
.../graphson/pos-biginteger-v4-no-types.json | 1 -
.../graphson/pos-inf-double-v4-no-types.json | 1 -
.../graphson/pos-inf-float-v4-no-types.json | 1 -
.../structure/graphson/prop-path-v4-no-types.json | 62 ----
...set-cardinality-vertexproperty-v4-no-types.json | 8 -
.../graphson/specified-uuid-v4-no-types.json | 1 -
.../structure/graphson/str-binary-v4-no-types.json | 1 -
.../graphson/tinker-graph-v4-no-types.json | 313 ---------------------
.../graphson/traversal-edge-v4-no-types.json | 12 -
.../graphson/traversal-path-v4-no-types.json | 16 --
.../graphson/traversal-vertex-v4-no-types.json | 39 ---
.../traversal-vertexproperty-v4-no-types.json | 5 -
.../graphson/var-bulkset-v4-no-types.json | 1 -
.../graphson/var-type-list-v4-no-types.json | 1 -
.../graphson/var-type-map-v4-no-types.json | 0
.../graphson/var-type-set-v4-no-types.json | 1 -
.../graphson/vertex-traverser-v4-no-types.json | 42 ---
.../structure/graphson/zero-date-v4-no-types.json | 1 -
.../graphson/zero-duration-v4-no-types.json | 1 -
.../{ => io}/graphbinary/bulked-traverser-v4.gbin | Bin
.../{ => io}/graphbinary/edge-property-v4.gbin | Bin
.../{ => io}/graphbinary/empty-binary-v4.gbin | Bin
.../{ => io}/graphbinary/empty-bulkset-v4.gbin | Bin
.../{ => io}/graphbinary/empty-list-v4.gbin | Bin
.../{ => io}/graphbinary/empty-map-v4.gbin | Bin
.../{ => io}/graphbinary/empty-path-v4.gbin | Bin
.../{ => io}/graphbinary/empty-set-v4.gbin | Bin
.../{ => io}/graphbinary/empty-traverser-v4.gbin | Bin
.../structure/io/graphbinary/false-boolean-v4.gbin | Bin 0 -> 3 bytes
.../{ => io}/graphbinary/forever-duration-v4.gbin | Bin
.../structure/{ => io}/graphbinary/id-t-v4.gbin | Bin
.../{ => io}/graphbinary/max-byte-v4.gbin | Bin
.../{ => io}/graphbinary/max-date-v4.gbin | Bin
.../{ => io}/graphbinary/max-double-v4.gbin | Bin
.../{ => io}/graphbinary/max-float-v4.gbin | Bin
.../structure/{ => io}/graphbinary/max-int-v4.gbin | Bin
.../{ => io}/graphbinary/max-long-v4.gbin | Bin
.../graphbinary/max-offsetdatetime-v4.gbin | Bin
.../{ => io}/graphbinary/max-short-v4.gbin | Bin
.../graphbinary/meta-vertexproperty-v4.gbin | Bin
.../{ => io}/graphbinary/min-byte-v4.gbin | Bin
.../{ => io}/graphbinary/min-date-v4.gbin | Bin
.../{ => io}/graphbinary/min-double-v4.gbin | Bin
.../{ => io}/graphbinary/min-float-v4.gbin | Bin
.../structure/{ => io}/graphbinary/min-int-v4.gbin | Bin
.../{ => io}/graphbinary/min-long-v4.gbin | Bin
.../graphbinary/min-offsetdatetime-v4.gbin | Bin
.../{ => io}/graphbinary/min-short-v4.gbin | Bin
.../structure/io/graphbinary/mixed-string-v4.gbin | Bin 0 -> 15 bytes
.../io/graphbinary/multi-byte-char-v4.gbin | Bin 0 -> 4 bytes
.../{ => io}/graphbinary/nan-double-v4.gbin | Bin
.../{ => io}/graphbinary/nan-float-v4.gbin | Bin
.../{ => io}/graphbinary/neg-bigdecimal-v4.gbin | Bin
.../{ => io}/graphbinary/neg-biginteger-v4.gbin | Bin
.../{ => io}/graphbinary/neg-inf-double-v4.gbin | Bin
.../{ => io}/graphbinary/neg-inf-float-v4.gbin | Bin
.../{ => io}/graphbinary/neg-max-double-v4.gbin | Bin
.../{ => io}/graphbinary/neg-max-float-v4.gbin | Bin
.../{ => io}/graphbinary/neg-min-double-v4.gbin | Bin
.../{ => io}/graphbinary/neg-min-float-v4.gbin | Bin
.../{ => io}/graphbinary/neg-zero-double-v4.gbin | Bin
.../{ => io}/graphbinary/neg-zero-float-v4.gbin | Bin
.../{ => io}/graphbinary/nil-uuid-v4.gbin | Bin
.../{ => io}/graphbinary/no-prop-edge-v4.gbin | Bin
.../{ => io}/graphbinary/no-prop-vertex-v4.gbin | Bin
.../{ => io}/graphbinary/null-property-v4.gbin | Bin
.../{ => io}/graphbinary/out-direction-v4.gbin | Bin
.../{ => io}/graphbinary/pos-bigdecimal-v4.gbin | Bin
.../{ => io}/graphbinary/pos-biginteger-v4.gbin | Bin
.../{ => io}/graphbinary/pos-inf-double-v4.gbin | Bin
.../{ => io}/graphbinary/pos-inf-float-v4.gbin | Bin
.../{ => io}/graphbinary/precision-date-v4.gbin | Bin
.../{ => io}/graphbinary/prop-path-v4.gbin | Bin
.../set-cardinality-vertexproperty-v4.gbin | Bin
.../io/graphbinary/single-byte-char-v4.gbin | Bin 0 -> 3 bytes
.../io/graphbinary/single-byte-string-v4.gbin | Bin 0 -> 9 bytes
.../{ => io}/graphbinary/specified-uuid-v4.gbin | Bin
.../{ => io}/graphbinary/str-binary-v4.gbin | Bin
.../{ => io}/graphbinary/tinker-graph-v4.gbin | Bin
.../{ => io}/graphbinary/traversal-edge-v4.gbin | Bin
.../{ => io}/graphbinary/traversal-path-v4.gbin | Bin
.../io/graphbinary/traversal-tree-v4.gbin | Bin 0 -> 152 bytes
.../{ => io}/graphbinary/traversal-vertex-v4.gbin | Bin
.../graphbinary/traversal-vertexproperty-v4.gbin | Bin
.../structure/io/graphbinary/true-boolean-v4.gbin | Bin 0 -> 3 bytes
.../io/graphbinary/unspecified-null-v4.gbin | 1 +
.../{ => io}/graphbinary/var-bulkset-v4.gbin | Bin
.../{ => io}/graphbinary/var-type-list-v4.gbin | Bin
.../{ => io}/graphbinary/var-type-map-v4.gbin | Bin
.../{ => io}/graphbinary/var-type-set-v4.gbin | Bin
.../{ => io}/graphbinary/vertex-traverser-v4.gbin | Bin
.../{ => io}/graphbinary/zero-date-v4.gbin | Bin
.../{ => io}/graphbinary/zero-duration-v4.gbin | Bin
.../{ => io}/graphson/bulked-traverser-v4.json | 0
.../{ => io}/graphson/edge-property-v4.json | 0
.../{ => io}/graphson/empty-binary-v4.json | 0
.../{ => io}/graphson/empty-bulkset-v4.json | 0
.../structure/{ => io}/graphson/empty-list-v4.json | 0
.../structure/{ => io}/graphson/empty-map-v4.json | 0
.../structure/{ => io}/graphson/empty-path-v4.json | 0
.../structure/{ => io}/graphson/empty-set-v4.json | 0
.../{ => io}/graphson/empty-traverser-v4.json | 0
.../structure/io/graphson/false-boolean-v4.json | 1 +
.../{ => io}/graphson/forever-duration-v4.json | 0
.../gremlin/structure/io/graphson/id-t-v4.json | 4 +
.../structure/{ => io}/graphson/max-byte-v4.json | 0
.../structure/{ => io}/graphson/max-date-v4.json | 0
.../structure/{ => io}/graphson/max-double-v4.json | 0
.../structure/{ => io}/graphson/max-float-v4.json | 0
.../structure/{ => io}/graphson/max-int-v4.json | 0
.../structure/{ => io}/graphson/max-long-v4.json | 0
.../{ => io}/graphson/max-offsetdatetime-v4.json | 0
.../structure/{ => io}/graphson/max-short-v4.json | 0
.../{ => io}/graphson/meta-vertexproperty-v4.json | 0
.../structure/{ => io}/graphson/min-byte-v4.json | 0
.../structure/{ => io}/graphson/min-date-v4.json | 0
.../structure/{ => io}/graphson/min-double-v4.json | 0
.../structure/{ => io}/graphson/min-float-v4.json | 0
.../structure/{ => io}/graphson/min-int-v4.json | 0
.../structure/{ => io}/graphson/min-long-v4.json | 0
.../{ => io}/graphson/min-offsetdatetime-v4.json | 0
.../structure/{ => io}/graphson/min-short-v4.json | 0
.../structure/io/graphson/mixed-string-v4.json | 1 +
.../structure/io/graphson/multi-byte-char-v4.json | 4 +
.../structure/{ => io}/graphson/nan-double-v4.json | 0
.../structure/{ => io}/graphson/nan-float-v4.json | 0
.../{ => io}/graphson/neg-bigdecimal-v4.json | 0
.../{ => io}/graphson/neg-biginteger-v4.json | 0
.../{ => io}/graphson/neg-inf-double-v4.json | 0
.../{ => io}/graphson/neg-inf-float-v4.json | 0
.../{ => io}/graphson/neg-max-double-v4.json | 0
.../{ => io}/graphson/neg-max-float-v4.json | 0
.../{ => io}/graphson/neg-min-double-v4.json | 0
.../{ => io}/graphson/neg-min-float-v4.json | 0
.../graphson/neg-zero-double-v4.json} | 2 +-
.../graphson/neg-zero-float-v4.json} | 2 +-
.../structure/{ => io}/graphson/nil-uuid-v4.json | 0
.../{ => io}/graphson/no-prop-edge-v4.json | 0
.../{ => io}/graphson/no-prop-vertex-v4.json | 0
.../{ => io}/graphson/null-property-v4.json | 0
.../structure/io/graphson/out-direction-v4.json | 4 +
.../{ => io}/graphson/pos-bigdecimal-v4.json | 0
.../{ => io}/graphson/pos-biginteger-v4.json | 0
.../{ => io}/graphson/pos-inf-double-v4.json | 0
.../{ => io}/graphson/pos-inf-float-v4.json | 0
.../graphson/precision-date-v4.json} | 2 +-
.../structure/{ => io}/graphson/prop-path-v4.json | 0
.../set-cardinality-vertexproperty-v4.json | 0
.../structure/io/graphson/single-byte-char-v4.json | 4 +
.../io/graphson/single-byte-string-v4.json | 1 +
.../{ => io}/graphson/specified-uuid-v4.json | 0
.../structure/{ => io}/graphson/str-binary-v4.json | 0
.../{ => io}/graphson/tinker-graph-v4.json | 0
.../{ => io}/graphson/traversal-edge-v4.json | 0
.../{ => io}/graphson/traversal-path-v4.json | 0
.../structure/io/graphson/traversal-tree-v4.json | 60 ++++
.../{ => io}/graphson/traversal-vertex-v4.json | 0
.../graphson/traversal-vertexproperty-v4.json | 0
.../structure/io/graphson/true-boolean-v4.json | 1 +
.../structure/io/graphson/unspecified-null-v4.json | 1 +
.../{ => io}/graphson/var-bulkset-v4.json | 0
.../{ => io}/graphson/var-type-list-v4.json | 0
.../{ => io}/graphson/var-type-map-v4.json | 12 +-
.../{ => io}/graphson/var-type-set-v4.json | 2 +-
.../{ => io}/graphson/vertex-traverser-v4.json | 0
.../structure/{ => io}/graphson/zero-date-v4.json | 0
.../{ => io}/graphson/zero-duration-v4.json | 0
211 files changed, 217 insertions(+), 677 deletions(-)
diff --git a/gremlin-python/src/main/python/tests/structure/io/model.py
b/gremlin-python/src/main/python/tests/structure/io/model.py
index c819df496a..1e04de404d 100644
--- a/gremlin-python/src/main/python/tests/structure/io/model.py
+++ b/gremlin-python/src/main/python/tests/structure/io/model.py
@@ -1,30 +1,27 @@
import datetime
import uuid
-from gremlin_python.statics import timestamp, short, long, bigint, BigDecimal,
SingleByte, SingleChar, ByteBufferType
+from gremlin_python.statics import short, long, bigint, BigDecimal,
SingleByte, ByteBufferType
from gremlin_python.structure.graph import Vertex, Edge, Property,
VertexProperty, Path
-from gremlin_python.structure.io.graphbinaryV4 import GraphBinaryWriter,
GraphBinaryReader
-from gremlin_python.process.traversal import Barrier, Binding, Bytecode,
Merge, Direction, Traverser, T
-from gremlin_python.structure.io.util import HashableDict, Marker
+from gremlin_python.process.traversal import Direction, Traverser, T
-unsupported = {
- "tinker-graph", # Graph not implemented
- "max-offsetdatetime", # Too large for datetime
- "min-offsetdatetime", # Too small for datetime
- "min-date", # Too large for datetime
- "max-date", # Too small for datetime
- "var-bulkset", # No serializer
- "empty-bulkset", # No serializer
- "forever-duration", # Too large for duration
- "max-float", # single precision float not supported in Python
- "min-float", # single precision float not supported in Python
- "neg-max-float", # single precision float not supported in Python
- "neg-min-float", # single precision float not supported in Python
- "nan-float", # single precision float not supported in Python
- "pos-inf-float", # single precision float not supported in Python
- "neg-inf-float", # single precision float not supported in Python
- "neg-zero-float", # single precision float not supported in Python
- "var-type-map" # can't serialize tuple
-}
+"""
+The following models aren't supported.
+tinker-graph Graph type not implemented
+max-offsetdatetime Too large for datetime
+min-offsetdatetime Too small for datetime
+min-date Too large for datetime
+max-date Too small for datetime
+forever-duration Too large for duration
+max-float single precision float not supported in Python
+min-float single precision float not supported in Python
+neg-max-float single precision float not supported in Python
+neg-min-float single precision float not supported in Python
+nan-float single precision float not supported in Python
+pos-inf-float single precision float not supported in Python
+neg-inf-float single precision float not supported in Python
+neg-zero-float single precision float not supported in Python
+traversal-tree Tree type not implemented
+"""
model = {}
@@ -44,6 +41,15 @@ model["nan-double"] = float('nan')
model["pos-inf-double"] = float('inf')
model["neg-inf-double"] = float('-inf')
model["neg-zero-double"] = -0.0
+model["single-byte-char"] = 'a'
+model["multi-byte-char"] = '\u03A9'
+model["unspecified-null"] = None
+model["true-boolean"] = True
+model["false-boolean"] = False
+model["single-byte-string"] = "abc"
+model["mixed-string"] = "abc\u0391\u0392\u0393"
+model["var-bulkset"] = ["marko", "josh", "josh"]
+model["empty-bulkset"] = []
model["zero-duration"] = datetime.timedelta()
model["traversal-edge"] = Edge(
13,
@@ -98,8 +104,6 @@ model["var-type-set"] = {2, "person", True, None}
model["empty-set"] = set()
model["max-short"] = short(32767)
model["min-short"] = short(-32768)
-#model["bulked-traverser"] = Traverser(Vertex(11, "software",
[VertexProperty(5, "name", "tinkergraph", None)]), 7)
-#model["empty-traverser"] = Traverser(None, 0)
model["specified-uuid"] = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
model["nil-uuid"] = uuid.UUID(int = 0)
model["no-prop-vertex"] = Vertex(1, "person")
@@ -134,5 +138,3 @@ model["traversal-vertex"] = Vertex(1, "person", [
san_diego, santa_cruz, brussels, santa_fe
], None)])
model["vertex-traverser"] = Traverser(model["traversal-vertex"], 1)
-
-#model['tree']
\ No newline at end of file
diff --git
a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
index 063077b3f0..62e3498abf 100644
---
a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
+++
b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
@@ -1,11 +1,17 @@
+"""
+Round trip testing of GraphBinaryV4 compared to a correct "model".
+
+Set the IO_TEST_DIRECTORY environment variable to the directory where
+the .gbin files that represent the serialized "model" are located.
+"""
+
from gremlin_python.structure.io.graphbinaryV4 import GraphBinaryWriter,
GraphBinaryReader
-import os
-import binascii
import math
+import os
-from .model import model, unsupported
+from .model import model
-gremlin_test_dir =
"gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/"
+gremlin_test_dir =
"gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/"
directory_search_pattern = "gremlin-python" + os.sep + "src" + os.sep + "main"
default_dir = __file__[:__file__.find(directory_search_pattern)]
test_resource_directory = os.environ.get('IO_TEST_DIRECTORY', default_dir +
gremlin_test_dir)
@@ -20,7 +26,6 @@ def read_file_by_name(resource_name):
with open(full_name, 'rb') as resource_file:
return bytearray(resource_file.read())
-
def test_pos_bigdecimal():
def decimal_cmp(x, y):
if x.scale == y.scale and x.unscaled_value == y.unscaled_value:
@@ -29,7 +34,7 @@ def test_pos_bigdecimal():
return False
# gremlin-python adds an extra 0 byte to the value.
- run_unordered("pos-bigdecimal", decimal_cmp)
+ run_writeread("pos-bigdecimal", decimal_cmp)
def test_neg_bigdecimal():
def decimal_cmp(x, y):
@@ -39,15 +44,15 @@ def test_neg_bigdecimal():
return False
# gremlin-python adds an extra 0 byte to the value.
- run_unordered("neg-bigdecimal", decimal_cmp)
+ run_writeread("neg-bigdecimal", decimal_cmp)
def test_pos_biginteger():
# gremlin-python adds an extra 0 byte to the value.
- run_unordered("pos-biginteger")
+ run_writeread("pos-biginteger")
def test_neg_biginteger():
# gremlin-python adds an extra 0 byte to the value.
- run_unordered("neg-biginteger")
+ run_writeread("neg-biginteger")
def test_min_byte():
run("min-byte")
@@ -95,10 +100,11 @@ def test_zero_duration():
def test_traversal_edge():
# properties aren't serialized in gremlin-python
- run_unordered("traversal-edge")
+ run_writeread("traversal-edge")
def test_no_prop_edge():
- run("no-prop-edge")
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("no-prop-edge")
def test_max_int():
run("max-int")
@@ -108,11 +114,11 @@ def test_min_int():
def test_max_long():
# attempts to serialize a long as an int
- run_unordered("max-long")
+ run_writeread("max-long")
def test_min_long():
# attempts to serialize a long as an int
- run_unordered("min-long")
+ run_writeread("min-long")
def test_var_type_list():
run("var-type-list")
@@ -121,25 +127,22 @@ def test_empty_list():
run("empty-list")
def test_var_type_map():
- run("var-type-map")
+ # can't write tuple
+ run_read("var-type-map")
def test_empty_map():
run("empty-map")
-def test_max_offsetdatetime():
- run("max-offsetdatetime")
-
-def test_min_offsetdatetime():
- run("min-offsetdatetime")
-
def test_traversal_path():
- run("traversal-path")
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("traversal-path")
def test_empty_path():
run("empty-path")
def test_prop_path():
- run("prop-path")
+ # gremlin-python doesn't serialize properties
+ run_writeread("prop-path")
def test_zero_date():
run("zero-date")
@@ -152,21 +155,18 @@ def test_null_property():
def test_var_type_set():
# ordering within set might be different
- run_unordered("var-type-set")
+ run_writeread("var-type-set")
def test_empty_set():
run("empty-set")
def test_max_short():
# short deserialized to int
- run_unordered("max-short")
+ run_writeread("max-short")
def test_min_short():
# short deserialized to int
- run_unordered("min-short")
-
-def test_tinker_graph():
- run("tinker-graph")
+ run_writeread("min-short")
def test_specified_uuid():
run("specified-uuid")
@@ -175,19 +175,20 @@ def test_nil_uuid():
run("nil-uuid")
def test_no_prop_vertex():
- run("no-prop-vertex")
+ # gremlin-python serializes/deserializes "null" for props not empty list
+ run_writeread("no-prop-vertex")
def test_traversal_vertexproperty():
# properties aren't serialized in gremlin-python
- run_unordered("traversal-vertexproperty")
+ run_writeread("traversal-vertexproperty")
def test_meta_vertexproperty():
# properties aren't serialized in gremlin-python
- run_unordered("meta-vertexproperty")
+ run_writeread("meta-vertexproperty")
def test_set_cardinality_vertexproperty():
# properties aren't serialized in gremlin-python
- run_unordered("set-cardinality-vertexproperty")
+ run_writeread("set-cardinality-vertexproperty")
def test_id_t():
run("id-t")
@@ -196,20 +197,51 @@ def test_out_direction():
run("out-direction")
def test_var_bulkset():
- run("var-bulkset")
+ # no serializer for BulkSet
+ run_read("var-bulkset")
def test_empty_bulkset():
- run("empty-bulkset")
+ # no serializer for BulkSet
+ run_read("empty-bulkset")
def test_precision_date():
run("precision-date")
-def run(resource_name, comparator = None):
- if resource_name in unsupported:
- return
+def test_single_byte_char():
+ # char is serialized as string
+ run_writeread("single-byte-char")
- resource_bytes = read_file_by_name(resource_name)
+def test_multi_byte_char():
+ # char is serialized as string
+ run_writeread("multi-byte-char")
+
+def test_unspecified_null():
+ # no serializer for plain null
+ run_writeread("unspecified-null")
+
+def test_true_boolean():
+ run("true-boolean")
+
+def test_false_boolean():
+ run("false-boolean")
+
+def test_single_byte_string():
+ run("single-byte-string")
+
+def test_mixed_string():
+ run("mixed-string")
+
+def run(resource_name, comparator = None):
+ """
+ Runs the regular set of tests for the type which is
+ 1. model to deserialized object
+ 2. written bytes to read bytes
+ 3. round tripped (read then written) bytes to read bytes
+ Optionally takes in a comparator that used for comparison 1.
+ """
+ resource_bytes = read_file_by_name(resource_name)
+
model = get_entry(resource_name)
read = reader.read_object(resource_bytes)
if comparator is not None:
@@ -218,25 +250,42 @@ def run(resource_name, comparator = None):
assert model == read
written = writer.write_object(model)
- print("written: " + binascii.hexlify(written).decode())
- print("read: " + binascii.hexlify(resource_bytes).decode())
assert resource_bytes == written
round_tripped = writer.write_object(reader.read_object(resource_bytes))
- print("round_tripped: " + binascii.hexlify(round_tripped).decode())
assert resource_bytes == round_tripped
-'''
-Use this for types which that contain values whose equality doesn't care about
order.
-This is mostly for sets.
-'''
-def run_unordered(resource_name, comparator = None):
+def run_read(resource_name):
+ """
+ Runs the read test which compares the model to deserialized object
+
+ This should only be used in cases where there is only a deserializer
+ but no serializer for the same type.
+ """
resource_bytes = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_bytes)
+ assert model == read
+
+def run_writeread(resource_name, comparator = None):
+ """
+ Runs a reduced set of tests for the type which is
+ 1. model to deserialized object
+ 2. model to round tripped (written then read) object
+ Optionally takes in a comparator that used for comparison 1.
+
+ Use this in cases where the regular run() function in too stringent.
+ E.g. when ordering doesn't matter like for sets. Ideally, a type
+ should be tested with run() instead when possible.
+ """
+ resource_bytes = read_file_by_name(resource_name)
+
model = get_entry(resource_name)
read = reader.read_object(resource_bytes)
round_tripped = reader.read_object(writer.write_object(model))
-
+
if comparator is not None:
assert comparator(model, read)
assert comparator(model, round_tripped)
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/bulked-traverser-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/bulked-traverser-v4-no-types.json
deleted file mode 100644
index 45197046be..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/bulked-traverser-v4-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "bulk" : 7,
- "value" : {
- "id" : 11,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 5,
- "value" : "tinkergraph"
- } ]
- }
- }
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/edge-property-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/edge-property-v4-no-types.json
deleted file mode 100644
index c051c0a8ef..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/edge-property-v4-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "key" : "since",
- "value" : 2009
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-binary-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-binary-v4-no-types.json
deleted file mode 100644
index 3cc762b550..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-binary-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-""
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-bulkset-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-bulkset-v4-no-types.json
deleted file mode 100644
index 8878e547a7..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-bulkset-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-[ ]
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-list-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-list-v4-no-types.json
deleted file mode 100644
index 8878e547a7..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-list-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-[ ]
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-map-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-map-v4-no-types.json
deleted file mode 100644
index 6f31cf5a2e..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-map-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-{ }
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-path-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-path-v4-no-types.json
deleted file mode 100644
index 3e3bdbfc27..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-path-v4-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "labels" : [ ],
- "objects" : [ ]
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-set-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-set-v4-no-types.json
deleted file mode 100644
index 8878e547a7..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-set-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-[ ]
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-traverser-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-traverser-v4-no-types.json
deleted file mode 100644
index 29bd471c6d..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-traverser-v4-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "bulk" : 0,
- "value" : null
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/forever-duration-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/forever-duration-v4-no-types.json
deleted file mode 100644
index 146f1dd430..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/forever-duration-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT2562047788015215H30M7.999999999S"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-byte-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-byte-v4-no-types.json
deleted file mode 100644
index 405e057083..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-byte-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-127
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-date-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-date-v4-no-types.json
deleted file mode 100644
index 996d127e59..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-date-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-9223372036854775807
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-double-v4-no-types.json
deleted file mode 100644
index d3770f5172..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1.7976931348623157E308
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-float-v4-no-types.json
deleted file mode 100644
index 4f37b13857..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-3.4028235E38
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-int-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-int-v4-no-types.json
deleted file mode 100644
index 55a89f5564..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-int-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-2147483647
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-long-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-long-v4-no-types.json
deleted file mode 100644
index 996d127e59..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-long-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-9223372036854775807
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-offsetdatetime-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-offsetdatetime-v4-no-types.json
deleted file mode 100644
index b8617fc167..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-offsetdatetime-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+999999999-12-31T23:59:59.999999999-18:00"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-short-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-short-v4-no-types.json
deleted file mode 100644
index 850e73f6c5..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-short-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-32767
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/meta-vertexproperty-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/meta-vertexproperty-v4-no-types.json
deleted file mode 100644
index b56e8b7ee8..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/meta-vertexproperty-v4-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "id" : 1,
- "value" : "stephen",
- "label" : "person",
- "properties" : {
- "a" : "b"
- }
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-byte-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-byte-v4-no-types.json
deleted file mode 100644
index 0595e86704..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-byte-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--128
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-date-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-date-v4-no-types.json
deleted file mode 100644
index 9af921bf67..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-date-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--9223372036854775808
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-double-v4-no-types.json
deleted file mode 100644
index af5e97e6e0..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-4.9E-324
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-float-v4-no-types.json
deleted file mode 100644
index 9f2a05f5e3..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1.4E-45
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-int-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-int-v4-no-types.json
deleted file mode 100644
index f6712382ee..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-int-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--2147483648
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-long-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-long-v4-no-types.json
deleted file mode 100644
index 9af921bf67..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-long-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--9223372036854775808
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-offsetdatetime-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-offsetdatetime-v4-no-types.json
deleted file mode 100644
index 92e884dfcc..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-offsetdatetime-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"-999999999-01-01T00:00+18:00"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-short-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-short-v4-no-types.json
deleted file mode 100644
index 1531bbdf1a..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-short-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--32768
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4-no-types.json
deleted file mode 100644
index d994c6fb63..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"NaN"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4-no-types.json
deleted file mode 100644
index d994c6fb63..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"NaN"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-bigdecimal-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-bigdecimal-v4-no-types.json
deleted file mode 100644
index e6b81107f3..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-bigdecimal-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--123.456789987654321123456789987654321
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-biginteger-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-biginteger-v4-no-types.json
deleted file mode 100644
index e43591aa53..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-biginteger-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--123456789987654321123456789987654321
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-double-v4-no-types.json
deleted file mode 100644
index 5436817f29..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"-Infinity"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-float-v4-no-types.json
deleted file mode 100644
index 5436817f29..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"-Infinity"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-double-v4-no-types.json
deleted file mode 100644
index 2ba118fd14..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--1.7976931348623157E308
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-float-v4-no-types.json
deleted file mode 100644
index 284d841655..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--3.4028235E38
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-double-v4-no-types.json
deleted file mode 100644
index 5384866d56..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--4.9E-324
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-float-v4-no-types.json
deleted file mode 100644
index 07809a837a..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
--1.4E-45
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nil-uuid-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nil-uuid-v4-no-types.json
deleted file mode 100644
index 48410c8b79..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nil-uuid-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"00000000-0000-0000-0000-000000000000"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-edge-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-edge-v4-no-types.json
deleted file mode 100644
index 5234e8cfa3..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-edge-v4-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "id" : 13,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-vertex-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-vertex-v4-no-types.json
deleted file mode 100644
index a888435f5a..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-vertex-v4-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id" : 1,
- "label" : "person",
- "type" : "vertex"
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/null-property-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/null-property-v4-no-types.json
deleted file mode 100644
index f46f6838f5..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/null-property-v4-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "key" : "",
- "value" : null
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-bigdecimal-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-bigdecimal-v4-no-types.json
deleted file mode 100644
index 80d5076c6b..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-bigdecimal-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123.456789987654321123456789987654321
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-biginteger-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-biginteger-v4-no-types.json
deleted file mode 100644
index 7914536bc3..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-biginteger-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-double-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-double-v4-no-types.json
deleted file mode 100644
index f5b43a070e..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-double-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"Infinity"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-float-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-float-v4-no-types.json
deleted file mode 100644
index f5b43a070e..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-float-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"Infinity"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/prop-path-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/prop-path-v4-no-types.json
deleted file mode 100644
index 2eee883b41..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/prop-path-v4-no-types.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "labels" : [ [ ], [ ], [ ] ],
- "objects" : [ {
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
- }, {
- "id" : 10,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 4,
- "value" : "gremlin"
- } ]
- }
- }, {
- "id" : 11,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 5,
- "value" : "tinkergraph"
- } ]
- }
- } ]
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/set-cardinality-vertexproperty-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/set-cardinality-vertexproperty-v4-no-types.json
deleted file mode 100644
index 8a4eb488b4..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/set-cardinality-vertexproperty-v4-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "id" : 1,
- "value" : [ "stephen", "marko" ],
- "label" : "person",
- "properties" : {
- "a" : "b"
- }
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/specified-uuid-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/specified-uuid-v4-no-types.json
deleted file mode 100644
index b36ff96647..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/specified-uuid-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/str-binary-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/str-binary-v4-no-types.json
deleted file mode 100644
index e0046e9513..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/str-binary-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/tinker-graph-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/tinker-graph-v4-no-types.json
deleted file mode 100644
index 13719f6352..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/tinker-graph-v4-no-types.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
- "vertices" : [ {
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
- }, {
- "id" : 7,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 1,
- "value" : "stephen"
- } ],
- "location" : [ {
- "id" : 10,
- "value" : "centreville",
- "properties" : {
- "startTime" : 1990,
- "endTime" : 2000
- }
- }, {
- "id" : 11,
- "value" : "dulles",
- "properties" : {
- "startTime" : 2000,
- "endTime" : 2006
- }
- }, {
- "id" : 12,
- "value" : "purcellville",
- "properties" : {
- "startTime" : 2006
- }
- } ]
- }
- }, {
- "id" : 8,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 2,
- "value" : "matthias"
- } ],
- "location" : [ {
- "id" : 13,
- "value" : "bremen",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2007
- }
- }, {
- "id" : 14,
- "value" : "baltimore",
- "properties" : {
- "startTime" : 2007,
- "endTime" : 2011
- }
- }, {
- "id" : 15,
- "value" : "oakland",
- "properties" : {
- "startTime" : 2011,
- "endTime" : 2014
- }
- }, {
- "id" : 16,
- "value" : "seattle",
- "properties" : {
- "startTime" : 2014
- }
- } ]
- }
- }, {
- "id" : 9,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 3,
- "value" : "daniel"
- } ],
- "location" : [ {
- "id" : 17,
- "value" : "spremberg",
- "properties" : {
- "startTime" : 1982,
- "endTime" : 2005
- }
- }, {
- "id" : 18,
- "value" : "kaiserslautern",
- "properties" : {
- "startTime" : 2005,
- "endTime" : 2009
- }
- }, {
- "id" : 19,
- "value" : "aachen",
- "properties" : {
- "startTime" : 2009
- }
- } ]
- }
- }, {
- "id" : 10,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 4,
- "value" : "gremlin"
- } ]
- }
- }, {
- "id" : 11,
- "label" : "software",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 5,
- "value" : "tinkergraph"
- } ]
- }
- } ],
- "edges" : [ {
- "id" : 13,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1,
- "properties" : {
- "since" : 2009
- }
- }, {
- "id" : 14,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 1,
- "properties" : {
- "since" : 2010
- }
- }, {
- "id" : 15,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1,
- "properties" : {
- "skill" : 4
- }
- }, {
- "id" : 16,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 1,
- "properties" : {
- "skill" : 5
- }
- }, {
- "id" : 17,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 7,
- "properties" : {
- "since" : 2010
- }
- }, {
- "id" : 18,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 7,
- "properties" : {
- "since" : 2011
- }
- }, {
- "id" : 19,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 7,
- "properties" : {
- "skill" : 5
- }
- }, {
- "id" : 20,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 7,
- "properties" : {
- "skill" : 4
- }
- }, {
- "id" : 21,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 8,
- "properties" : {
- "since" : 2012
- }
- }, {
- "id" : 22,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 8,
- "properties" : {
- "skill" : 3
- }
- }, {
- "id" : 23,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 8,
- "properties" : {
- "skill" : 3
- }
- }, {
- "id" : 24,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 9,
- "properties" : {
- "skill" : 5
- }
- }, {
- "id" : 25,
- "label" : "uses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 11,
- "outV" : 9,
- "properties" : {
- "skill" : 3
- }
- }, {
- "id" : 26,
- "label" : "traverses",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "software",
- "inV" : 11,
- "outV" : 10
- } ]
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-edge-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-edge-v4-no-types.json
deleted file mode 100644
index 0f7f1682d1..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-edge-v4-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "id" : 13,
- "label" : "develops",
- "type" : "edge",
- "inVLabel" : "software",
- "outVLabel" : "person",
- "inV" : 10,
- "outV" : 1,
- "properties" : {
- "since" : 2009
- }
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-path-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-path-v4-no-types.json
deleted file mode 100644
index 8919b3e6f4..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-path-v4-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "labels" : [ [ ], [ ], [ ] ],
- "objects" : [ {
- "id" : 1,
- "label" : "person",
- "type" : "vertex"
- }, {
- "id" : 10,
- "label" : "software",
- "type" : "vertex"
- }, {
- "id" : 11,
- "label" : "software",
- "type" : "vertex"
- } ]
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertex-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertex-v4-no-types.json
deleted file mode 100644
index a885f58b6f..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertex-v4-no-types.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertexproperty-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertexproperty-v4-no-types.json
deleted file mode 100644
index 74025a80e8..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertexproperty-v4-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id" : 0,
- "value" : "marko",
- "label" : "name"
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-bulkset-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-bulkset-v4-no-types.json
deleted file mode 100644
index a0517ac6f8..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-bulkset-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", 1, "josh", 2 ]
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-list-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-list-v4-no-types.json
deleted file mode 100644
index ca5ed041f9..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-list-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-[ 1, "person", true, null ]
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-map-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-map-v4-no-types.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-set-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-set-v4-no-types.json
deleted file mode 100644
index 86c07bf39a..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-set-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-[ null, 1, "person", true ]
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/vertex-traverser-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/vertex-traverser-v4-no-types.json
deleted file mode 100644
index f521d56714..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/vertex-traverser-v4-no-types.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "bulk" : 1,
- "value" : {
- "id" : 1,
- "label" : "person",
- "type" : "vertex",
- "properties" : {
- "name" : [ {
- "id" : 0,
- "value" : "marko"
- } ],
- "location" : [ {
- "id" : 6,
- "value" : "san diego",
- "properties" : {
- "startTime" : 1997,
- "endTime" : 2001
- }
- }, {
- "id" : 7,
- "value" : "santa cruz",
- "properties" : {
- "startTime" : 2001,
- "endTime" : 2004
- }
- }, {
- "id" : 8,
- "value" : "brussels",
- "properties" : {
- "startTime" : 2004,
- "endTime" : 2005
- }
- }, {
- "id" : 9,
- "value" : "santa fe",
- "properties" : {
- "startTime" : 2005
- }
- } ]
- }
- }
-}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4-no-types.json
deleted file mode 100644
index c227083464..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-duration-v4-no-types.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-duration-v4-no-types.json
deleted file mode 100644
index 3745d35cd2..0000000000
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-duration-v4-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT0S"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/bulked-traverser-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulked-traverser-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/bulked-traverser-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulked-traverser-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/edge-property-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-property-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/edge-property-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-property-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-binary-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-binary-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-binary-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-binary-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-bulkset-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-bulkset-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-bulkset-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-bulkset-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-list-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-list-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-list-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-list-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-map-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-map-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-map-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-map-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-path-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-path-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-path-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-path-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-set-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-set-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-set-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-set-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-traverser-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-traverser-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/empty-traverser-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-traverser-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin
new file mode 100644
index 0000000000..d33346d466
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/forever-duration-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/forever-duration-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/forever-duration-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/forever-duration-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/id-t-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/id-t-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/id-t-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/id-t-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-byte-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-byte-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-byte-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-byte-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-date-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-date-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-date-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-date-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-int-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-int-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-int-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-int-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-long-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-long-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-long-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-long-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-offsetdatetime-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-offsetdatetime-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-offsetdatetime-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-offsetdatetime-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-short-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-short-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/max-short-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-short-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/meta-vertexproperty-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/meta-vertexproperty-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/meta-vertexproperty-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/meta-vertexproperty-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-byte-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-byte-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-byte-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-byte-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-date-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-date-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-date-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-date-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-int-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-int-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-int-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-int-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-long-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-long-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-long-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-long-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-offsetdatetime-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-offsetdatetime-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-offsetdatetime-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-offsetdatetime-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-short-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-short-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/min-short-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-short-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin
new file mode 100644
index 0000000000..d5e21d3b7f
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin
new file mode 100644
index 0000000000..2f2570aa04
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/nan-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/nan-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/nan-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/nan-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-bigdecimal-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-bigdecimal-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-bigdecimal-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-bigdecimal-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-biginteger-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-biginteger-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-biginteger-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-biginteger-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-inf-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-inf-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-inf-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-inf-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-max-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-max-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-max-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-max-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-min-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-min-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-min-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-min-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-zero-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-zero-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-zero-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/neg-zero-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/nil-uuid-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nil-uuid-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/nil-uuid-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nil-uuid-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/no-prop-edge-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-edge-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/no-prop-edge-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-edge-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/no-prop-vertex-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-vertex-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/no-prop-vertex-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-vertex-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/null-property-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/null-property-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/null-property-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/null-property-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/out-direction-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/out-direction-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/out-direction-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/out-direction-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-bigdecimal-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-bigdecimal-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-bigdecimal-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-bigdecimal-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-biginteger-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-biginteger-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-biginteger-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-biginteger-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-inf-double-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-double-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-inf-double-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-double-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-inf-float-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-float-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/pos-inf-float-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-float-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/precision-date-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/precision-date-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/precision-date-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/precision-date-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/prop-path-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/prop-path-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/prop-path-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/prop-path-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/set-cardinality-vertexproperty-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-cardinality-vertexproperty-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/set-cardinality-vertexproperty-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-cardinality-vertexproperty-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin
new file mode 100644
index 0000000000..3c39167c7f
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin
new file mode 100644
index 0000000000..86e87d5a0c
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/specified-uuid-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/specified-uuid-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/specified-uuid-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/specified-uuid-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/str-binary-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/str-binary-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/str-binary-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/str-binary-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/tinker-graph-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinker-graph-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/tinker-graph-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinker-graph-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-edge-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-edge-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-edge-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-edge-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-path-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-path-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-path-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-path-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin
new file mode 100644
index 0000000000..5e589e15f7
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-vertex-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertex-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-vertex-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertex-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-vertexproperty-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertexproperty-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-vertexproperty-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertexproperty-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin
new file mode 100644
index 0000000000..a4575b9a58
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin
new file mode 100644
index 0000000000..b3edade43b
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin
@@ -0,0 +1 @@
+�
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-bulkset-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-bulkset-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-bulkset-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-bulkset-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-list-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-list-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-list-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-list-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-map-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-map-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-map-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-map-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-set-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-set-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-set-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-set-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/vertex-traverser-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-traverser-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/vertex-traverser-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-traverser-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/zero-date-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-date-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/zero-date-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-date-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/zero-duration-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-duration-v4.gbin
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/zero-duration-v4.gbin
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-duration-v4.gbin
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/bulked-traverser-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulked-traverser-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/bulked-traverser-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulked-traverser-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/edge-property-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/edge-property-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-binary-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-binary-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-binary-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-binary-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-bulkset-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-bulkset-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-bulkset-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-bulkset-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-list-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-list-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-list-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-list-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-map-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-map-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-map-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-map-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-path-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-path-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-path-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-path-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-set-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-set-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-set-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-set-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-traverser-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-traverser-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/empty-traverser-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-traverser-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json
new file mode 100644
index 0000000000..02e4a84d62
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json
@@ -0,0 +1 @@
+false
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/forever-duration-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/forever-duration-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/forever-duration-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/forever-duration-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json
new file mode 100644
index 0000000000..7f2e178463
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:T",
+ "@value" : "id"
+}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-byte-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-byte-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-byte-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-byte-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-date-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-date-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-date-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-date-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-double-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-float-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-int-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-int-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-int-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-int-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-long-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-long-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-long-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-long-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-offsetdatetime-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-offsetdatetime-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-short-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-short-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/max-short-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-short-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/meta-vertexproperty-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/meta-vertexproperty-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/meta-vertexproperty-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/meta-vertexproperty-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-byte-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-byte-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-byte-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-byte-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-date-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-date-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-date-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-date-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-double-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-float-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-int-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-int-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-int-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-int-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-long-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-long-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-long-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-long-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-offsetdatetime-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-offsetdatetime-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-short-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-short-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/min-short-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-short-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json
new file mode 100644
index 0000000000..6c4ca64f10
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json
@@ -0,0 +1 @@
+"abcΑΒΓ"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json
new file mode 100644
index 0000000000..b9f7ba2a62
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Char",
+ "@value" : "Ω"
+}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-double-v4.json
similarity index 100%
copy from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4.json
copy to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-float-v4.json
similarity index 100%
copy from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4.json
copy to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-bigdecimal-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-bigdecimal-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-bigdecimal-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-bigdecimal-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-biginteger-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-biginteger-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-biginteger-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-biginteger-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-double-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-float-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-inf-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-double-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-float-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-max-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-double-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-float-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/neg-min-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json
similarity index 56%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json
index 7b10376544..92df6fc46a 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-double-v4.json
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Double",
- "@value" : "NaN"
+ "@value" : -0.0
}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json
similarity index 55%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json
index b831121e2f..fb673f61a2 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nan-float-v4.json
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Float",
- "@value" : "NaN"
+ "@value" : -0.0
}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nil-uuid-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nil-uuid-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/nil-uuid-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nil-uuid-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-edge-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-edge-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-edge-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-edge-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-vertex-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-vertex-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/no-prop-vertex-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-vertex-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/null-property-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/null-property-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/null-property-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/null-property-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/out-direction-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/out-direction-v4.json
new file mode 100644
index 0000000000..78cb7e4160
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/out-direction-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Direction",
+ "@value" : "OUT"
+}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-bigdecimal-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-bigdecimal-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-bigdecimal-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-bigdecimal-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-biginteger-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-biginteger-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-biginteger-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-biginteger-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-double-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-double-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-double-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-double-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-float-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-float-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/pos-inf-float-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-float-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/precision-date-v4.json
similarity index 51%
copy from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4.json
copy to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/precision-date-v4.json
index 14f354ddf4..b94ebbb11d 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4.json
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/precision-date-v4.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Date",
- "@value" : 0
+ "@value" : 11111111
}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/prop-path-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/prop-path-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/prop-path-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/prop-path-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/set-cardinality-vertexproperty-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-cardinality-vertexproperty-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/set-cardinality-vertexproperty-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-cardinality-vertexproperty-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json
new file mode 100644
index 0000000000..eb3dd7663f
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Char",
+ "@value" : "a"
+}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json
new file mode 100644
index 0000000000..4f44a21051
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json
@@ -0,0 +1 @@
+"abc"
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/specified-uuid-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/specified-uuid-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/specified-uuid-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/specified-uuid-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/str-binary-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/str-binary-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/str-binary-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/str-binary-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/tinker-graph-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinker-graph-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/tinker-graph-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinker-graph-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-edge-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-edge-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-path-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-path-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json
new file mode 100644
index 0000000000..25b1f99d17
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json
@@ -0,0 +1,60 @@
+{
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertex-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertex-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertexproperty-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/traversal-vertexproperty-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json
new file mode 100644
index 0000000000..f32a5804e2
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json
@@ -0,0 +1 @@
+true
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json
new file mode 100644
index 0000000000..ec747fa47d
--- /dev/null
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-bulkset-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-bulkset-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-bulkset-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-bulkset-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-list-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-list-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-list-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-list-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-map-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
similarity index 76%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-map-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
index 730af8a30f..5f551eb5d4 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-map-v4.json
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
@@ -1,9 +1,6 @@
{
"@type" : "g:Map",
- "@value" : [ {
- "@type" : "g:Date",
- "@value" : 1481750076295
- }, "red", null, null, {
+ "@value" : [ null, null, {
"@type" : "g:List",
"@value" : [ {
"@type" : "g:Int32",
@@ -17,9 +14,12 @@
} ]
}, {
"@type" : "g:Date",
- "@value" : 1481750076295
+ "@value" : 1481295
}, "test", {
"@type" : "g:Int32",
"@value" : 123
- } ]
+ }, {
+ "@type" : "g:Date",
+ "@value" : 1481295
+ }, "red" ]
}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-set-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json
similarity index 83%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-set-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json
index 0e7c06755a..afb8f93dc9 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/var-type-set-v4.json
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json
@@ -2,6 +2,6 @@
"@type" : "g:Set",
"@value" : [ null, {
"@type" : "g:Int32",
- "@value" : 1
+ "@value" : 2
}, "person", true ]
}
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/vertex-traverser-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-traverser-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/vertex-traverser-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-traverser-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-date-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-date-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-date-v4.json
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-duration-v4.json
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-duration-v4.json
similarity index 100%
rename from
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphson/zero-duration-v4.json
rename to
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-duration-v4.json
