Author: magnuse
Date: 2006-04-06 13:54:54 +0200 (Thu, 06 Apr 2006)
New Revision: 2731
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
trunk/src/test/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformerTest.java
Log:
Fixed two tests.
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
2006-04-06 11:45:30 UTC (rev 2730)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
2006-04-06 11:54:54 UTC (rev 2731)
@@ -92,7 +92,7 @@
private void expandSynonym(final List<LeafClause> replace, String synonym)
{
final LeafClause first = replace.get(0);
- final LeafClause last = replace.get(0);
+ final LeafClause last = replace.get(replace.size() - 1);
if (first != last) {
getContext().getTransformedTerms().put(first, "(" +
first.getTerm());
Modified:
trunk/src/test/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformerTest.java
===================================================================
---
trunk/src/test/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformerTest.java
2006-04-06 11:45:30 UTC (rev 2730)
+++
trunk/src/test/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformerTest.java
2006-04-06 11:54:54 UTC (rev 2731)
@@ -79,22 +79,22 @@
assertEquals("oslo (sch schibsted) schibsted",
builder.getQueryString());
}
-// public void testTwoWordsExact() throws ParseException {
-// // Not Exact match. Don't do expansion.
-// final Query query = parseQuery("oslo sch schibsted");
-// final Map trans = applyTransformer(new SynonymQueryTransformer(),
query, "EXACT_STOCKMARKETTICKERS");
-// final QueryBuilder builder = new QueryBuilder(query, trans);
-//
-// assertEquals("oslo sch schibsted", builder.getQueryString());
-// }
-//
-// public void testMultiWordOriginalWithOtherTermAtEnd() throws
ParseException {
-// final Query query = parseQuery("schibsted asa oslo");
-// final Map trans = applyTransformer(new SynonymQueryTransformer(),
query, "COMPANYRANK");
-// final QueryBuilder builder = new QueryBuilder(query, trans);
-//
-// assertEquals("(schibsted asa schasa) oslo",
builder.getQueryString());
-// }
+ public void testTwoWordsExact() throws ParseException {
+ // Not Exact match. Don't do expansion.
+ final Query query = parseQuery("oslo sch schibsted");
+ final Map trans = applyTransformer(new SynonymQueryTransformer(),
query, "EXACT_STOCKMARKETTICKERS");
+ final QueryBuilder builder = new QueryBuilder(query, trans);
+
+ assertEquals("oslo sch schibsted", builder.getQueryString());
+ }
+
+ public void testMultiWordOriginalWithOtherTermAtEnd() throws
ParseException {
+ final Query query = parseQuery("schibsted asa oslo");
+ final Map trans = applyTransformer(new SynonymQueryTransformer(),
query, "COMPANYRANK");
+ final QueryBuilder builder = new QueryBuilder(query, trans);
+
+ assertEquals("(schibsted asa schasa) oslo", builder.getQueryString());
+ }
private Map applyTransformer(final SynonymQueryTransformer t, final Query
query, final String predicateName) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
