Repository: tinkerpop Updated Branches: refs/heads/master a138d5549 -> b391e315d
fix incorrect FeatureRequirement annotations Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6fe943ff Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6fe943ff Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6fe943ff Branch: refs/heads/master Commit: 6fe943ff67cea8383afc6f046c175d89092601da Parents: ec106fc Author: Jason Plurad <plur...@us.ibm.com> Authored: Wed Jun 15 08:51:43 2016 -0400 Committer: Jason Plurad <plur...@us.ibm.com> Committed: Wed Jun 15 08:51:43 2016 -0400 ---------------------------------------------------------------------- .../dsl/credential/CredentialGraphTest.java | 11 +++++++++++ .../decoration/EventStrategyProcessTest.java | 4 ++++ .../tinkerpop/gremlin/structure/EdgeTest.java | 12 ++++++++++-- .../gremlin/structure/FeatureSupportTest.java | 19 +++++++++++++------ .../tinkerpop/gremlin/structure/GraphTest.java | 12 ++++++++++-- .../gremlin/structure/PropertyTest.java | 2 +- .../gremlin/structure/VertexPropertyTest.java | 2 ++ .../tinkerpop/gremlin/structure/VertexTest.java | 15 +++++++++++---- 8 files changed, 62 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java index 93feb4b..d7d7f9d 100644 --- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java +++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java @@ -19,6 +19,9 @@ package org.apache.tinkerpop.gremlin.groovy.plugin.dsl.credential; import org.apache.tinkerpop.gremlin.AbstractGremlinTest; +import org.apache.tinkerpop.gremlin.FeatureRequirement; +import org.apache.tinkerpop.gremlin.FeatureRequirementSet; +import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -37,6 +40,7 @@ import static org.junit.Assert.assertNull; public class CredentialGraphTest extends AbstractGremlinTest { @Test + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) public void shouldCreateUser() { final Vertex v = credentials(graph).createUser("stephen", "secret"); assertEquals("stephen", v.value("username")); @@ -46,6 +50,8 @@ public class CredentialGraphTest extends AbstractGremlinTest { } @Test + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES) public void shouldRemoveUser() { MatcherAssert.assertThat(graph.vertices().hasNext(), is(false)); credentials(graph).createUser("stephen", "secret"); @@ -56,6 +62,7 @@ public class CredentialGraphTest extends AbstractGremlinTest { } @Test + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) public void shouldNotRemoveUser() { MatcherAssert.assertThat(graph.vertices().hasNext(), is(false)); credentials(graph).createUser("stephen", "secret"); @@ -66,6 +73,7 @@ public class CredentialGraphTest extends AbstractGremlinTest { } @Test + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) public void shouldFindUser() { MatcherAssert.assertThat(graph.vertices().hasNext(), is(false)); credentials(graph).createUser("marko", "secret"); @@ -77,6 +85,7 @@ public class CredentialGraphTest extends AbstractGremlinTest { } @Test + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) public void shouldNotFindUser() { MatcherAssert.assertThat(graph.vertices().hasNext(), is(false)); credentials(graph).createUser("marko", "secret"); @@ -88,6 +97,7 @@ public class CredentialGraphTest extends AbstractGremlinTest { } @Test + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) public void shouldCountUsers() { MatcherAssert.assertThat(graph.vertices().hasNext(), is(false)); credentials(graph).createUser("marko", "secret"); @@ -99,6 +109,7 @@ public class CredentialGraphTest extends AbstractGremlinTest { } @Test(expected = IllegalStateException.class) + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) public void shouldThrowIfFindingMultipleUsers() { MatcherAssert.assertThat(graph.vertices().hasNext(), is(false)); credentials(graph).createUser("stephen", "secret"); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java index 077ada0..3effae5 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyProcessTest.java @@ -328,6 +328,7 @@ public class EventStrategyProcessTest extends AbstractGremlinProcessTest { @Test @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES) public void shouldTriggerRemoveVertex() { final StubMutationListener listener1 = new StubMutationListener(); final StubMutationListener listener2 = new StubMutationListener(); @@ -352,6 +353,7 @@ public class EventStrategyProcessTest extends AbstractGremlinProcessTest { @Test @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_REMOVE_EDGES) public void shouldTriggerRemoveEdge() { final StubMutationListener listener1 = new StubMutationListener(); final StubMutationListener listener2 = new StubMutationListener(); @@ -377,6 +379,7 @@ public class EventStrategyProcessTest extends AbstractGremlinProcessTest { @Test @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_PROPERTY) public void shouldTriggerRemoveVertexProperty() { final StubMutationListener listener1 = new StubMutationListener(); final StubMutationListener listener2 = new StubMutationListener(); @@ -401,6 +404,7 @@ public class EventStrategyProcessTest extends AbstractGremlinProcessTest { @Test @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_REMOVE_PROPERTY) public void shouldTriggerRemoveEdgeProperty() { final StubMutationListener listener1 = new StubMutationListener(); final StubMutationListener listener2 = new StubMutationListener(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java index 68770e9..8a66fd3 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java @@ -142,6 +142,7 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_STRING_VALUES) public void shouldAutotypeStringProperties() { @@ -154,9 +155,10 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_INTEGER_VALUES) - public void shouldAutotypIntegerProperties() { + public void shouldAutotypeIntegerProperties() { final Vertex v = graph.addVertex(); final Edge e = v.addEdge("knows", v, "integer", 33); final Integer age = e.value("integer"); @@ -165,6 +167,7 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_BOOLEAN_VALUES) public void shouldAutotypeBooleanProperties() { @@ -176,6 +179,7 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_DOUBLE_VALUES) public void shouldAutotypeDoubleProperties() { @@ -187,6 +191,7 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_LONG_VALUES) public void shouldAutotypeLongProperties() { @@ -198,6 +203,7 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_FLOAT_VALUES) public void shouldAutotypeFloatProperties() { @@ -209,6 +215,7 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_REMOVE_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = FEATURE_STRING_VALUES) @@ -266,8 +273,9 @@ public class EdgeTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) - @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_REMOVE_EDGES) public void shouldNotHaveAConcurrentModificationExceptionWhenIteratingAndRemovingAddingEdges() { final Vertex v1 = graph.addVertex("name", "marko"); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java index 700b2eb..98406b4 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java @@ -587,7 +587,7 @@ public class FeatureSupportTest { public void shouldSupportRemovePropertyIfAPropertyCanBeRemoved() throws Exception { try { final Vertex v = graph.addVertex(); - final Edge e = v.addEdge("self", v); + final Edge e = v.addEdge("self", v, "name", "foo"); e.property("name").remove(); fail(String.format(INVALID_FEATURE_SPECIFICATION, EdgeFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_REMOVE_PROPERTY)); } catch (Exception ex) { @@ -635,6 +635,7 @@ public class FeatureSupportTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) public void shouldEnableFeatureOnVertexIfNotEnabled() throws Exception { assumeThat(graph.features().supports(VertexPropertyFeatures.class, featureName), is(false)); try { @@ -735,7 +736,7 @@ public class FeatureSupportTest { try { final Vertex v = graph.addVertex(); - v.property(VertexProperty.Cardinality.single, "test", v, T.id, id); + v.property(VertexProperty.Cardinality.single, "test", "me", T.id, id); fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_STRING_IDS)); } catch (Exception ex) { validateException(VertexProperty.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), ex); @@ -755,7 +756,7 @@ public class FeatureSupportTest { try { final Vertex v = graph.addVertex(); - v.property(VertexProperty.Cardinality.single, "test", v, T.id, id); + v.property(VertexProperty.Cardinality.single, "test", "me", T.id, id); fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS)); } catch (Exception ex) { validateException(VertexProperty.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), ex); @@ -775,7 +776,7 @@ public class FeatureSupportTest { try { final Vertex v = graph.addVertex(); - v.property(VertexProperty.Cardinality.single, "test", v, T.id, id); + v.property(VertexProperty.Cardinality.single, "test", "me", T.id, id); fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_NUMERIC_IDS)); } catch (Exception ex) { validateException(VertexProperty.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), ex); @@ -795,7 +796,7 @@ public class FeatureSupportTest { try { final Vertex v = graph.addVertex(); - v.property(VertexProperty.Cardinality.single, "test", v, T.id, id); + v.property(VertexProperty.Cardinality.single, "test", "me", T.id, id); fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_UUID_IDS)); } catch (Exception ex) { validateException(VertexProperty.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), ex); @@ -816,7 +817,7 @@ public class FeatureSupportTest { try { final Vertex v = graph.addVertex(); - v.property(VertexProperty.Cardinality.single, "test", v, T.id, id); + v.property(VertexProperty.Cardinality.single, "test", "me", T.id, id); fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexPropertyFeatures.class.getSimpleName(), FEATURE_ANY_IDS)); } catch (Exception ex) { validateException(VertexProperty.Exceptions.userSuppliedIdsOfThisTypeNotSupported(), ex); @@ -875,6 +876,7 @@ public class FeatureSupportTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_MULTI_PROPERTIES, supported = false) public void shouldSupportMultiPropertyIfTheSameKeyCanBeAssignedMoreThanOnce() throws Exception { try { @@ -889,6 +891,7 @@ public class FeatureSupportTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_META_PROPERTIES, supported = false) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_META_PROPERTIES) public void shouldSupportMetaPropertyIfPropertiesCanBePutOnProperties() throws Exception { @@ -904,6 +907,7 @@ public class FeatureSupportTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_META_PROPERTIES, supported = false) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_META_PROPERTIES) public void shouldSupportMetaPropertyIfPropertiesCanBePutOnPropertiesViaVertexProperty() throws Exception { @@ -919,6 +923,7 @@ public class FeatureSupportTest { @Test @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_META_PROPERTIES, supported = false) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = VertexFeatures.FEATURE_META_PROPERTIES) public void shouldSupportMetaPropertyIfPropertiesHaveAnIteratorViaVertexProperty() throws Exception { @@ -988,6 +993,7 @@ public class FeatureSupportTest { } @Test + @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_PROPERTIES) public void shouldSupportADataTypeIfEdgeHasPropertyEnabled() { assertEquals(edgePropertyFeatures.supportsProperties(), (edgePropertyFeatures.supportsBooleanValues() || edgePropertyFeatures.supportsDoubleValues() || edgePropertyFeatures.supportsFloatValues() || edgePropertyFeatures.supportsIntegerValues() @@ -1001,6 +1007,7 @@ public class FeatureSupportTest { } @Test + @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = VertexPropertyFeatures.FEATURE_PROPERTIES) public void shouldSupportADataTypeIfVertexHasPropertyEnabled() { assertEquals(vertexPropertyFeatures.supportsProperties(), (vertexPropertyFeatures.supportsBooleanValues() || vertexPropertyFeatures.supportsDoubleValues() || vertexPropertyFeatures.supportsFloatValues() || vertexPropertyFeatures.supportsIntegerValues() http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java index 11770e1..6b703b2 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java @@ -670,6 +670,8 @@ public class GraphTest extends AbstractGremlinTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ANY_IDS) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_STRING_IDS) public void shouldNotMixTypesForGettingSpecificVerticesWithVertexFirst() { final Vertex v1 = graph.addVertex(); try { @@ -684,6 +686,8 @@ public class GraphTest extends AbstractGremlinTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ANY_IDS) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_STRING_IDS) public void shouldNotMixTypesForGettingSpecificVerticesWithStringFirst() { final Vertex v1 = graph.addVertex(); try { @@ -817,7 +821,7 @@ public class GraphTest extends AbstractGremlinTest { } @Test - @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES, supported = false) public void shouldOverwriteEarlierKeyValuesWithLaterKeyValuesOnAddVertexIfNoMultiProperty() { final Vertex v = graph.addVertex("test", "A", "test", "B", "test", "C"); @@ -828,7 +832,7 @@ public class GraphTest extends AbstractGremlinTest { } @Test - @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES) public void shouldOverwriteEarlierKeyValuesWithLaterKeyValuesOnAddVertexIfMultiProperty() { final Vertex v = graph.addVertex("test", "A", "test", "B", "test", "C"); @@ -1610,6 +1614,8 @@ public class GraphTest extends AbstractGremlinTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ANY_IDS) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_STRING_IDS) public void shouldNotMixTypesForGettingSpecificEdgesWithEdgeFirst() { final Vertex v = graph.addVertex(); final Edge e1 = v.addEdge("self", v); @@ -1626,6 +1632,8 @@ public class GraphTest extends AbstractGremlinTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ANY_IDS) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_STRING_IDS) public void shouldNotMixTypesForGettingSpecificEdgesWithStringFirst() { final Vertex v = graph.addVertex(); final Edge e1 = v.addEdge("self", v); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java index 2a7f240..ae24bdd 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java @@ -255,7 +255,7 @@ public class PropertyTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_PROPERTIES) - @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_META_PROPERTIES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) public void testGraphVertexSetPropertyStandard() throws Exception { try { final Vertex v = this.graph.addVertex(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java index 78785a4..845be70 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java @@ -52,6 +52,7 @@ public class VertexPropertyTest extends AbstractGremlinTest { public static class BasicVertexProperty extends AbstractGremlinTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES) public void shouldValidateEquality() { final Vertex v = graph.addVertex(); @@ -65,6 +66,7 @@ public class VertexPropertyTest extends AbstractGremlinTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES) public void shouldValidateIdEquality() { final Vertex v = graph.addVertex(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java index 0ffaec5..fc7aa3b 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java @@ -280,10 +280,9 @@ public class VertexTest { } @Test - @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY) - @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) public void shouldHaveStandardStringRepresentation() { - final Vertex v = graph.addVertex("name", "marko", "age", 34); + final Vertex v = graph.addVertex(); assertEquals(StringFactory.vertexString(v), v.toString()); } @@ -404,6 +403,7 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES) public void shouldAutotypeStringProperties() { final Vertex v = graph.addVertex(); @@ -415,8 +415,9 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES) - public void shouldAutotypIntegerProperties() { + public void shouldAutotypeIntegerProperties() { final Vertex v = graph.addVertex(); v.property(VertexProperty.Cardinality.single, "integer", 33); final Integer age = v.value("integer"); @@ -425,6 +426,7 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_BOOLEAN_VALUES) public void shouldAutotypeBooleanProperties() { final Vertex v = graph.addVertex(); @@ -435,6 +437,7 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_DOUBLE_VALUES) public void shouldAutotypeDoubleProperties() { final Vertex v = graph.addVertex(); @@ -445,6 +448,7 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_LONG_VALUES) public void shouldAutotypeLongProperties() { final Vertex v = graph.addVertex(); @@ -455,6 +459,7 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_FLOAT_VALUES) public void shouldAutotypeFloatProperties() { final Vertex v = graph.addVertex(); @@ -500,7 +505,9 @@ public class VertexTest { @Test @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY) @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_INTEGER_VALUES) @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES) public void shouldNotGetConcurrentModificationException() {