From 50fb4536c112ae8b0c31dfae903ed0206e4f1c41 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 1 Jun 2017 15:58:59 +0200
Subject: [PATCH] SEARCH-456: Fixing filter queries tests.

---
 .../org/alfresco/rest/search/FacetIntervalSearchTest.java | 8 ++++----
 .../java/org/alfresco/rest/search/FacetedSearchTest.java  | 4 ++--
 .../org/alfresco/rest/search/PivotFacetedSearchTest.java  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java
index c7e9cf9fa..9d8d74b37 100644
--- a/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java
@@ -120,14 +120,14 @@ public class FacetIntervalSearchTest extends AbstractSearchTest
         RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0);
         Assert.assertEquals(facetResponseModel.getBuckets().size(), 2);
         bucket.assertThat().field("label").is("aUser");
-        bucket.assertThat().field("filterQuery").is("creator:[a TO user]");
+        bucket.assertThat().field("filterQuery").is("creator:[\"a\" TO \"user\"]");
         bucket.getMetrics().get(0).assertThat().field("type").is("count");
         bucket.getMetrics().get(0).assertThat().field("value").contains("{count=");
 
         bucket = facetResponseModel.getBuckets().get(1);
 
         bucket.assertThat().field("label").is("theRest");
-        bucket.assertThat().field("filterQuery").is("creator:<user TO z]");
+        bucket.assertThat().field("filterQuery").is("creator:<\"user\" TO \"z\"]");
         bucket.getMetrics().get(0).assertThat().field("type").is("count");
         bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}");
     }
@@ -165,7 +165,7 @@ public class FacetIntervalSearchTest extends AbstractSearchTest
         Assert.assertEquals(facetResponseModel.getBuckets().size(), 2);
 
         bucket.assertThat().field("label").is("From2016");
-        bucket.assertThat().field("filterQuery").is("cm:modified:[2016 TO now]");
+        bucket.assertThat().field("filterQuery").is("cm:modified:[\"2016\" TO \"now\"]");
         bucket.getMetrics().get(0).assertThat().field("type").is("count");
         bucket.getMetrics().get(0).assertThat().field("value").contains("{count=");
 
@@ -173,7 +173,7 @@ public class FacetIntervalSearchTest extends AbstractSearchTest
         bucket = facetResponseModel.getBuckets().get(1);
 
         bucket.assertThat().field("label").is("Before2016");
-        bucket.assertThat().field("filterQuery").is("cm:modified:[* TO 2016>");
+        bucket.assertThat().field("filterQuery").is("cm:modified:[\"*\" TO \"2016\">");
         bucket.getMetrics().get(0).assertThat().field("type").is("count");
         bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}");
     }
diff --git a/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java
index a83be0234..a8eccf613 100644
--- a/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java
@@ -255,7 +255,7 @@ public class FacetedSearchTest extends AbstractSearchTest
         FacetFieldBucket bucket1 = model.getBuckets().get(0);
         bucket1.assertThat().field("label").is("System");
         bucket1.assertThat().field("display").is("System");
-        bucket1.assertThat().field("filterQuery").is("modifier:System");
+        bucket1.assertThat().field("filterQuery").is("modifier:\"System\"");
         bucket1.assertThat().field("count").is(684);
     }
     @Test
@@ -295,7 +295,7 @@ public class FacetedSearchTest extends AbstractSearchTest
         RestGenericBucketModel bucket1 = model.getBuckets().get(0);
         bucket1.assertThat().field("label").is("System");
         bucket1.assertThat().field("display").isNull();
-        bucket1.assertThat().field("filterQuery").is("modifier:System");
+        bucket1.assertThat().field("filterQuery").is("modifier:\"System\"");
         bucket1.assertThat().field("metrics").is("[{entry=null, type=count, value={count=684}}]");
     }
     
diff --git a/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java b/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java
index b5bb1863b..198438173 100644
--- a/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java
@@ -211,7 +211,7 @@ public class PivotFacetedSearchTest extends AbstractSearchTest
         facetResponseModel.assertThat().field("label").is(label);
         RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0);
         bucket.assertThat().field("label").isNotEmpty();
-        bucket.assertThat().field("filterQuery").is(field+":"+bucket.getLabel());
+        bucket.assertThat().field("filterQuery").is(field+":\""+bucket.getLabel()+"\"");
         Assert.assertEquals("count", bucket.getMetrics().get(0).getType());
         Assert.assertTrue(bucket.getMetrics().get(0).getValue().toString().contains("{count="));
     }
@@ -251,7 +251,7 @@ public class PivotFacetedSearchTest extends AbstractSearchTest
         labelResponseModel.assertThat().field("label").isNotEmpty();
         labelResponseModel.assertThat().field("label").is("aLabel");
         RestGenericBucketModel bucket = labelResponseModel.getBuckets().get(0);
-        bucket.assertThat().field("filterQuery").is("modifier:"+bucket.getLabel());
+        bucket.assertThat().field("filterQuery").is("modifier:\""+bucket.getLabel()+"\"");
         Assert.assertEquals("count", bucket.getMetrics().get(0).getType());
         Assert.assertTrue(bucket.getMetrics().get(0).getValue().toString().contains("{count="));
     }