This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new d3b7aa942e Fix test that wasn't parameterized CTR
new c32d0cdf4c Merge branch '3.7-dev'
d3b7aa942e is described below
commit d3b7aa942ebd6e1dd4f155924994748cdbf4e63f
Author: Stephen Mallette <stepm...@amazon.com>
AuthorDate: Thu Feb 1 07:25:13 2024 -0500
Fix test that wasn't parameterized CTR
---
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 2 +-
gremlin-go/driver/cucumber/gremlin.go | 2 +-
.../src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js | 2 +-
gremlin-python/src/main/python/radish/gremlin.py | 2 +-
.../org/apache/tinkerpop/gremlin/test/features/map/Format.feature | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index eaa8d8c58b..50f0ea6bbf 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -714,7 +714,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{"g_injectX1X_asXageX_V_formatXstrX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p) =>g.Inject(1).As("age").V().Format("%{name} is %{age} years old")}},
{"g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p) =>g.V().Format("%{_} is %{_} years
old").By(__.Values<object>("name")).By(__.Values<object>("age"))}},
{"g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p) =>g.V().HasLabel("person").Format("%{_} %{_}
%{_}").By(__.Constant<object>("hello")).By(__.Values<object>("name"))}},
- {"g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.V(1).Format("%{_}").By(__.Constant<object>("hello")).By(__.Values<object>("name"))}},
+ {"g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.V(p["vid1"]).Format("%{_}").By(__.Constant<object>("hello")).By(__.Values<object>("name"))}},
{"g_V_formatXstrX_byXbothE_countX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p) =>g.V().Format("%{name} has %{_} connections").By(__.BothE().Count())}},
{"g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.V().Project<object>("name","count").By(__.Values<object>("name")).By(__.BothE().Count()).Format("%{name}
has %{count} connections")}},
{"g_V_elementMap_formatXstrX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p) =>g.V().ElementMap<object>().Format("%{name} is %{age} years old")}},
diff --git a/gremlin-go/driver/cucumber/gremlin.go
b/gremlin-go/driver/cucumber/gremlin.go
index cef068fe95..4c01c90a24 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -685,7 +685,7 @@ var translationMap = map[string][]func(g
*gremlingo.GraphTraversalSource, p map[
"g_injectX1X_asXageX_V_formatXstrX": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.Inject(1).As("age").V().Format("%{name} is
%{age} years old")}},
"g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.V().Format("%{_} is %{_} years
old").By(gremlingo.T__.Values("name")).By(gremlingo.T__.Values("age"))}},
"g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX":
{func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.V().HasLabel("person").Format("%{_} %{_}
%{_}").By(gremlingo.T__.Constant("hello")).By(gremlingo.T__.Values("name"))}},
- "g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return
g.V(1).Format("%{_}").By(gremlingo.T__.Constant("hello")).By(gremlingo.T__.Values("name"))}},
+ "g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return
g.V(p["vid1"]).Format("%{_}").By(gremlingo.T__.Constant("hello")).By(gremlingo.T__.Values("name"))}},
"g_V_formatXstrX_byXbothE_countX": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.V().Format("%{name} has %{_}
connections").By(gremlingo.T__.BothE().Count())}},
"g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX":
{func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.V().Project("name",
"count").By(gremlingo.T__.Values("name")).By(gremlingo.T__.BothE().Count()).Format("%{name}
has %{count} connections")}},
"g_V_elementMap_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p
map[string]interface{}) *gremlingo.GraphTraversal {return
g.V().ElementMap().Format("%{name} is %{age} years old")}},
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index 7b013d6911..3f70a945ad 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -705,7 +705,7 @@ const gremlins = {
g_injectX1X_asXageX_V_formatXstrX: [function({g}) { return
g.inject(1).as("age").V().format("%{name} is %{age} years old") }],
g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX: [function({g}) { return
g.V().format("%{_} is %{_} years
old").by(__.values("name")).by(__.values("age")) }],
g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX:
[function({g}) { return g.V().hasLabel("person").format("%{_} %{_}
%{_}").by(__.constant("hello")).by(__.values("name")) }],
- g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX: [function({g}) {
return g.V(1).format("%{_}").by(__.constant("hello")).by(__.values("name")) }],
+ g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX: [function({g,
vid1}) { return
g.V(vid1).format("%{_}").by(__.constant("hello")).by(__.values("name")) }],
g_V_formatXstrX_byXbothE_countX: [function({g}) { return
g.V().format("%{name} has %{_} connections").by(__.bothE().count()) }],
g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX:
[function({g}) { return
g.V().project("name","count").by(__.values("name")).by(__.bothE().count()).format("%{name}
has %{count} connections") }],
g_V_elementMap_formatXstrX: [function({g}) { return
g.V().elementMap().format("%{name} is %{age} years old") }],
diff --git a/gremlin-python/src/main/python/radish/gremlin.py
b/gremlin-python/src/main/python/radish/gremlin.py
index 2d143fcc03..c7c3a96f09 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -687,7 +687,7 @@ world.gremlins = {
'g_injectX1X_asXageX_V_formatXstrX': [(lambda
g:g.inject(1).as_('age').V().format_('%{name} is %{age} years old'))],
'g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX': [(lambda
g:g.V().format_('%{_} is %{_} years old').by(__.name).by(__.age))],
'g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX':
[(lambda g:g.V().hasLabel('person').format_('%{_} %{_}
%{_}').by(__.constant('hello')).by(__.name))],
- 'g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX': [(lambda
g:g.V(1).format_('%{_}').by(__.constant('hello')).by(__.name))],
+ 'g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX': [(lambda g,
vid1=None:g.V(vid1).format_('%{_}').by(__.constant('hello')).by(__.name))],
'g_V_formatXstrX_byXbothE_countX': [(lambda g:g.V().format_('%{name} has
%{_} connections').by(__.bothE().count()))],
'g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX':
[(lambda
g:g.V().project('name','count').by(__.name).by(__.bothE().count()).format_('%{name}
has %{count} connections'))],
'g_V_elementMap_formatXstrX': [(lambda
g:g.V().elementMap().format_('%{name} is %{age} years old'))],
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature
index 6515f8e9a8..12f3aeec61 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature
@@ -95,9 +95,10 @@ Feature: Step - format()
@GraphComputerVerificationReferenceOnly
Scenario: g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX
Given the modern graph
+ And using the parameter vid1 defined as "v[marko].id"
And the traversal of
"""
- g.V(1).format("%{_}").by(constant("hello")).by(values("name"))
+ g.V(vid1).format("%{_}").by(constant("hello")).by(values("name"))
"""
When iterated to list
Then the result should be unordered
