[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-11 Thread florianhockmann 
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/53c84bdb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53c84bdb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/53c84bdb

Branch: refs/heads/master
Commit: 53c84bdb49386e16ca6d955941be101a0fd8e1d1
Parents: 99b6da2 bbb1377
Author: Florian Hockmann 
Authored: Sun Mar 11 16:16:17 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:16:17 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 37 +++-
 .../Gherkin/IgnoreException.cs  | 20 +++
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index eb0a7e1,4a1d646..08693b2
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,14 -37,33 +37,35 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
- private static readonly IDictionary 
IgnoredScenarios = new Dictionary
- {
- { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
- { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },// TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }  // TINKERPOP-1907
- };
+ private static readonly IDictionary 
IgnoredScenarios =
+ new Dictionary
+ {
++{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
++{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+ {
+ 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+ IgnoreReason.NumericalValuesHaveWrongTypes
+ },
+ {"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
+ {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+ {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+ {
+ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ }
+ };
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 7733f34,c8cb29a..337a6c9
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -41,13 -41,17 +41,20 @@@ namespace

[2/6] tinkerpop git commit: TINKERPOP-1892 Add better ignore reasons for tests in Gremlin.Net CTR

2018-03-11 Thread florianhockmann 
TINKERPOP-1892 Add better ignore reasons for tests in Gremlin.Net CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bbb13772
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bbb13772
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bbb13772

Branch: refs/heads/tp33
Commit: bbb13772a791ae7116551ba1d62ea7d136fe60c7
Parents: ab66ed3
Author: Florian Hockmann 
Authored: Sun Mar 11 16:10:17 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:10:17 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 32 +---
 .../Gherkin/IgnoreException.cs  | 17 ---
 2 files changed, 40 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbb13772/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 f3e823a..4a1d646 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -37,11 +37,33 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 public class GherkinTestRunner
 {
-private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
-{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
-};
+private static readonly IDictionary 
IgnoredScenarios =
+new Dictionary
+{
+{
+
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+IgnoreReason.NumericalValuesHaveWrongTypes
+},
+{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
+{"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{
+
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+}
+};
 
 private static class Keywords
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbb13772/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 0179994..c8cb29a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -41,10 +41,17 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 switch (reason)
 {
 case IgnoreReason.LambdaNotSupported:
-reasonSuffix = " because lambdas are not supported in 
Gremlin.NET";
+reasonSuffix = " because lambdas are not supported in 
Gremlin.NET (TINKERPOP-1854)";
 break;
-

[3/6] tinkerpop git commit: TINKERPOP-1892 Add better ignore reasons for tests in Gremlin.Net CTR

2018-03-11 Thread florianhockmann 
TINKERPOP-1892 Add better ignore reasons for tests in Gremlin.Net CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bbb13772
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bbb13772
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bbb13772

Branch: refs/heads/tp32
Commit: bbb13772a791ae7116551ba1d62ea7d136fe60c7
Parents: ab66ed3
Author: Florian Hockmann 
Authored: Sun Mar 11 16:10:17 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:10:17 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 32 +---
 .../Gherkin/IgnoreException.cs  | 17 ---
 2 files changed, 40 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbb13772/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 f3e823a..4a1d646 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -37,11 +37,33 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 public class GherkinTestRunner
 {
-private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
-{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
-};
+private static readonly IDictionary 
IgnoredScenarios =
+new Dictionary
+{
+{
+
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+IgnoreReason.NumericalValuesHaveWrongTypes
+},
+{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
+{"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{
+
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+}
+};
 
 private static class Keywords
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbb13772/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 0179994..c8cb29a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -41,10 +41,17 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 switch (reason)
 {
 case IgnoreReason.LambdaNotSupported:
-reasonSuffix = " because lambdas are not supported in 
Gremlin.NET";
+reasonSuffix = " because lambdas are not supported in 
Gremlin.NET (TINKERPOP-1854)";
 break;
-

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-03-11 Thread florianhockmann 
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/22000e44
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/22000e44
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/22000e44

Branch: refs/heads/master
Commit: 22000e449fb29abb7ffddad6f65b35a8accffd35
Parents: da63965 53c84bd
Author: Florian Hockmann 
Authored: Sun Mar 11 16:16:35 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:16:35 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 37 +++-
 .../Gherkin/IgnoreException.cs  | 20 +++
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22000e44/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

[1/6] tinkerpop git commit: TINKERPOP-1892 Add better ignore reasons for tests in Gremlin.Net CTR

2018-03-11 Thread florianhockmann 
Repository: tinkerpop
Updated Branches:
  refs/heads/master da63965ff -> 22000e449
  refs/heads/tp32 ab66ed384 -> bbb13772a
  refs/heads/tp33 99b6da259 -> 53c84bdb4


TINKERPOP-1892 Add better ignore reasons for tests in Gremlin.Net CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bbb13772
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bbb13772
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bbb13772

Branch: refs/heads/master
Commit: bbb13772a791ae7116551ba1d62ea7d136fe60c7
Parents: ab66ed3
Author: Florian Hockmann 
Authored: Sun Mar 11 16:10:17 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:10:17 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 32 +---
 .../Gherkin/IgnoreException.cs  | 17 ---
 2 files changed, 40 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbb13772/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 f3e823a..4a1d646 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -37,11 +37,33 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 public class GherkinTestRunner
 {
-private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
-{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
-};
+private static readonly IDictionary 
IgnoredScenarios =
+new Dictionary
+{
+{
+
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+IgnoreReason.NumericalValuesHaveWrongTypes
+},
+{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
+{"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{
+
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+}
+};
 
 private static class Keywords
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbb13772/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 0179994..c8cb29a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -41,10 +41,17 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 switch (reason)
 {
 case IgnoreReason.LambdaNotSupported:
-reasonSuffix = " because lambdas are

[5/6] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-11 Thread florianhockmann 
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/53c84bdb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53c84bdb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/53c84bdb

Branch: refs/heads/tp33
Commit: 53c84bdb49386e16ca6d955941be101a0fd8e1d1
Parents: 99b6da2 bbb1377
Author: Florian Hockmann 
Authored: Sun Mar 11 16:16:17 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:16:17 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 37 +++-
 .../Gherkin/IgnoreException.cs  | 20 +++
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index eb0a7e1,4a1d646..08693b2
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,14 -37,33 +37,35 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
- private static readonly IDictionary 
IgnoredScenarios = new Dictionary
- {
- { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
- { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },// TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }  // TINKERPOP-1907
- };
+ private static readonly IDictionary 
IgnoredScenarios =
+ new Dictionary
+ {
++{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
++{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+ {
+ 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+ IgnoreReason.NumericalValuesHaveWrongTypes
+ },
+ {"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
+ {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+ {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+ {
+ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ }
+ };
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 7733f34,c8cb29a..337a6c9
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -41,13 -41,17 +41,20 @@@ namespace

tinkerpop git commit: dang

2018-03-11 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST da252989e -> 94eb0b48c


dang


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94eb0b48
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94eb0b48
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/94eb0b48

Branch: refs/heads/TRAVIS-TEST
Commit: 94eb0b48c24cc2b7be596c57e89a3a740b3a3dbe
Parents: da25298
Author: Daniel Kuppitz 
Authored: Sun Mar 11 10:49:51 2018 -0700
Committer: Daniel Kuppitz 
Committed: Sun Mar 11 10:49:51 2018 -0700

--
 .../traversal/strategy/decoration/SubgraphStrategyProcessTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94eb0b48/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index e7b6534..8f3b9c2 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -297,7 +297,7 @@ try {
   throw new IllegalStateException(t.toString(), ex);
 }
 */
-final Traversal t = sg.V(convertToVertexId("josh")).both();
+final Traversal t = sg.V(convertToVertexId("josh")).both();
 try {
 assertEquals(2, t.toList().size());
 } catch (IllegalStateException ex) {

tinkerpop git commit: bla

2018-03-11 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 232c9987f -> da252989e


bla


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da252989
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da252989
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da252989

Branch: refs/heads/TRAVIS-TEST
Commit: da252989e2d507d6e77116311789dda643f57ed2
Parents: 232c998
Author: Daniel Kuppitz 
Authored: Sun Mar 11 10:31:32 2018 -0700
Committer: Daniel Kuppitz 
Committed: Sun Mar 11 10:31:32 2018 -0700

--
 .../strategy/decoration/SubgraphStrategyProcessTest.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da252989/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 1cc6222..e7b6534 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -289,12 +289,20 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());*/
+/*
 final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
 try {
 assertEquals(2, t.next().longValue());
 } catch (IllegalStateException ex) {
   throw new IllegalStateException(t.toString(), ex);
 }
+*/
+final Traversal t = sg.V(convertToVertexId("josh")).both();
+try {
+assertEquals(2, t.toList().size());
+} catch (IllegalStateException ex) {
+  throw new IllegalStateException(t.toString(), ex);
+}
 // marko not present directly because of vertexCriterion - only 
accessible via vertices in the subgraph
 assertEquals(1, 
g.V(convertToVertexId("marko")).count().next().longValue());
 assertEquals(0, 
sg.V(convertToVertexId("marko")).count().next().longValue());

[2/2] tinkerpop git commit: TINKERPOP-1901 Add interfaces for tokens in Gremlin.Net

2018-03-11 Thread florianhockmann 
TINKERPOP-1901 Add interfaces for tokens in Gremlin.Net

These interfaces simply represent their Java counterparts which allows
to use them as arguments in Gremlin steps.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d012171e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d012171e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d012171e

Branch: refs/heads/TINKERPOP-1901
Commit: d012171e97d5d87108eef3d0257a8b859f77de04
Parents: dcf3da3
Author: Florian Hockmann 
Authored: Sat Mar 10 19:21:46 2018 +0100
Committer: Florian Hockmann 
Committed: Sat Mar 10 19:21:46 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/Enum.template|  2 +-
 gremlin-dotnet/glv/generate.groovy  | 20 ++---
 .../Gremlin.Net/Process/Traversal/Barrier.cs|  2 +-
 .../src/Gremlin.Net/Process/Traversal/Column.cs |  2 +-
 .../Process/Traversal/GraphTraversal.cs | 45 
 .../Process/Traversal/GraphTraversalSource.cs   | 14 --
 .../Process/Traversal/IBiFunction.cs| 33 ++
 .../Process/Traversal/IBinaryOperator.cs| 34 +++
 .../Process/Traversal/IComparator.cs| 32 ++
 .../Gremlin.Net/Process/Traversal/IConsumer.cs  | 33 ++
 .../Gremlin.Net/Process/Traversal/IFunction.cs  | 32 ++
 .../Gremlin.Net/Process/Traversal/IPredicate.cs | 32 ++
 .../Gremlin.Net/Process/Traversal/Operator.cs   |  2 +-
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |  2 +-
 .../src/Gremlin.Net/Process/Traversal/T.cs  |  2 +-
 .../Process/Traversal/TraversalPredicate.cs |  2 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs | 28 ++--
 18 files changed, 270 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d012171e/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 341a392..568097c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Enums are now represented as classes in Gremlin.Net which allows to use them 
as arguments in more steps.
 * Bumped to Groovy 2.4.14.
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d012171e/gremlin-dotnet/glv/Enum.template
--
diff --git a/gremlin-dotnet/glv/Enum.template b/gremlin-dotnet/glv/Enum.template
index fd09312..0be23c7 100644
--- a/gremlin-dotnet/glv/Enum.template
+++ b/gremlin-dotnet/glv/Enum.template
@@ -26,7 +26,7 @@ namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
 
-public class <%= enumClass.simpleName %> : EnumWrapper
+public class <%= enumClass.simpleName %> : <%= implementedTypes %>
 {
 private <%= enumClass.simpleName %>(string enumValue)
 : base("<%= enumClass.simpleName %>", enumValue)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d012171e/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy 
b/gremlin-dotnet/glv/generate.groovy
index 7894793..6d89b2f 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -48,17 +48,17 @@ def toCSharpTypeMap = ["Long": "long",
"TraversalMetrics": "E2",
"Traversal": "ITraversal",
"Traversal[]": "ITraversal[]",
-   "Predicate": "TraversalPredicate",
+   "Predicate": "IPredicate",
"P": "TraversalPredicate",
"TraversalStrategy": "ITraversalStrategy",
"TraversalStrategy[]": "ITraversalStrategy[]",
-   "Function": "object",
-   "BiFunction": "object",
+   "Function": "IFunction",
+   "BiFunction": "IBiFunction",
"UnaryOperator": "object",
-   "BinaryOperator": "object",
-   "Consumer": "object",
+   "BinaryOperator": "IBinaryOperator",
+   "Consumer": "IConsumer",
"Supplier": "object",
-

[1/2] tinkerpop git commit: TINKERPOP-1901 Transformed Gremlin.Net enums into classes

2018-03-11 Thread florianhockmann 
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1901 [created] d012171e9


TINKERPOP-1901 Transformed Gremlin.Net enums into classes


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dcf3da39
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dcf3da39
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dcf3da39

Branch: refs/heads/TINKERPOP-1901
Commit: dcf3da3917a9626d432ef26089bb05c6a15158ed
Parents: ab66ed3
Author: Florian Hockmann 
Authored: Sat Mar 10 19:17:15 2018 +0100
Committer: Florian Hockmann 
Committed: Sat Mar 10 19:17:15 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|  2 +-
 gremlin-dotnet/glv/Enum.template|  7 +-
 gremlin-dotnet/glv/generate.groovy  | 21 +
 .../Gremlin.Net/Process/Traversal/Barrier.cs|  9 +-
 .../Process/Traversal/Cardinality.cs| 13 ++-
 .../src/Gremlin.Net/Process/Traversal/Column.cs | 11 ++-
 .../Gremlin.Net/Process/Traversal/Direction.cs  | 13 ++-
 .../Process/Traversal/EnumWrapper.cs| 52 +++
 .../Process/Traversal/GraphSONVersion.cs| 11 ++-
 .../Process/Traversal/GryoVersion.cs|  9 +-
 .../Process/Traversal/NamingConversions.cs  | 91 
 .../Gremlin.Net/Process/Traversal/Operator.cs   | 29 ---
 .../src/Gremlin.Net/Process/Traversal/Order.cs  | 21 +++--
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   | 11 ++-
 .../src/Gremlin.Net/Process/Traversal/Pop.cs| 13 ++-
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  | 11 ++-
 .../src/Gremlin.Net/Process/Traversal/T.cs  | 15 ++--
 .../Structure/IO/GraphSON/EnumSerializer.cs |  5 +-
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../TraversalEnumParameter.cs   |  5 +-
 20 files changed, 181 insertions(+), 170 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dcf3da39/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index f06fe02..ace8119 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -362,7 +362,7 @@ terminal/action methods off of `ITraversal`.
 
 === Static Enums and Methods
 
-Gremlin has various tokens (e.g. `T`, `P`, `Order`, `Operator`, etc.) that are 
represented in Gremlin.Net as Enums.
+Gremlin has various tokens (e.g. `T`, `P`, `Order`, `Operator`, etc.) that are 
represented in Gremlin.Net as classes.
 
 These can be used analogously to how they are used in Gremlin-Java.
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dcf3da39/gremlin-dotnet/glv/Enum.template
--
diff --git a/gremlin-dotnet/glv/Enum.template b/gremlin-dotnet/glv/Enum.template
index 1fddab1..fd09312 100644
--- a/gremlin-dotnet/glv/Enum.template
+++ b/gremlin-dotnet/glv/Enum.template
@@ -26,8 +26,13 @@ namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
 
-public enum <%= enumClass.simpleName %>
+public class <%= enumClass.simpleName %> : EnumWrapper
 {
+private <%= enumClass.simpleName %>(string enumValue)
+: base("<%= enumClass.simpleName %>", enumValue)
+{
+}
+
 <%= constants %>
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dcf3da39/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy 
b/gremlin-dotnet/glv/generate.groovy
index 12cfa88..7894793 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -339,36 +339,23 @@ def toCSharpName = { enumClass, itemName ->
 return itemName.substring(0, 1).toUpperCase() + itemName.substring(1)
 }
 
-def createEnum = { enumClass, csharpToJava ->
+def createEnum = { enumClass ->
 def b = ["enumClass": enumClass,
  "constants": enumClass.getEnumConstants().
 sort { a, b -> a.name() <=> b.name() }.
 collect { value ->
 def csharpName = toCSharpName(enumClass, value.name())
-csharpToJava.put(enumClass.simpleName + "." + 
csharpName, value.name())
-return csharpName
-}.join(",\n\t\t")]
+return "public static ${enumClass.simpleName} 
${csharpName} => new ${enumClass.simpleName}(\"${value.name()}\");"
+}.join("\n\t\t")]
 
 def enumTemplate = engine.createTemplate(new