tests fixes

Author: rashtao

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBGraphClient.java

@@ -489,7 +489,7 @@ public Iterator<VertexData> getVertexNeighbors(String vertexId, List<String> edg
         bindVars.put("graph", graph.name());
         bindVars.put("edgeCollections", edgeCollections);
         String query = "FOR v IN 1..1 " + getArangoDirectionFromGremlinDirection(direction).getAqlName() +
-                " @start GRAPH @graph OPTIONS { edgeCollections: @edgeCollections, uniqueVertices: 'global', order: 'bfs' } RETURN v";
+                " @start GRAPH @graph OPTIONS { edgeCollections: @edgeCollections, order: 'bfs' } RETURN v";
         return executeAqlQuery(query, bindVars, null, VertexData.class);
     }
 

src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBQueryBuilder.java

@@ -8,13 +8,9 @@
 
 package com.arangodb.tinkerpop.gremlin.client;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,83 +70,6 @@ String getAqlName() {
 
 	}
 
-	/**
-	 * Options for vertices in Graph Traversals.
-	 *
-	 * @author Horacio Hoyos Rodriguez (@horaciohoyosr)
-	 */
-	
-	enum UniqueVertices {
-		
-		/** It is guaranteed that there is no path returned with a duplicate vertex. */
-		PATH("path"),
-		
-		/** it is guaranteed that each vertex is visited at most once during the traversal, no
-		 * matter how many paths lead from the start vertex to this one. */
-		GLOBAL("global"),
-		
-		/** No uniqueness check is applied on vertices - (default). */
-		NONE("none");
-		
-		/** The aql name. */
-		private final String aqlName;
-		
-		/**
-		 * Instantiates a new unique vertices.
-		 *
-		 * @param aqlName the aql name
-		 */
-		UniqueVertices(String aqlName) {
-			this.aqlName = aqlName;
-		}
-		
-		/**
-		 * Gets the aql name.
-		 *
-		 * @return the aql name
-		 */
-		String getAqlName() {
-			return aqlName;
-		}
-	}
-	
-	/**
-	 * Options for edges in Graph Traversals.
-	 *
-	 * @author Horacio Hoyos Rodriguez (@horaciohoyosr)
-	 */
-	
-	enum UniqueEdges {
-		
-		/** It is guaranteed that there is no path returned with a duplicate edge - (default). */
-		PATH("path"),
-		
-		/** No uniqueness check is applied on edges. <b>Note</b>: Using this configuration the
-		 * traversal will follow cycles in edges. */
-		NONE("none");
-		
-		/** The aql name. */
-		private final String aqlName;
-		
-		/**
-		 * Instantiates a new unique edges.
-		 *
-		 * @param aqlName the aql name
-		 */
-		UniqueEdges(String aqlName) {
-			this.aqlName = aqlName;
-		}
-		
-		/**
-		 * Gets the aql name.
-		 *
-		 * @return the aql name
-		 */
-		String getAqlName() {
-			return aqlName;
-		}
-	}
-	
 	/**
 	 * Create a new QueryBuilder with config of whether Collection Names should be prefixed with Graph name or not.
 	 */
@@ -206,26 +125,6 @@ public ArangoDBQueryBuilder documentsById(
 		return this;
 	}
 
-	/**
-	 * Append a Document statement to find a single element in the graph. This segment should be
-	 * used in conjunction with the {@link #with(List, Map)} segment.
-	 *
-	 * @param id 					the id to look for
-	 * @param loopVariable 			the loop variable name
-	 * @param bindVars the 			the map of bind parameters
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder documentById(
-		String id,
-		String loopVariable,
-		Map<String, Object> bindVars) {
-		queryBuilder.append(String.format("LET %s = Document(@id)\n", loopVariable));
-		bindVars.put("id", id);
-		logger.debug("documentById", queryBuilder.toString());
-		return this;
-	}
-	
 	/**
 	 * Append an union segment.
 	 * @param collections 			the collections that participate in the union
@@ -274,202 +173,6 @@ public ArangoDBQueryBuilder iterateCollection(
 		return this;
 	}
 
-	/**
-	 * Add a graph iteration segment.
-	 * @param graphName 			the graph name
-	 * @param vertexVariable 		the vertex variable
-	 * @param edgeVariable 			the edge variable
-	 * @param pathVariable 			the path variable
-	 * @param min 					edges and vertices returned by this query will start at the traversal depth of min 
-	 * @param max 					up to max length paths are traversed
-	 * @param direction 			follow edges pointing in the direction
-	 * @param startVertex 			the start vertex id
-	 * @param bindVars 				the map of bind parameters
-	 *
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder iterateGraph(
-		String graphName,
-		String vertexVariable,
-		Optional<String> edgeVariable,
-		Optional<String> pathVariable,
-		Optional<Integer> min,
-		Optional<Integer> max,
-		Direction direction,
-		String startVertex,
-		Map<String, Object> bindVars) {
-		queryBuilder.append(String.format("FOR %s", vertexVariable));
-		if (edgeVariable.isPresent()) {
-			queryBuilder.append(String.format(", %s", edgeVariable.get()));
-		}
-		if (pathVariable.isPresent()) {
-			queryBuilder.append(String.format(", %s", pathVariable.get()));
-		}
-		queryBuilder.append("\n  IN ");
-		if (min.isPresent()) {
-			queryBuilder.append(min.get());
-			if (max.isPresent()) {
-				queryBuilder.append(String.format("..%s", max.get()));
-			}
-			queryBuilder.append(" ");
-		}
-		queryBuilder.append(direction.getAqlName()).append(" @startVertex\n")
-			.append("    GRAPH '").append(graphName).append("'\n");		// FIXME Graph could be a parameter
-		bindVars.put("startVertex", startVertex);
-		logger.debug("iterateGraph", queryBuilder.toString());
-		return this;
-	}
-	
-	/**
-	 * Iterate over a collection of edges.
-	 * @param graphName 			the graph name
-	 * @param vertexVariable 		the vertex variable
-	 * @param edgeVariable 			the edge variable
-	 * @param pathVariable 			the path variable
-	 * @param min 					edges and vertices returned by this query will start at the traversal depth of min 
-	 * @param max 					up to max length paths are traversed
-	 * @param direction 			follow edges pointing in the direction
-	 * @param edgeCollections 		the edge collections
-	 * @param startVertex 			the start vertex id
-	 * @param bindVars 				the map of bind parameters
-	 *
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder iterateEdges(
-		String graphName,
-		String vertexVariable,
-		Optional<String> edgeVariable,
-		Optional<String> pathVariable,
-		Optional<Integer> min,
-		Optional<Integer> max,
-		Direction direction,
-		List<String> edgeCollections,
-		String startVertex, Map<String, Object> bindVars) {
-		queryBuilder.append(String.format("FOR %s", vertexVariable));
-		edgeVariable.ifPresent(ev -> queryBuilder.append(String.format(", %s", ev)));
-		pathVariable.ifPresent(pv -> queryBuilder.append(String.format(", %s", pv)));
-		queryBuilder.append("\n  IN ");
-		min.ifPresent(queryBuilder::append);
-		max.ifPresent(m -> queryBuilder.append(String.format("..%s", m)));
-		queryBuilder.append(direction.getAqlName()).append(" @startVertex\n");
-		String separator = "";
-		for (String c : edgeCollections) {
-			queryBuilder.append(separator);
-			separator = ", ";
-			queryBuilder.append(String.format("@@col%s", iterateCnt));
-			bindVars.put(String.format("@col%s", iterateCnt++), c);
-		}
-		bindVars.put("@startVertex", startVertex);
-		logger.debug("iterateGraph", queryBuilder.toString());
-		return this;
-	}
-	
-	/**
-	 * Add a Graph options segment.
-	 *
-	 * @see UniqueVertices
-	 * @see UniqueEdges
-	 * @param onVertices 			the vertices options
-	 * @param onEdges 				the edges options
-	 * @param bfs 					if true, the traversal will be executed breadth-first, else it will
-	 * 								be executed depth-first.
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder graphOptions(
-		Optional<UniqueVertices> onVertices,
-		Optional<UniqueEdges> onEdges,
-		boolean bfs) {
-		if (onVertices.isPresent() || onEdges.isPresent() || bfs) {
-			queryBuilder.append("  OPTIONS {");
-			if (onVertices.isPresent()) {
-				queryBuilder.append(String.format("uniqueVertices: '%s', ", onVertices.get().getAqlName()));
-			}
-			if (onEdges.isPresent()) {
-				queryBuilder.append(String.format("uniqueEdges: '%s', ", onEdges.get().getAqlName()));
-			}
-			if (bfs) {
-				queryBuilder.append("bfs: true");
-			}
-			queryBuilder.append("}\n");
-		}
-		logger.debug("graphOptions", queryBuilder.toString());
-		return this;
-	}
-
-	/**
-	 * Add a filter same collections segment, i.e. element represented by variable must be in any
-	 * of the provided collections.
-	 * @param filterVariable 		the filter variable
-	 * @param collections 			the collections to filter by
-	 * @param bindVars 				the map of bind parameters
-	 *
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder filterSameCollections(
-		String filterVariable,
-		List<String> collections,
-		Map<String, Object> bindVars) {
-		if (!collections.isEmpty()) {
-			queryBuilder.append(" FILTER (IS_SAME_COLLECTION(");
-			String separator = "";
-			for (String c : collections) {
-				queryBuilder.append(separator);
-				separator = String.format(", %s) OR IS_SAME_COLLECTION(", filterVariable);
-				queryBuilder.append(String.format("@@col%s", iterateCnt));
-				bindVars.put(String.format("@col%s", iterateCnt++), c);
-			}
-			queryBuilder.append(String.format(", %s))\n", filterVariable));
-		}
-		filtered = true;
-		logger.debug("filterSameCollections", queryBuilder.toString());
-		return this;
-	}
-	
-	/**
-	 * Add a filter on element properties segment. The filter operations are defined using a 
-	 * #link {@link ArangoDBPropertyFilter}.
-	 *
-	 * @param propertyFilter		the property filter
-	 * @param filterVariable 		the filter variable
-	 * @param bindVars 				the map of bind parameters
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder filterProperties(
-		ArangoDBPropertyFilter propertyFilter,
-		String filterVariable,
-		Map<String, Object> bindVars) {
-		List<String> filterSegments = new ArrayList<String>();
-		propertyFilter.addAqlSegments(String.format("%s.", filterVariable), filterSegments, bindVars);
-		if (CollectionUtils.isNotEmpty(filterSegments)) {
-			if (filtered) {
-				queryBuilder.append(" AND ");
-			} else {
-				queryBuilder.append(" FILTER ");
-            }
-			queryBuilder.append(StringUtils.join(filterSegments, " AND ")).append("\n");
-		}
-		logger.debug("filterProperties", queryBuilder.toString());
-		return this;
-	}
-	
-	/**
-	 * Add a limit segment to limit the number of elements returned.
-	 *
-	 * @param limit 				the limit number
-	 * @return a reference to this object.
-	 */
-	
-	public ArangoDBQueryBuilder limit(Long limit) {
-		queryBuilder.append(" LIMIT " + limit.toString());
-		logger.debug("limit", queryBuilder.toString());
-		return this;
-	}
-	
 	/**
 	 * Add a RETURN Segment. 
 	 * TODO provide finer grained return statements 

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

@@ -138,6 +138,7 @@
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
 @Graph.OptIn("com.arangodb.tinkerpop.gremlin.StructureIntegrateSuite")
 @Graph.OptIn("com.arangodb.tinkerpop.gremlin.ArangoDBTestSuite")
+@Graph.OptIn("com.arangodb.tinkerpop.gremlin.custom.CustomStandardSuite")
 @Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedGraphTest",
         method = "testAttachableCreateMethod",
@@ -182,18 +183,6 @@
         test = "org.apache.tinkerpop.gremlin.structure.VertexTest$AddEdgeTest",
         method = "shouldAddEdgeWithUserSuppliedStringId",
         reason = "FIXME")
-@Graph.OptOut(
-        test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
-        method = "g_V_both_both_count",
-        reason = "FIXME")
-@Graph.OptOut(
-        test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
-        method = "g_V_repeatXoutX_timesX3X_count",
-        reason = "FIXME")
-@Graph.OptOut(
-        test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
-        method = "g_V_repeatXoutX_timesX8X_count",
-        reason = "FIXME")
 public class ArangoDBGraph implements Graph {
 
     /**