You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/03/22 19:06:24 UTC

[1/5] tinkerpop git commit: TINKERPOP-1865 Run Gremlin.Net tests with GraphSON 3.0

Repository: tinkerpop
Updated Branches:
  refs/heads/master fc0ed4327 -> ead0edaf4


TINKERPOP-1865 Run Gremlin.Net tests with GraphSON 3.0

This required the rewrite of the GetEdges() function for the Gherkin
test runner. Additionally, 3 tests had to be ignored: 1 has the
T deserialization problem and 2 get data returned from the server that
doesn't match the expected data.


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

Branch: refs/heads/master
Commit: bf84eed4e04c144c310b850a469b317ea46099b8
Parents: 94484e2
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Mar 18 17:19:45 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Tue Mar 20 09:37:27 2018 +0100

----------------------------------------------------------------------
 .../Gherkin/GherkinTestRunner.cs                |  7 ++++-
 .../Gherkin/IgnoreException.cs                  |  5 ++++
 .../Gherkin/ScenarioData.cs                     | 30 +++++++++-----------
 .../RemoteConnectionFactory.cs                  |  6 ++--
 4 files changed, 27 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/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 02bf546..e2194e0 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -42,7 +42,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
             {
                 { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
                 { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
-                { "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 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}
             };
         
         private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/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 9eb3021..f343cc3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -46,6 +46,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                 case IgnoreReason.NoReason:
                     reasonSuffix = "";
                     break;
+                case IgnoreReason.ReceivedDataDoesntMatchExpected:
+                    reasonSuffix = " because received data from server doesn't match expected data.";
+                    break;
             }
             return $"Scenario ignored" + reasonSuffix;
         }
@@ -57,6 +60,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
         /// Deserialization of g:T on GraphSON3 is not supported.
         /// </summary>
         TraversalTDeserializationNotSupported,
+        PWithinWrapsArgumentsInArray,
+        ReceivedDataDoesntMatchExpected
         NoReason
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
index 77552f9..5aa6a12 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
@@ -25,12 +25,12 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Gremlin.Net.Driver.Exceptions;
 using Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection;
 using Gremlin.Net.Process.Remote;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
+using static Gremlin.Net.Process.Traversal.__;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
 {
@@ -38,10 +38,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
     {
         private static readonly Lazy<ScenarioData> Lazy = new Lazy<ScenarioData>(Load);
         
-        private static readonly Regex EdgeORegex = new Regex("o=(.+?)[,}]", RegexOptions.Compiled);
-        private static readonly Regex EdgeLRegex = new Regex("l=(.+?)[,}]", RegexOptions.Compiled);
-        private static readonly Regex EdgeIRegex = new Regex("i=(.+?)[,}]", RegexOptions.Compiled);
-        
         private static readonly string[] GraphNames = {"modern", "classic", "crew", "grateful", "sink"};
 
         private static readonly IDictionary<string, Vertex> EmptyVertices =
@@ -123,12 +119,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
         {
             try
             {
-                return g.E().Group<string, object>()
-                    .By(__.Project<Edge>("o", "l", "i")
-                        .By(__.OutV().Values<string>("name")).By(__.Label()).By(__.InV().Values<string>("name")))
-                    .By(__.Tail<object>())
-                    .Next()
-                    .ToDictionary(kv => GetEdgeKey(kv.Key), kv => (Edge)kv.Value);
+                var edgeByEdgeRepr = new Dictionary<string, Edge>();
+                foreach (var edge in g.E().ToList())
+                {
+                    edgeByEdgeRepr[GetEdgeKey(g, edge)] = edge;
+                }
+                return edgeByEdgeRepr;
             }
             catch (ResponseException)
             {
@@ -137,12 +133,14 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
             }
         }
 
-        private static string GetEdgeKey(string key)
+        private static string GetEdgeKey(GraphTraversalSource g, Edge edge)
         {
-            var o = EdgeORegex.Match(key).Groups[1].Value;
-            var l = EdgeLRegex.Match(key).Groups[1].Value;
-            var i = EdgeIRegex.Match(key).Groups[1].Value;
-            return o + "-" + l + "->" + i;
+            var edgeRepr = g.E(edge.Id).Project<string>("o", "l", "i")
+                .By(OutV().Values<string>("name"))
+                .By(Label())
+                .By(InV().Values<string>("name"))
+                .Next();
+            return edgeRepr["o"] + "-" + edgeRepr["l"] + "->" + edgeRepr["i"];
         }
     }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
index 276340d..39b7fea 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
@@ -25,7 +25,6 @@ using System;
 using System.Collections.Generic;
 using Gremlin.Net.Driver;
 using Gremlin.Net.Process.Remote;
-using Gremlin.Net.Structure.IO.GraphSON;
 using DriverRemoteConnectionImpl = Gremlin.Net.Driver.Remote.DriverRemoteConnection;
 
 namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
@@ -45,9 +44,8 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
 
         public IRemoteConnection CreateRemoteConnection(string traversalSource)
         {
-            var c = new DriverRemoteConnectionImpl(
-                new GremlinClient(new GremlinServer(TestHost, TestPort), new GraphSON2Reader(), new GraphSON2Writer(),
-                    GremlinClient.GraphSON2MimeType), traversalSource);
+            var c = new DriverRemoteConnectionImpl(new GremlinClient(new GremlinServer(TestHost, TestPort)),
+                traversalSource);
             _connections.Add(c);
             return c;
         }


[3/5] tinkerpop git commit: TINKERPOP-1865 Test fixes

Posted by sp...@apache.org.
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/master
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)


[2/5] tinkerpop git commit: TINKERPOP-1865 Use lambda to retrieve edges for gherkin scenarios

Posted by sp...@apache.org.
TINKERPOP-1865 Use lambda to retrieve edges for gherkin scenarios


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

Branch: refs/heads/master
Commit: 7b9488d981593066b3be454bec6ee34de9e6cf36
Parents: bf84eed
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Tue Mar 20 09:34:12 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Tue Mar 20 09:37:28 2018 +0100

----------------------------------------------------------------------
 .../Gherkin/ScenarioData.cs                     | 24 ++++++--------------
 1 file changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b9488d9/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
index 5aa6a12..02ee132 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
@@ -30,7 +30,6 @@ using Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection;
 using Gremlin.Net.Process.Remote;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
-using static Gremlin.Net.Process.Traversal.__;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
 {
@@ -119,12 +118,13 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
         {
             try
             {
-                var edgeByEdgeRepr = new Dictionary<string, Edge>();
-                foreach (var edge in g.E().ToList())
-                {
-                    edgeByEdgeRepr[GetEdgeKey(g, edge)] = edge;
-                }
-                return edgeByEdgeRepr;
+                IFunction lambda = Lambda.Groovy(
+                    "it.outVertex().value('name') + '-' + it.label() + '->' + it.inVertex().value('name')");
+
+                return g.E().Group<string, Edge>()
+                    .By(lambda)
+                    .By(__.Tail<object>())
+                    .Next();
             }
             catch (ResponseException)
             {
@@ -132,16 +132,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                 return EmptyEdges;
             }
         }
-
-        private static string GetEdgeKey(GraphTraversalSource g, Edge edge)
-        {
-            var edgeRepr = g.E(edge.Id).Project<string>("o", "l", "i")
-                .By(OutV().Values<string>("name"))
-                .By(Label())
-                .By(InV().Values<string>("name"))
-                .Next();
-            return edgeRepr["o"] + "-" + edgeRepr["l"] + "->" + edgeRepr["i"];
-        }
     }
 
     internal class ScenarioDataPerGraph


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

Posted by sp...@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/ead0edaf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ead0edaf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ead0edaf

Branch: refs/heads/master
Commit: ead0edaf44b29d9576a72b10ff5e18c265775f31
Parents: fc0ed43 ffabea8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 15:06:14 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 15:06:14 2018 -0400

----------------------------------------------------------------------
 .../Gherkin/CommonSteps.cs                      |  5 ++--
 .../Gherkin/GherkinTestRunner.cs                |  4 +++-
 .../Gherkin/IgnoreException.cs                  |  4 ++++
 .../Gherkin/ScenarioData.cs                     | 24 +++++---------------
 .../RemoteConnectionFactory.cs                  |  6 ++---
 gremlin-test/features/map/Order.feature         |  2 +-
 6 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ead0edaf/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------


[4/5] tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1865' into tp33

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/TINKERPOP-1865' into tp33


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

Branch: refs/heads/master
Commit: ffabea8656a435fd073e418b565885753bf820a3
Parents: eb35177 4c64bc0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 15:06:02 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 15:06:02 2018 -0400

----------------------------------------------------------------------
 .../Gherkin/CommonSteps.cs                      |  5 ++--
 .../Gherkin/GherkinTestRunner.cs                |  4 +++-
 .../Gherkin/IgnoreException.cs                  |  4 ++++
 .../Gherkin/ScenarioData.cs                     | 24 +++++---------------
 .../RemoteConnectionFactory.cs                  |  6 ++---
 gremlin-test/features/map/Order.feature         |  2 +-
 6 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------