You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/03/12 19:09:31 UTC
[1/6] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test
scenarios in Gremlin.Net CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master bf58b63ea -> 116d743f2
refs/heads/tp32 d3be13b4c -> b25b97675
refs/heads/tp33 097ad015e -> 510231adb
TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR
Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b25b9767
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b25b9767
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b25b9767
Branch: refs/heads/master
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Mar 12 20:08:21 2018 +0100
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 6 +++++-
.../Gherkin/IgnoreException.cs | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 9d0f15d..d906357 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX",
+ IgnoreReason.PNotDeserializationProblem
}
};
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
if (IgnoredScenarios.TryGetValue(scenario.Name, out var reason))
{
failedSteps.Add(scenario.Steps.First(), new IgnoreException(reason));
- break;
+ continue;
}
StepBlock? currentStep = null;
StepDefinition stepDefinition = null;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
reasonSuffix =
" because the Gherkin runner can't call methods in TraversalPredicate class (TINKERPOP-1919)";
break;
- case IgnoreReason.NumericalValuesHaveWrongTypes:
- reasonSuffix = " because the asserts currently fail due to type mismatches (TINKERPOP-1918)";
- break;
case IgnoreReason.PWithinWrapsArgumentsInArray:
reasonSuffix = " because P.Within() arguments are incorrectly wrapped in an array (TINKERPOP-1920)";
break;
+ case IgnoreReason.PNotDeserializationProblem:
+ reasonSuffix = " because P.Not() cannot be deserialized by Gremlin Server (TINKERPOP-1922)";
+ break;
}
return $"Scenario ignored" + reasonSuffix;
}
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
LambdaNotSupported,
PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
}
}
\ No newline at end of file
[3/6] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test
scenarios in Gremlin.Net CTR
Posted by fl...@apache.org.
TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR
Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b25b9767
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b25b9767
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b25b9767
Branch: refs/heads/tp32
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Mar 12 20:08:21 2018 +0100
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 6 +++++-
.../Gherkin/IgnoreException.cs | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 9d0f15d..d906357 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX",
+ IgnoreReason.PNotDeserializationProblem
}
};
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
if (IgnoredScenarios.TryGetValue(scenario.Name, out var reason))
{
failedSteps.Add(scenario.Steps.First(), new IgnoreException(reason));
- break;
+ continue;
}
StepBlock? currentStep = null;
StepDefinition stepDefinition = null;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
reasonSuffix =
" because the Gherkin runner can't call methods in TraversalPredicate class (TINKERPOP-1919)";
break;
- case IgnoreReason.NumericalValuesHaveWrongTypes:
- reasonSuffix = " because the asserts currently fail due to type mismatches (TINKERPOP-1918)";
- break;
case IgnoreReason.PWithinWrapsArgumentsInArray:
reasonSuffix = " because P.Within() arguments are incorrectly wrapped in an array (TINKERPOP-1920)";
break;
+ case IgnoreReason.PNotDeserializationProblem:
+ reasonSuffix = " because P.Not() cannot be deserialized by Gremlin Server (TINKERPOP-1922)";
+ break;
}
return $"Scenario ignored" + reasonSuffix;
}
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
LambdaNotSupported,
PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
}
}
\ No newline at end of file
[5/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by fl...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/510231ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/510231ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/510231ad
Branch: refs/heads/tp33
Commit: 510231adbe77bf58d65f8f999e4a8b081e9d7894
Parents: 097ad01 b25b976
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 12 20:08:44 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Mar 12 20:08:44 2018 +0100
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 6 +++++-
.../Gherkin/IgnoreException.cs | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
----------------------------------------------------------------------
diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 337a6c9,dae2ced..da455a8
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -63,18 -60,9 +63,18 @@@ namespace Gremlin.Net.IntegrationTest.G
public enum IgnoreReason
{
+ /// <summary>
+ /// Lambdas are not supported on Gremlin.NET yet.
+ /// </summary>
LambdaNotSupported,
+
+ /// <summary>
+ /// Deserialization of g:T on GraphSON3 is not supported.
+ /// </summary>
+ TraversalTDeserializationNotSupported,
+
PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
}
}
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by fl...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/510231ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/510231ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/510231ad
Branch: refs/heads/master
Commit: 510231adbe77bf58d65f8f999e4a8b081e9d7894
Parents: 097ad01 b25b976
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 12 20:08:44 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Mar 12 20:08:44 2018 +0100
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 6 +++++-
.../Gherkin/IgnoreException.cs | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
----------------------------------------------------------------------
diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 337a6c9,dae2ced..da455a8
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -63,18 -60,9 +63,18 @@@ namespace Gremlin.Net.IntegrationTest.G
public enum IgnoreReason
{
+ /// <summary>
+ /// Lambdas are not supported on Gremlin.NET yet.
+ /// </summary>
LambdaNotSupported,
+
+ /// <summary>
+ /// Deserialization of g:T on GraphSON3 is not supported.
+ /// </summary>
+ TraversalTDeserializationNotSupported,
+
PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
}
}
[2/6] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test
scenarios in Gremlin.Net CTR
Posted by fl...@apache.org.
TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR
Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b25b9767
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b25b9767
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b25b9767
Branch: refs/heads/tp33
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Mar 12 20:08:21 2018 +0100
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 6 +++++-
.../Gherkin/IgnoreException.cs | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 9d0f15d..d906357 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX",
+ IgnoreReason.PNotDeserializationProblem
}
};
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
if (IgnoredScenarios.TryGetValue(scenario.Name, out var reason))
{
failedSteps.Add(scenario.Steps.First(), new IgnoreException(reason));
- break;
+ continue;
}
StepBlock? currentStep = null;
StepDefinition stepDefinition = null;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
reasonSuffix =
" because the Gherkin runner can't call methods in TraversalPredicate class (TINKERPOP-1919)";
break;
- case IgnoreReason.NumericalValuesHaveWrongTypes:
- reasonSuffix = " because the asserts currently fail due to type mismatches (TINKERPOP-1918)";
- break;
case IgnoreReason.PWithinWrapsArgumentsInArray:
reasonSuffix = " because P.Within() arguments are incorrectly wrapped in an array (TINKERPOP-1920)";
break;
+ case IgnoreReason.PNotDeserializationProblem:
+ reasonSuffix = " because P.Not() cannot be deserialized by Gremlin Server (TINKERPOP-1922)";
+ break;
}
return $"Scenario ignored" + reasonSuffix;
}
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
LambdaNotSupported,
PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
}
}
\ No newline at end of file
[6/6] tinkerpop git commit: Merge branch 'tp33'
Posted by fl...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/116d743f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/116d743f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/116d743f
Branch: refs/heads/master
Commit: 116d743f209292f675d8ded4907b39c629df1e03
Parents: bf58b63 510231a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 12 20:09:10 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Mar 12 20:09:10 2018 +0100
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 6 +++++-
.../Gherkin/IgnoreException.cs | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/116d743f/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------