You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by jo...@apache.org on 2018/03/20 09:19:34 UTC
[12/12] tinkerpop git commit: TINKERPOP-1865 Test fixes
TINKERPOP-1865 Test fixes
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4c64bc03
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4c64bc03
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4c64bc03
Branch: refs/heads/TINKERPOP-1865
Commit: 4c64bc039bfdb88021015a2dc594e4171b3ca1ee
Parents: 7b9488d
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Tue Mar 20 10:09:33 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Tue Mar 20 10:18:02 2018 +0100
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs | 5 +++--
.../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 5 +----
.../test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs | 3 +--
gremlin-test/features/map/Order.feature | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 4bb83ae..9322da3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -252,8 +252,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
if (value.Type == JTokenType.Object)
{
- IDictionary<string, JToken> jsonMap = (JObject)value;
- return jsonMap.ToDictionary(kv => kv.Key, kv => ParseMapValue(kv.Value, graphName));
+ IDictionary<string, JToken> jsonMap = (JObject)value;
+ return jsonMap.ToDictionary(kv => ParseMapValue(kv.Key, graphName),
+ kv => ParseMapValue(kv.Value, graphName));
}
if (value.Type == JTokenType.Array)
{
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index e2194e0..52646a7 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -44,10 +44,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
{ "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
{"g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported},
- {"g_V_hasIdXwithinXemptyXX_count", IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX", IgnoreReason.ReceivedDataDoesntMatchExpected},
- {"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX", IgnoreReason.PWithinWrapsArgumentsInArray}
+ {"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX", IgnoreReason.ReceivedDataDoesntMatchExpected}
};
private static class Keywords
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index f343cc3..711fc20 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -60,8 +60,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
/// Deserialization of g:T on GraphSON3 is not supported.
/// </summary>
TraversalTDeserializationNotSupported,
- PWithinWrapsArgumentsInArray,
- ReceivedDataDoesntMatchExpected
+ ReceivedDataDoesntMatchExpected,
NoReason
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature
index 6dd8ac4..33ae97a 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -313,7 +313,7 @@ Feature: Step - order()
Scenario: g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX
Given the modern graph
And using the parameter v1 defined as "v[marko]"
- And using the parameter l1 defined as "c[[1:it.get().value('age'),2:it.get().value('age')*2,3:it.get().value('age')*3,4:it.get().value('age')]]"
+ And using the parameter l1 defined as "c[['1':it.get().value('age'),'2':it.get().value('age')*2,'3':it.get().value('age')*3,'4':it.get().value('age')]]"
And the traversal of
"""
g.V(v1).hasLabel("person").map(l1).order(Scope.local).by(Column.values, Order.decr).by(Column.keys, Order.incr)