Added support for property assertion

Property assertion isn't perfect but it's a best effort that at least lets the test suite exercise this data type a bit. Removed handlers for syntax no longer supported and fixed up some tests that were impacted. CTR

Author: spmallette

docs/src/dev/developer/for-committers.asciidoc

@@ -412,8 +412,10 @@ included to further qualify the type of numeric. The following options are avail
 * Path - *p[_xxx_,_yyy_,_zzz_,...]* - A comma separated collection of values that make up the `Path` should be added to
 between the square brackets. These values respect the type system thus allowing for creation of `Path` of vertices,
 edges, maps, and any other available type.
+* Property - *prop[_key_,_value_]* - The key is simply a string, and the value is expected to be a typed value using the
+syntax presented here.
 * Set - *s[_xxx_,_yyy_,_zzz_,...]* - A comma separated collection of values that make up the set should be added to
-between the square brackets. These values respect the type system thus allowing for creation of sets of vertices,
+between the square brackets. These values respect the type system thus allowing to create sets of vertices,
 edges, maps, and any other available type.
 * String - Any value not using the system notation will be interpreted as
 a string by default.
@@ -423,6 +425,11 @@ such as null and spaces.
 * Vertex - *v[_xxx_]* - The "xxx" should be replaced with the "name" property of a vertex in the graph. This syntax may
 include the `.id` suffix which would indicate getting the vertex identifier or the `.sid` suffix which gets a string
 representation of the edge identifier.
+* VertexProperty - *vp[_xxx_]* - The "xxx" should be replaced with a representation of a vertex property in the form of
+the `vertex_name-key->value`. Note that the key is just a string and the value is a typed value using the syntax
+presented here.
+
+vp[marko-name->marko]
 
 In addition, parameter names should adhere to a common form as they hold some meaning to certain language variant
 implementations:

gremlin-go/driver/cucumber/cucumberSteps_test.go

@@ -56,6 +56,7 @@ func init() {
 		regexp.MustCompile(`^d\[(.*)]\.[n]$`):     toBigInt,
 		regexp.MustCompile(`^d\[(.*)]\.[i]$`):     toInt32,
 		regexp.MustCompile(`^vp\[(.+)]$`):         toVertexProperty,
+		regexp.MustCompile(`^prop\[(.+)]$`):       toProperty,
 		regexp.MustCompile(`^v\[(.+)]$`):          toVertex,
 		regexp.MustCompile(`^v\[(.+)]\.id$`):      toVertexId,
 		regexp.MustCompile(`^e\[(.+)]$`):          toEdge,
@@ -174,6 +175,14 @@ func toInt32(stringVal, graphName string) interface{} {
 	return int32(val)
 }
 
+// Parse property as key/value pair.
+func toProperty(stringVal, graphName string) interface{} {
+	commaIdx := strings.Index(stringVal, ",")
+	key := stringVal[:commaIdx]
+	value := parseValue(stringVal[commaIdx+1:], graphName)
+	return &gremlingo.Property{Key: key, Value: value}
+}
+
 // Parse vertex property.
 func toVertexProperty(name, graphName string) interface{} {
 	if vp, ok := tg.getDataGraphFromMap(graphName).vertexProperties[name]; ok {

gremlin-go/driver/cucumber/gremlin.go

@@ -1114,9 +1114,8 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_E": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}}, 
     "g_EX11X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid11"])}}, 
     "g_EX11AsStringX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid11"])}}, 
-    "g_EXe11X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["e11"])}}, 
-    "g_EXe7_e11X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["e7"], p["e11"])}}, 
-    "g_EXlistXe7_e11XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["xx1"])}}, 
+    "g_EXeid7_eid11X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid7"], p["eid11"])}}, 
+    "g_EXlistXeid7_eid11XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["xx1"])}}, 
     "g_EXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(nil)}}, 
     "g_EXlistXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["xx1"])}}, 
     "g_EX11_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid11"], nil)}}, 
@@ -1525,6 +1524,10 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_V_hasXageX_propertiesXage_nameX_value": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("age").Properties("age", "name").Value()}}, 
     "g_V_propertiesXname_age_nullX_value": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties("name", "age", nil).Value()}}, 
     "g_V_valuesXname_age_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name", "age", nil)}}, 
+    "g_E_propertiesXweightX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties("weight")}}, 
+    "g_E_properties": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddV("person").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("weight", 0.5).Property("since", int32(2020))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties()}}, 
+    "g_E_propertiesXsinceX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddV("person").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("weight", 0.5).Property("since", int32(2020))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties("since")}}, 
+    "g_E_properties_multi_edges": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddV("person").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("weight", 0.5).Property("since", int32(2020)).AddE("likes").From("a").To("b").Property("weight", 1.0).Property("tag", "friend")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties()}}, 
     "g_injectX__feature___test__nullX_rTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature  ", "one test ", nil, "", " ", "　abc", "abc　", "　abc　", "　　").RTrim()}}, 
     "g_injectX__feature___test__nullX_rTrimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject([]interface{}{"  feature  ", " one test ", nil, "", " ", "　abc", "abc　", "　abc　", "　　"}).RTrim(gremlingo.Scope.Local)}}, 
     "g_injectX__feature__X_rTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("  feature  ").RTrim()}}, 
@@ -1895,6 +1898,8 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_V_properties_order_id": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties().Order().Id()}}, 
     "g_E_properties_order_value": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddE("self").From("a").To("a").Property("weight", 0.5).Property("a", int32(10)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(11)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(12)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(13)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(14)).AddE("self").From("a").To("a").Property("weight", 0.2).Property("a", int32(15))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties().Order().Value()}}, 
     "g_E_properties_order_byXdescX_value": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddE("self").From("a").To("a").Property("weight", 0.5).Property("a", int32(10)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(11)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(12)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(13)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(14)).AddE("self").From("a").To("a").Property("weight", 0.2).Property("a", int32(15))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties().Order().By(gremlingo.Order.Desc).Value()}}, 
+    "g_E_properties_order": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddE("self").From("a").To("a").Property("weight", 0.5).Property("a", int32(10)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(11)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(12)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(13)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(14)).AddE("self").From("a").To("a").Property("weight", 0.2).Property("a", int32(15))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties().Order()}}, 
+    "g_E_properties_order_byXdescX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").As("a").AddE("self").From("a").To("a").Property("weight", 0.5).Property("a", int32(10)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(11)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(12)).AddE("self").From("a").To("a").Property("weight", 1.0).Property("a", int32(13)).AddE("self").From("a").To("a").Property("weight", 0.4).Property("a", int32(14)).AddE("self").From("a").To("a").Property("weight", 0.2).Property("a", int32(15))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties().Order().By(gremlingo.Order.Desc)}}, 
     "g_inject_order": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("zzz", "foo", uuid.MustParse("6100808b-62f9-42b7-957e-ed66c30f40d1"), []interface{}{"a", "b", "c", "d"}, 1, time.Date(2023, 8, 1, 0, 0, 0, 0, time.FixedZone("UTC+00:00", 0)), []interface{}{"a", "b", "c"}, map[interface{}]interface{}{"a": "a", "b": "b" }, nil, 2.0, time.Date(2023, 1, 1, 0, 0, 0, 0, time.FixedZone("UTC+00:00", 0)), gremlingo.NewSimpleSet("x", "y", "z"), map[interface{}]interface{}{"a": "a", "b": false, "c": "c" }, "bar", uuid.MustParse("5100808b-62f9-42b7-957e-ed66c30f40d1"), true, false, math.Inf(1), math.NaN(), math.Inf(-1)).Order()}}, 
     "g_inject_order_byXdescX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("zzz", "foo", uuid.MustParse("6100808b-62f9-42b7-957e-ed66c30f40d1"), []interface{}{"a", "b", "c", "d"}, 1, time.Date(2023, 8, 1, 0, 0, 0, 0, time.FixedZone("UTC+00:00", 0)), []interface{}{"a", "b", "c"}, map[interface{}]interface{}{"a": "a", "b": "b" }, nil, 2.0, time.Date(2023, 1, 1, 0, 0, 0, 0, time.FixedZone("UTC+00:00", 0)), gremlingo.NewSimpleSet("x", "y", "z"), map[interface{}]interface{}{"a": "a", "b": false, "c": "c" }, "bar", uuid.MustParse("5100808b-62f9-42b7-957e-ed66c30f40d1"), true, false, math.Inf(1), math.NaN(), math.Inf(-1)).Order().By(gremlingo.Order.Desc)}}, 
     "g_V_out_out_order_byXascX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Order().By(gremlingo.Order.Asc)}}, 

gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js

@@ -369,6 +369,12 @@ def _convert(val, ctx):
         return __find_cached_element(ctx, graph_name, val[2:-1], "e")
     elif isinstance(val, str) and re.match(r"^vp\[.*\]$", val):  # parse vertexproperty
         return __find_cached_element(ctx, graph_name, val[3:-1], "vp")
+    elif isinstance(val, str) and re.match(r"^prop\[.+\]$", val):  # parse property as key/value pair
+        inner = val[5:-1]
+        comma_idx = inner.index(",")
+        key = inner[:comma_idx]
+        value = _convert(inner[comma_idx + 1:], ctx)
+        return Property(key, value, None)
     elif isinstance(val, str) and re.match(r"^m\[.*\]$", val):  # parse json as a map
         return _convert(json.loads(val[2:-1]), ctx)
     elif isinstance(val, str) and re.match(r"^p\[.*\]$", val):  # parse path
@@ -438,6 +444,9 @@ def _convert_results(val):
     if isinstance(val, Path):
         # kill out labels as they aren't in the assertion logic
         return Path([set([])], val.objects)
+    elif isinstance(val, Property) and not isinstance(val, VertexProperty):
+        # strip element for key/value only comparison with prop[...] syntax
+        return Property(val.key, val.value, None)
     elif _is_nan(val):
         # we need to use the string form for NaN to test the results since float.nan != float.nan
         return "d[NaN]"