tests fixes

Author: rashtao

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

@@ -197,6 +197,11 @@
         method = "g_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option",
         reason = "FIXME: DE-995"
 )
+@Graph.OptOut(
+        test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest$Traversals",
+        method = "*",
+        reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.OrderabilityTest"
+)
 public class ArangoDBGraph implements Graph {
 
     /**
@@ -209,7 +214,7 @@ public class ArangoDBGraphFeatures implements Features {
          * The Class ArangoDBGraphGraphFeatures.
          */
 
-        private class ArangoDBGraphGraphFeatures implements GraphFeatures {
+        protected class ArangoDBGraphGraphFeatures implements GraphFeatures {
 
             /**
              * The variable features.
@@ -220,7 +225,7 @@ private class ArangoDBGraphGraphFeatures implements GraphFeatures {
              * Instantiates a new ArangoDB graph graph features.
              */
 
-            ArangoDBGraphGraphFeatures() {
+            protected ArangoDBGraphGraphFeatures() {
             }
 
             @Override
@@ -248,13 +253,13 @@ public VariableFeatures variables() {
          * The Class ArangoDBGraphElementFeatures.
          */
 
-        private class ArangoDBGraphElementFeatures implements ElementFeatures {
+        protected class ArangoDBGraphElementFeatures implements ElementFeatures {
 
             /**
              * Instantiates a new ArangoDB graph element features.
              */
 
-            ArangoDBGraphElementFeatures() {
+            protected ArangoDBGraphElementFeatures() {
             }
 
             @Override
@@ -288,7 +293,7 @@ public boolean supportsUuidIds() {
          * The Class ArangoDBGraphVertexFeatures.
          */
 
-        private class ArangoDBGraphVertexFeatures extends ArangoDBGraphElementFeatures implements VertexFeatures {
+        protected class ArangoDBGraphVertexFeatures extends ArangoDBGraphElementFeatures implements VertexFeatures {
 
             /**
              * The vertex property features.
@@ -300,7 +305,7 @@ private class ArangoDBGraphVertexFeatures extends ArangoDBGraphElementFeatures i
              * Instantiates a new ArangoDB graph vertex features.
              */
 
-            ArangoDBGraphVertexFeatures() {
+            protected ArangoDBGraphVertexFeatures() {
             }
 
 
@@ -325,7 +330,7 @@ public class ArangoDBGraphEdgeFeatures extends ArangoDBGraphElementFeatures impl
              * Instantiates a new ArangoDB graph edge features.
              */
 
-            ArangoDBGraphEdgeFeatures() {
+            protected ArangoDBGraphEdgeFeatures() {
             }
 
             @Override
@@ -338,13 +343,13 @@ public EdgePropertyFeatures properties() {
          * The Class ArangoDBGraphVertexPropertyFeatures.
          */
 
-        private class ArangoDBGraphVertexPropertyFeatures implements VertexPropertyFeatures {
+        protected class ArangoDBGraphVertexPropertyFeatures implements VertexPropertyFeatures {
 
             /**
              * Instantiates a new ArangoDB graph vertex property features.
              */
 
-            ArangoDBGraphVertexPropertyFeatures() {
+            protected ArangoDBGraphVertexPropertyFeatures() {
             }
 
             @Override
@@ -377,13 +382,13 @@ public boolean supportsUuidIds() {
         /**
          * The Class ArangoDBGraphEdgePropertyFeatures.
          */
-        private class ArangoDBGraphEdgePropertyFeatures implements EdgePropertyFeatures {
+        protected class ArangoDBGraphEdgePropertyFeatures implements EdgePropertyFeatures {
 
             /**
              * Instantiates a new ArangoDB graph edge property features.
              */
 
-            ArangoDBGraphEdgePropertyFeatures() {
+            protected ArangoDBGraphEdgePropertyFeatures() {
             }
         }
 

src/main/java/com/arangodb/tinkerpop/gremlin/utils/ArangoDBUtil.java

@@ -609,7 +609,7 @@ public static String getId(Graph.Features.ElementFeatures features, String label
                     id = parts[1];
                 }
             }
-            Matcher m = ArangoDBUtil.DOCUMENT_KEY.matcher((String) id);
+            Matcher m = ArangoDBUtil.DOCUMENT_KEY.matcher(id.toString());
             if (m.matches()) {
                 return id.toString();
             } else {

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

@@ -0,0 +1,54 @@
+package com.arangodb.tinkerpop.gremlin.custom;
+
+import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
+import org.apache.commons.configuration2.Configuration;
+
+
+public class CustomGraph extends ArangoDBGraph {
+
+    public static CustomGraph open(Configuration configuration) {
+        return new CustomGraph(configuration);
+    }
+
+    class CustomFeatures extends ArangoDBGraph.ArangoDBGraphFeatures {
+
+        @Override
+        public EdgeFeatures edge() {
+            return new ArangoDBGraphEdgeFeatures() {
+                @Override
+                public boolean supportsNumericIds() {
+                    return true;
+                }
+            };
+        }
+
+        @Override
+        public VertexFeatures vertex() {
+            return new ArangoDBGraphVertexFeatures() {
+                @Override
+                public boolean supportsNumericIds() {
+                    return true;
+                }
+
+                @Override
+                public VertexPropertyFeatures properties() {
+                    return new ArangoDBGraphVertexPropertyFeatures() {
+                        @Override
+                        public boolean supportsNumericIds() {
+                            return true;
+                        }
+                    };
+                }
+            };
+        }
+    }
+
+    public CustomGraph(Configuration configuration) {
+        super(configuration);
+    }
+
+    @Override
+    public Features features() {
+        return new CustomFeatures();
+    }
+}

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

@@ -2,10 +2,21 @@
 
 import com.arangodb.tinkerpop.gremlin.util.BaseGraphProvider;
 import com.arangodb.tinkerpop.gremlin.utils.ArangoDBConfigurationBuilder;
-import org.apache.tinkerpop.gremlin.structure.VertexTest;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+
+import java.util.Map;
 
 public class CustomGraphProvider extends BaseGraphProvider {
 
+    @Override
+    public Configuration newGraphConfiguration(String graphName, Class<?> test, String testMethodName, Map<String, Object> configurationOverrides, LoadGraphWith.GraphData loadGraphWith) {
+        Configuration conf = super.newGraphConfiguration(graphName, test, testMethodName, configurationOverrides, loadGraphWith);
+        conf.setProperty(Graph.GRAPH, CustomGraph.class.getName());
+        return conf;
+    }
+
     @Override
     protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, String testMethodName) {
         switch (testMethodName) {

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

@@ -1,5 +1,6 @@
 package com.arangodb.tinkerpop.gremlin.custom;
 
+import com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.OrderabilityTest;
 import com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.map.MergeEdgeTest;
 import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
@@ -10,7 +11,8 @@
 public class CustomStandardSuite extends AbstractGremlinSuite {
 
     private static final Class<?>[] allTests = new Class<?>[]{
-            MergeEdgeTest.Traversals.class
+            MergeEdgeTest.Traversals.class,
+            OrderabilityTest.Traversals.class,
     };
 
     public CustomStandardSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {

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

@@ -1,11 +1,10 @@
 package com.arangodb.tinkerpop.gremlin.custom;
 
-import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
 import org.apache.tinkerpop.gremlin.GraphProviderClass;
 import org.junit.runner.RunWith;
 
 @RunWith(CustomStandardSuite.class)
-@GraphProviderClass(provider = CustomGraphProvider.class, graph = ArangoDBGraph.class)
+@GraphProviderClass(provider = CustomGraphProvider.class, graph = CustomGraph.class)
 public class CustomStandardSuiteTest {
 
 }