Changeset 4862

Timestamp:

04/01/14 09:00:14 (10 years ago)

Author:

Twan Goosen

Message:

changed matching of value filtering from 'starts with' to 'contains'

Location:

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

Files:

• main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -123 +123 @@
                 @Override
                 public boolean apply(Count input) {
-                    return input.getName().toLowerCase().startsWith(filterValue);
+                    return input.getName().toLowerCase().contains(filterValue);
                 }
             });

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java

@@ -147 +147 @@
     @Test
     public void testFiltered() {
-        final Model filterModel = Model.of("f");
+        final Model filterModel = Model.of("th");
         final FacetFieldValuesProvider instance = new FacetFieldValuesProvider(Model.of(facetField), 10, new SortParam<FieldValuesOrder>(FieldValuesOrder.NAME, true)) {
 
@@ -161 +161 @@
         final Iterator<? extends FacetField.Count> result = instance.iterator(first, count);
 
-        //sorted by name, filtered on first character 'f'
+        //sorted by name, filtered on presence of 'th'
         assertTrue(result.hasNext());
         FacetField.Count valueCount = result.next();
-        assertEquals("first value", valueCount.getName());
+        assertEquals("fourth value", valueCount.getName());
 
         assertTrue(result.hasNext());
         valueCount = result.next();
-        assertEquals("fourth value", valueCount.getName());
+        assertEquals("third value", valueCount.getName());
 
         assertFalse(result.hasNext());