TINKERPOP-1968 Have one method of ignoring tests. Tests that should be ignored are "unsupported" in the .feature files. The validator doesn't need a second level of filtering for that.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d7d46522 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7d46522 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7d46522 Branch: refs/heads/TINKERPOP-1968 Commit: d7d4652240df0c8cc419fc90435f89285c01613e Parents: 88f88d9 Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon May 21 07:46:07 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu May 31 16:19:43 2018 -0400 ---------------------------------------------------------------------- gremlin-test/features/map/AddVertex.feature | 16 ++++++++++++- gremlin-test/features/map/Properties.feature | 16 ++++++++++++- gremlin-test/features/sideEffect/Sack.feature | 24 +++++++++++++++++++- .../gremlin/process/FeatureCoverageTest.java | 16 ------------- 4 files changed, 53 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7d46522/gremlin-test/features/map/AddVertex.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/AddVertex.feature b/gremlin-test/features/map/AddVertex.feature index 996521b..c684b3b 100644 --- a/gremlin-test/features/map/AddVertex.feature +++ b/gremlin-test/features/map/AddVertex.feature @@ -334,4 +334,18 @@ Feature: Step - addV() Then the result should be unordered | result | | marko | - And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")" \ No newline at end of file + And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")" + + Scenario: g_V_addVXlabel_animal_age_0X + Given an unsupported test + Then nothing should happen because + """ + This API is deprecated - will not test. + """ + + Scenario: g_addVXlabel_person_name_stephenX + Given an unsupported test + Then nothing should happen because + """ + This API is deprecated - will not test. + """ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7d46522/gremlin-test/features/map/Properties.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Properties.feature b/gremlin-test/features/map/Properties.feature index 5e61615..52376ec 100644 --- a/gremlin-test/features/map/Properties.feature +++ b/gremlin-test/features/map/Properties.feature @@ -65,4 +65,18 @@ Feature: Step - properties() | josh | | d[32].i | | peter | - | d[35].i | \ No newline at end of file + | d[35].i | + + Scenario: g_V_hasXageX_properties_hasXid_nameIdX_value + Given an unsupported test + Then nothing should happen because + """ + GLV suite doesn't support property identifiers and related assertions + """ + + Scenario: g_V_hasXageX_properties_hasXid_nameIdAsStringX_value + Given an unsupported test + Then nothing should happen because + """ + GLV suite doesn't support property identifiers and related assertions + """ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7d46522/gremlin-test/features/sideEffect/Sack.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/Sack.feature b/gremlin-test/features/sideEffect/Sack.feature index 8d97c0c..aaf248d 100644 --- a/gremlin-test/features/sideEffect/Sack.feature +++ b/gremlin-test/features/sideEffect/Sack.feature @@ -108,4 +108,26 @@ Feature: Step - sack() Then the result should be unordered | result | | d[1.0].m | - | d[1.0].m | \ No newline at end of file + | d[1.0].m | + + Scenario: g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack + Given an unsupported test + Then nothing should happen because + """ + GLV Suite does not support BigInteger assignments at this time. + """ + + Scenario: g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack + Given an unsupported test + Then nothing should happen because + """ + This test is bound pretty tightly to the JVM in that it requires a UnaryOperator cast to get the right + withSack() method called. Not sure how that would work with a GLV. + """ + + Scenario: g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack + Given an unsupported test + Then nothing should happen because + """ + Something strange happens with rounding that prevents GLVs from asserting this result properly. + """ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7d46522/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java index 181cd17..503df77 100644 --- a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java @@ -53,7 +53,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest; @@ -98,20 +97,6 @@ public class FeatureCoverageTest { private static Pattern scenarioName = Pattern.compile("^\\s*Scenario:\\s*(.*)$"); - private static final List<String> testToIgnore = Arrays.asList( - // deprecated tests - "g_V_addVXlabel_animal_age_0X", - "g_addVXlabel_person_name_stephenX", - // GLV suite doesn't support property identifiers and related assertions - "g_V_hasXageX_properties_hasXid_nameIdX_value", - "g_V_hasXageX_properties_hasXid_nameIdAsStringX_value", - // ugh - BigInteger? - "g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", - // ugh - clone - "g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack", - // wont round right or something - "g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack"); - @Test public void shouldImplementAllProcessTestsAsFeatures() throws Exception { @@ -193,7 +178,6 @@ public class FeatureCoverageTest { t.getSimpleName().replace("Test", "") + ".feature"; final Set<String> testMethods = Stream.of(t.getDeclaredMethods()) .filter(m -> m.isAnnotationPresent(Test.class)) - .filter(m -> !testToIgnore.contains(m.getName())) .map(Method::getName).collect(Collectors.toSet()); final File featureFile = new File(featureFileName);