Author: epbernard Date: 2010-06-02 11:55:01 -0400 (Wed, 02 Jun 2010) New Revision: 19671 Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java Log: HSEARCH-414 Fix bug on Range query. Exclude flags were reversed. Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java 2010-06-02 15:53:55 UTC (rev 19670) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java 2010-06-02 15:55:01 UTC (rev 19671) @@ -71,8 +71,8 @@ fieldName, lowerTerm, upperTerm, - rangeContext.isExcludeFrom(), - rangeContext.isExcludeTo() + !rangeContext.isExcludeFrom(), + !rangeContext.isExcludeTo() ); return fieldContext.getFieldCustomizer().setWrappedQuery( perFieldQuery ).createQuery(); } Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-06-02 15:53:55 UTC (rev 19670) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-06-02 15:55:01 UTC (rev 19671) @@ -4,8 +4,10 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.TimeZone; +import org.apache.lucene.document.DateTools; import org.apache.lucene.search.Query; import org.apache.solr.analysis.LowerCaseFilterFactory; import org.apache.solr.analysis.NGramFilterFactory; @@ -255,7 +257,6 @@ Date from = calendar.getTime(); calendar.set(10 + 1900, 2, 12, 0, 0, 0); Date to = calendar.getTime(); - final SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyyMMdd" ); Query @@ -263,17 +264,16 @@ range() .onField( "estimatedCreation" ) .andField( "justfortest" ) - .from( dateFormat.format( from ) ) - .to( dateFormat.format( to ) ).exclude() + .from( DateTools.dateToString( from, DateTools.Resolution.MINUTE ) ) + .to( DateTools.dateToString( to, DateTools.Resolution.MINUTE ) ).exclude() .createQuery(); - assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() ); query = monthQb. range() .onField( "estimatedCreation" ) .andField( "justfortest" ) - .below( dateFormat.format( to ) ) + .below( DateTools.dateToString( to, DateTools.Resolution.MINUTE ) ) .createQuery(); FullTextQuery hibQuery = fts.createFullTextQuery( query, Month.class ); @@ -284,7 +284,7 @@ range() .onField( "estimatedCreation" ) .andField( "justfortest" ) - .above( dateFormat.format( to ) ) + .above( DateTools.dateToString( to, DateTools.Resolution.MINUTE ) ) .createQuery(); hibQuery = fts.createFullTextQuery( query, Month.class ); assertEquals( 1, hibQuery.getResultSize() );