Changeset 4516

Timestamp:

02/14/14 08:58:35 (10 years ago)

Author:

twagoo

Message:

Created unit test for SolrQueryFactory? implementation, and added an extra null check to class itself
Also added cobertura plugin

Location:

vlo/branches/vlo-3.0/vlo-web-app

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImpl.java (modified) (3 diffs)
• src/test/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImplTest.java (added)

vlo/branches/vlo-3.0/vlo-web-app/pom.xml

@@ -223 +223 @@
         </plugins>
     </build>
-
+    
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+    </reporting>
+    
     <repositories>
         <repository>

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImpl.java

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -38 +39 @@
     public SolrQueryFactoryImpl(VloConfig config) {
         this.config = config;
-        
+
         // create the query used to count facets (will never change)
         countQuery = getDefaultFacetQuery();
         countQuery.setRows(0);
     }
-    
+
     @Override
     public SolrQuery createFacetQuery(List<FacetSelection> selections, String queryString) {
@@ -57 +58 @@
             final List<String> encodedQueries = new ArrayList(selections.size());
             for (FacetSelection selection : selections) {
-                String facet = selection.getFacet().getName();
-                for (String value : selection.getValue()) {
-                    encodedQueries.add(String.format("%s:%s", facet, ClientUtils.escapeQueryChars(value)));
+                final String facetName = selection.getFacet().getName();
+                final Collection<String> values = selection.getValue();
+                if (values != null) {
+                    for (String value : values) {
+                        encodedQueries.add(String.format("%s:%s", facetName, ClientUtils.escapeQueryChars(value)));
+                    }
                 }
             }