tests fixes

Author: rashtao

src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraph.java

@@ -141,7 +141,7 @@
 @Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedGraphTest",
         method = "testAttachableCreateMethod",
-        reason = "test creates id without label prefix")
+        reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.structure.util.detached.DetachedGraphTest#testAttachableCreateMethod()")
 @Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
         method = "shouldAddVertexWithUserSuppliedStringId",

src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBPersistentElement.java

@@ -53,6 +53,7 @@ default String collection() {
     default String id() {
         return Optional.ofNullable(key())
                 .map(it -> collection() + '/' + it)
+                // TODO: review
                 .orElse(label());
     }
 }

src/test/java/com/arangodb/tinkerpop/gremlin/custom/CustomGraphProvider.java

@@ -34,6 +34,14 @@ protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, St
                 builder.configureEdge("knows", "person", "person");
                 builder.configureEdge("self", "person", "person");
                 break;
+            case "testAttachableCreateMethod":
+                builder.withVertexCollection("person");
+                builder.withVertexCollection("project");
+                builder.withEdgeCollection("knows");
+                builder.withEdgeCollection("developedBy");
+                builder.configureEdge("knows", "person", "person");
+                builder.configureEdge("developedBy", "project", "person");
+                break;
         }
     }
 }

src/test/java/com/arangodb/tinkerpop/gremlin/custom/CustomStandardSuite.java

@@ -2,6 +2,7 @@
 
 import com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.OrderabilityTest;
 import com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.map.MergeEdgeTest;
+import com.arangodb.tinkerpop.gremlin.custom.structure.util.detached.DetachedGraphTest;
 import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
 import org.junit.runners.model.InitializationError;
@@ -13,6 +14,7 @@ public class CustomStandardSuite extends AbstractGremlinSuite {
     private static final Class<?>[] allTests = new Class<?>[]{
             MergeEdgeTest.Traversals.class,
             OrderabilityTest.Traversals.class,
+            DetachedGraphTest.class
     };
 
     public CustomStandardSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {

src/test/java/com/arangodb/tinkerpop/gremlin/custom/structure/util/detached/DetachedGraphTest.java

@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.arangodb.tinkerpop.gremlin.custom.structure.util.detached;
+
+import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
+import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
+import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Random;
+import java.util.UUID;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class DetachedGraphTest extends AbstractGremlinTest {
+
+    // FIXME: review after DE-996 and DE-997
+    @Ignore("FIXME")
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
+    @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 = Graph.Features.VertexFeatures.FEATURE_META_PROPERTIES)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES)
+    @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)
+    public void testAttachableCreateMethod() {
+        final Random random = TestHelper.RANDOM;
+        StarGraph starGraph = StarGraph.open();
+        final String label = "person";
+        final String id = label + "/" + UUID.randomUUID();
+        Vertex starVertex = starGraph.addVertex(T.id, id, T.label, label, "name", "stephen", "name", "spmallete");
+        starVertex.property("acl", true, "timestamp", random.nextLong(), "creator", "marko");
+        for (int i = 0; i < 100; i++) {
+            starVertex.addEdge("knows", starGraph.addVertex("person", "name", new UUID(random.nextLong(), random.nextLong()), "since", random.nextLong()));
+            starGraph.addVertex(T.label, "project").addEdge("developedBy", starVertex, "public", random.nextBoolean());
+        }
+        final DetachedVertex detachedVertex = DetachedFactory.detach(starGraph.getStarVertex(), true);
+        final Vertex createdVertex = detachedVertex.attach(Attachable.Method.create(graph));
+        TestHelper.validateVertexEquality(detachedVertex, createdVertex, false);
+        TestHelper.validateVertexEquality(detachedVertex, starVertex, false);
+
+        starGraph.getStarVertex().edges(Direction.BOTH).forEachRemaining(starEdge -> {
+            final DetachedEdge detachedEdge = DetachedFactory.detach(starEdge, true);
+            final Edge createdEdge = detachedEdge.attach(Attachable.Method.create(random.nextBoolean() ? graph : createdVertex));
+            TestHelper.validateEdgeEquality(detachedEdge, starEdge);
+            TestHelper.validateEdgeEquality(detachedEdge, createdEdge);
+        });
+
+    }
+}