Author: mickw
Date: 2006-04-10 16:17:13 +0200 (Mon, 10 Apr 2006)
New Revision: 2755

Modified:
   
trunk/src/test/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformerTest.java
Log:
sensitive to changes in the fast analysis result.


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-10 13:57:20 UTC (rev 2754)
+++ 
trunk/src/test/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformerTest.java
     2006-04-10 14:17:13 UTC (rev 2755)
@@ -1,10 +1,7 @@
 /*
  * SynonymQueryTransformerTest.java
  *
- * Created on April 5, 2006, 9:32 PM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Created on April 5, 2006, 9:32 P
  */
 
 package no.schibstedsok.front.searchportal.query.transform;
@@ -73,14 +70,19 @@
         final TokenEvaluatorFactory tef = new 
TokenEvaluatorFactoryImpl(tefCxt);
 
         final Query query = parseQuery(tef);
+
         final Map<Clause,String> trans = applyTransformer(new 
SynonymQueryTransformer(), query,
                 TokenPredicate.EXACT_STOCKMARKETTICKERS.name(), tefCxt, tef);
 
         final QueryBuilder builder = new QueryBuilder(query, trans);
+        final String result = builder.getQueryString();
 
-        final String result = builder.getQueryString();
         LOG.debug("testOneWordExact builder gave " + result);
-        assertEquals("(sch schibsted)", result);
+        if( 
query.getFirstLeafClause().getPossiblePredicates().contains(TokenPredicate.EXACT_STOCKMARKETTICKERS)){
+            assertEquals("(sch schibsted)", result);
+        }else{
+            assertEquals("sch", result);
+        }
     }
 
     public void testOneWord() throws ParseException {
@@ -94,10 +96,14 @@
                 TokenPredicate.STOCKMARKETTICKERS.name(), tefCxt, tef);
 
         final QueryBuilder builder = new QueryBuilder(query, trans);
-
         final String result = builder.getQueryString();
+        
         LOG.debug("testOneWord builder gave " + result);
-        assertEquals("(sch schibsted)", result);
+        if( 
query.getFirstLeafClause().getKnownPredicates().contains(TokenPredicate.STOCKMARKETTICKERS)){
+            assertEquals("(sch schibsted)", result);
+        }else{
+            assertEquals("sch", result);
+        }
     }
 
     public void testTwoWords() throws ParseException {
@@ -111,11 +117,14 @@
                 TokenPredicate.STOCKMARKETTICKERS.name(), tefCxt, tef);
 
         final QueryBuilder builder = new QueryBuilder(query, trans);
-
-
         final String result = builder.getQueryString();
+        
         LOG.debug("testTwoWords builder gave " + result);
-        assertEquals("(oslo oslo areal) (sch schibsted) schibsted", result);
+        if( 
query.getFirstLeafClause().getKnownPredicates().contains(TokenPredicate.STOCKMARKETTICKERS)){
+            assertEquals("(oslo oslo areal) (sch schibsted) schibsted", 
result);
+        }else{
+            assertEquals("oslo sch schibsted", result);
+        }
     }
 
     public void testTwoWordsExact() throws ParseException {
@@ -148,10 +157,14 @@
 //                TokenPredicate.COMPANYRANK.name(), tefCxt, tef);
 //
 //        final QueryBuilder builder = new QueryBuilder(query, trans);
-//
 //        final String result = builder.getQueryString();
+//        
 //        LOG.debug("testMultiWordOriginalWithOtherTermAtEnd builder gave " + 
result);
-//        assertEquals("(schibsted asa schasa) (oslo oslo areal)", result);
+//        if( 
query.getFirstLeafClause().getKnownPredicates().contains(TokenPredicate.COMPANYRANK)){
+//            assertEquals("(schibsted asa schasa) (oslo oslo areal)", result);
+//        }else{
+//            assertEquals("schibsted asa oslo", result);
+//        }
 //    }
     
     private Map<Clause,String> applyTransformer(

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to