tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [42/50] tinkerpop git commit: Redefined gherkin test that was forcing list[list] assertions
Date Thu, 26 Jul 2018 17:23:49 GMT
Redefined gherkin test that was forcing list[list] assertions

Not sure we really needed the original assertion the way that it was. The fact that we get
a result means serialization for list[list] worked and we assert correctness of the traversal
in a reasonable way without list[list] so there doesn't seem to be much need to complicate
the logic of the gherkin runners to support that CTR


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

Branch: refs/heads/TINKERPOP-1913
Commit: 3be3550d191fc894639cfe2aae5447eb7bad3cbf
Parents: fd64360
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Jul 25 12:16:09 2018 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Jul 25 12:16:09 2018 -0400

----------------------------------------------------------------------
 .../Gherkin/GherkinTestRunner.cs                       |  3 +--
 .../Gherkin/IgnoreException.cs                         |  3 ---
 .../gremlin-javascript/test/cucumber/feature-steps.js  |  3 +--
 gremlin-python/src/main/jython/radish/feature_steps.py |  2 +-
 gremlin-test/features/map/Select.feature               | 13 +++++--------
 5 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/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 787cca9..3802da5 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -41,8 +41,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
             new Dictionary<string, IgnoreReason>()
             {
                 { "g_injectX1X_chooseXisX1X__constantX10Xfold__foldX", IgnoreReason.NoReason
},
-                { "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX", IgnoreReason.NoReason
},
-                { "g_V_asXa_bX_out_asXcX_path_selectXkeysX", IgnoreReason.EmbeddedListAssertion
}
+                { "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX", IgnoreReason.NoReason
}
             };
         
         private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/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 368713d..6198f1d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -40,9 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
             string reasonSuffix = null;
             switch (reason)
             {
-                case IgnoreReason.EmbeddedListAssertion:
-                    reasonSuffix = "This test returns an embedded list in the result and
the Gherkin processor does not parse that correctly";
-                    break;
                 case IgnoreReason.NoReason:
                     reasonSuffix = "";
                     break;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 53f457d..3976348 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -55,13 +55,12 @@ const parsers = [
 
 const ignoreReason = {
   lambdaNotSupported: 'Lambdas are not supported on gremlin-javascript',
-  embeddedListAssertion: '"This test returns an embedded list in the result and the Gherkin
processor does not parse that correctly"',
   needsFurtherInvestigation: '',
 };
 
 const ignoredScenarios = {
   // An associative array containing the scenario name as key, for example:
-  'g_V_asXa_bX_out_asXcX_path_selectXkeysX': new IgnoreError(ignoreReason.embeddedListAssertion),
+  // 'g_V_asXa_bX_out_asXcX_path_selectXkeysX': new IgnoreError(ignoreReason.embeddedListAssertion),
 };
 
 defineSupportCode(function(methods) {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/gremlin-python/src/main/jython/radish/feature_steps.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/radish/feature_steps.py b/gremlin-python/src/main/jython/radish/feature_steps.py
index 5067d1b..fab35fd 100644
--- a/gremlin-python/src/main/jython/radish/feature_steps.py
+++ b/gremlin-python/src/main/jython/radish/feature_steps.py
@@ -43,7 +43,7 @@ inV = __.inV
 project = __.project
 tail = __.tail
 
-ignores = ["g.V().as(\"a\", \"b\").out().as(\"c\").path().select(Column.keys)"]
+ignores = []
 
 
 @given("the {graph_name:w} graph")

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature
index 4765f59..8077aaf 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -677,12 +677,9 @@ Feature: Step - select()
       """
       g.V().as("a", "b").out().as("c").path().select(Column.keys)
       """
-    When iterated to list
-    Then the result should be unordered
+    When iterated next
+    Then the result should be ordered
       | result |
-      | l[l[a,b],l[c]] |
-      | l[l[a,b],l[c]] |
-      | l[l[a,b],l[c]] |
-      | l[l[a,b],l[c]] |
-      | l[l[a,b],l[c]] |
-      | l[l[a,b],l[c]] |
\ No newline at end of file
+      | l[a,b] |
+      | l[c]   |
+    And the graph should return 6 for count of "g.V().as(\"a\", \"b\").out().as(\"c\").path().select(Column.keys)"


Mime
View raw message