#1 - Adding missed commit to fix unit tests

Author: colinfindlay

src/main/java/com/arangodb/graphql/generator/AbstractFilterGenerator.java

@@ -85,7 +85,7 @@ private String filter(ArangoFilter filter, int depth) {
 
         if(edgeFilter){
             sb.append("(");
-            isSameCollection.append("IS_SAME_COLLECTION( \"");
+            isSameCollection.append("IS_SAME_COLLECTION(\"");
             isSameCollection.append(filter.getEdgeCollection());
             isSameCollection.append("\", p.edges[");
             isSameCollection.append(depth -1);
@@ -112,7 +112,7 @@ private String filter(ArangoFilter filter, int depth) {
         if(edgeFilter) {
             sb.append(" AND ");
             sb.append(isSameCollection.toString());
-            sb.append(") ");
+            sb.append(")");
 
             sb.append(" OR (NOT ");
             sb.append(isSameCollection.toString());

src/test/java/com/arangodb/graphql/generator/TraversalFilterGeneratorTest.java

@@ -49,7 +49,7 @@ public class TraversalFilterGeneratorTest {
 
 
     @Before
-    public void setUp(){
+    public void setUp() {
         generator = new TraversalFilterGenerator();
         when(context.hasTraversal()).thenReturn(true);
         when(context.getTraversalFilters()).thenReturn(Arrays.asList(filterGroup));
@@ -58,49 +58,48 @@ public void setUp(){
 
 
     @Test
-    public void generateAqlSingleNumericFilter(){
+    public void generateAqlSingleNumericFilter() {
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
                 new ArangoFilter("jersey", 29, "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].jersey == 29) AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
+        assertThat(generator.generateAql(context), equalTo("FILTER ((p.vertices[2].jersey == 29) AND IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }
 
     @Test
-    public void generateAqlSingleNonNumericFilter(){
+    public void generateAqlSingleNonNumericFilter() {
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
                 new ArangoFilter("name", "Felix Potvin", "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].name == \"Felix Potvin\") AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
+        assertThat(generator.generateAql(context), equalTo("FILTER ((p.vertices[2].name == \"Felix Potvin\") AND IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }
 
 
-
     @Test
-    public void generateAqlMultipleNonNumericFilter(){
+    public void generateAqlMultipleNonNumericFilter() {
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
                 new ArangoFilter("name", "Felix Potvin", "edgeCollectionName"),
                 new ArangoFilter("jersey", 29, "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].name == \"Felix Potvin\")\nFILTER (p.vertices[2].jersey == 29) AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
+        assertThat(generator.generateAql(context), equalTo("FILTER ((p.vertices[2].name == \"Felix Potvin\") AND IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))\nFILTER ((p.vertices[2].jersey == 29) AND IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }
 
     @Test
-    public void generateAqlMultiValueFilter(){
+    public void generateAqlMultiValueFilter() {
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
                 new ArangoFilter("jersey", Arrays.asList(29, 93), "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].jersey == 29 || p.vertices[2].jersey == 93) AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
+        assertThat(generator.generateAql(context), equalTo("FILTER ((p.vertices[2].jersey == 29 || p.vertices[2].jersey == 93) AND IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }