Merged 5.2.N (5.2.1) to HEAD (5.2)

130300 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130061 gjames: SEARCH-120: Facet queries label support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130372 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:10:53 +00:00
parent 818b3b3c18
commit 1e048180e9
2 changed files with 28 additions and 7 deletions

View File

@@ -312,13 +312,21 @@ public class SearchMapperTests
//Doesn't error
searchMapper.fromFacetQuery(searchParameters, null);
searchMapper.fromFacetQuery(searchParameters, Arrays.asList(new FacetQuery("ping", null), new FacetQuery("pong", "table"), new FacetQuery("pang", "tennis")));
assertEquals(3 ,searchParameters.getFacetQueries().size());
assertEquals("ping" ,searchParameters.getFacetQueries().get(0));
assertEquals("pong" ,searchParameters.getFacetQueries().get(1));
assertEquals("pang" ,searchParameters.getFacetQueries().get(2));
searchMapper.fromFacetQuery(searchParameters, Arrays.asList(new FacetQuery("ping", null), new FacetQuery("pong", "table")));
assertEquals(2 ,searchParameters.getFacetQueries().size());
assertEquals("{!afts key='ping'}ping" ,searchParameters.getFacetQueries().get(0));
assertEquals("{!afts key='table'}pong" ,searchParameters.getFacetQueries().get(1));
//label isn't used at the moment
try
{
searchMapper.fromFacetQuery(searchParameters, Arrays.asList(new FacetQuery("ping", null),new FacetQuery("{!afts}pang", "tennis")));
fail();
}
catch (InvalidArgumentException iae)
{
//Cannot start with afts
assertNotNull(iae);
}
}