SONAR-5634 - Implemented facets as sticky (multi-select) facets for RuleIndex

diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
index c665b216f486f5a9dc06bdecdd8aae27786f9cbe..6a88278800e0325f316966992e333c1fd97abe7b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
@@ -965,9 +965,9 @@ public class RuleIndexMediumTest extends SearchMediumTest {
     // 1 Facet with no filters at all
     Map<String, Collection<FacetValue>> facets = index.search(new RuleQuery(), new QueryContext().setFacet(true)).getFacets();
     assertThat(facets.keySet()).hasSize(3);
-    assertThat(facets.get(RuleIndex.FACET_LANGUAGES)).hasSize(3);
-    assertThat(facets.get(RuleIndex.FACET_REPOSITORIES)).hasSize(2);
-    assertThat(facets.get(RuleIndex.FACET_TAGS)).hasSize(4 + numberOfSystemTags);
+    assertThat(facets.get(RuleIndex.FACET_LANGUAGES)).onProperty("key").containsOnly("cpp", "java", "cobol");
+    assertThat(facets.get(RuleIndex.FACET_REPOSITORIES)).onProperty("key").containsOnly("xoo", "foo");
+    assertThat(facets.get(RuleIndex.FACET_TAGS)).onProperty("key").containsOnly("systag1", "systag2", "T1", "T2", "T3", "T4");
 
     // 2 Facet with a language filter
     // -- lang facet should still have all language
@@ -976,7 +976,7 @@ public class RuleIndexMediumTest extends SearchMediumTest {
       , new QueryContext().setFacet(true));
     assertThat(result.getHits()).hasSize(3);
     assertThat(result.getFacets()).hasSize(3);
-    assertThat(result.getFacets().get(RuleIndex.FACET_LANGUAGES)).hasSize(3);
+    assertThat(result.getFacets().get(RuleIndex.FACET_LANGUAGES)).onProperty("key").containsOnly("cpp", "java", "cobol");
 
     // 3 facet with 2 filters
     // -- lang facet for tag T2
@@ -988,9 +988,9 @@ public class RuleIndexMediumTest extends SearchMediumTest {
       , new QueryContext().setFacet(true));
     assertThat(result.getHits()).hasSize(1);
     assertThat(result.getFacets().keySet()).hasSize(3);
-    assertThat(result.getFacets().get(RuleIndex.FACET_LANGUAGES)).hasSize(2); // java & cpp
-    assertThat(result.getFacets().get(RuleIndex.FACET_REPOSITORIES)).hasSize(1); // foo
-    assertThat(result.getFacets().get(RuleIndex.FACET_TAGS)).hasSize(2 + numberOfSystemTags); // T2 & T3 + SystemTags
+    assertThat(result.getFacets().get(RuleIndex.FACET_LANGUAGES)).onProperty("key").containsOnly("cpp", "java");
+    assertThat(result.getFacets().get(RuleIndex.FACET_REPOSITORIES)).onProperty("key").containsOnly("foo");
+    assertThat(result.getFacets().get(RuleIndex.FACET_TAGS)).onProperty("key").containsOnly("systag1", "systag2", "T2", "T3");
 
     // 4 facet with 2 filters
     // -- lang facet for tag T2
@@ -1002,9 +1002,9 @@ public class RuleIndexMediumTest extends SearchMediumTest {
       , new QueryContext().setFacet(true));
     assertThat(result.getHits()).hasSize(2);
     assertThat(result.getFacets().keySet()).hasSize(3);
-    assertThat(result.getFacets().get(RuleIndex.FACET_LANGUAGES)).hasSize(2); // java & cpp
-    assertThat(result.getFacets().get(RuleIndex.FACET_REPOSITORIES)).hasSize(2); // foo & xoo
-    assertThat(result.getFacets().get(RuleIndex.FACET_TAGS)).hasSize(3 + numberOfSystemTags); // T1 & T2 & T3 + SystemTags
+    assertThat(result.getFacets().get(RuleIndex.FACET_LANGUAGES)).onProperty("key").containsOnly("cpp", "java");
+    assertThat(result.getFacets().get(RuleIndex.FACET_REPOSITORIES)).onProperty("key").containsOnly("foo", "xoo");
+    assertThat(result.getFacets().get(RuleIndex.FACET_TAGS)).onProperty("key").containsOnly("systag1", "systag2", "T1", "T2", "T3");
   }
 
   private static List<String> ruleKeys(List<Rule> rules) {