[mb-commits] r13702 - in search_server/trunk/servlet/src: main/java/org/musicbrainz/search/servlet test/java/org/musicbrainz/search/servlet

Author: ijabz
Date: 2013-08-09 10:52:05 +0000 (Fri, 09 Aug 2013)
New Revision: 13702

Modified:
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaSearch.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
Log:
SEARCH-306:Advanced search can't find areas by alias

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaSearch.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaSearch.java	2013-07-27 11:16:53 UTC (rev 13701)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaSearch.java	2013-08-09 10:52:05 UTC (rev 13702)
@@ -18,7 +18,7 @@
   protected void setupDefaultFields() {
     defaultFields = new ArrayList<String>();
     defaultFields.add(AreaIndexField.AREA.getName());
-    //defaultFields.add(AreaIndexField.ALIAS.getName());
+    defaultFields.add(AreaIndexField.ALIAS.getName());
     defaultFields.add(AreaIndexField.SORTNAME.getName());
   }
 

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java	2013-07-27 11:16:53 UTC (rev 13701)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java	2013-08-09 10:52:05 UTC (rev 13702)
@@ -152,6 +152,27 @@
     }
 
     @Test
+    public void testFindAreaByDefaultName() throws Exception {
+        Results res = ss.search("\"Afghanistan\"", 0, 10);
+        assertEquals(1, res.getTotalHits());
+        Result result = res.results.get(0);
+        MbDocument doc = result.getDoc();
+        assertEquals("ff571ff4-04cb-4b9c-8a1c-354c330f863c", doc.get(AreaIndexField.AREA_ID));
+        assertEquals("Afghanistan", doc.get(AreaIndexField.AREA));
+    }
+
+
+    @Test
+    public void testFindAreaByDefaultAlias() throws Exception {
+        Results res = ss.search("\"Afghany\"", 0, 10);
+        assertEquals(1, res.getTotalHits());
+        Result result = res.results.get(0);
+        MbDocument doc = result.getDoc();
+        assertEquals("ff571ff4-04cb-4b9c-8a1c-354c330f863c", doc.get(AreaIndexField.AREA_ID));
+        assertEquals("Afghanistan", doc.get(AreaIndexField.AREA));
+    }
+
+    @Test
     public void testFindAreaByAlias() throws Exception {
         Results res = ss.search("alias:\"Afghany\"", 0, 10);
         assertEquals(1, res.getTotalHits());