Changeset 4579 for vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

Timestamp:

02/25/14 16:33:17 (10 years ago)

Author:

twagoo

Message:

Added single facet panel for collection selection

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) (5 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.config.VloSpringConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -27 +28 @@
 
 import static org.hamcrest.core.AnyOf.*;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
@@ -48 +50 @@
 
         @Override
+        @Bean(name = VloSpringConfig.FACETS_PANEL_SERVICE)
         public FacetFieldsService facetFieldsService() {
-            return mockery().mock(FacetFieldsService.class);
+            return mockery().mock(FacetFieldsService.class, "facetFieldsService");
+        }
+
+        @Override
+        @Bean(name = COLLECTION_FACET_SERVICE)
+        public FacetFieldsService collectionFacetFieldsService() {
+            return mockery().mock(FacetFieldsService.class, "collectionFacetFieldsService");
         }
 
@@ -59 +68 @@
 
     private WicketTester tester;
-    @Autowired
+    @Autowired(required = true)
     private VloWicketApplication application;
-    @Autowired
+    @Autowired(required = true)
     private Mockery mockery;
-    @Autowired
+
+    @Autowired(required = true)
+    @Qualifier(VloSpringConfig.FACETS_PANEL_SERVICE)
     private FacetFieldsService facetFieldsService;
-    @Autowired
+
+    @Autowired(required = true)
+    @Qualifier(VloSpringConfig.COLLECTION_FACET_SERVICE)
+    private FacetFieldsService collectionsFacetFieldsService; //TODO: Make sure this gets injected separately (like qualifier should ensure)
+
+    @Autowired(required = true)
     private SolrDocumentService documentService;
 
@@ -81 +97 @@
                 atLeast(1).of(facetFieldsService).getFacetFieldCount();
                 will(returnValue(2L));
-                oneOf(facetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)));
+                atLeast(1).of(facetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)));
                 will(returnValue(Arrays.asList(new FacetField("language"), new FacetField("resource class"))));
-                
+//
+//                // mock collection facet
+//                atLeast(1).of(collectionsFacetFieldsService).getFacetFieldCount();
+//                will(returnValue(1L));
+//                oneOf(collectionsFacetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)));
+//                will(returnValue(Arrays.asList(new FacetField("collection"))));
+
                 // mock search results
                 atLeast(1).of(documentService).getDocumentCount(with(any(QueryFacetsSelection.class)));