[hibernate-commits] Hibernate SVN: r18711 - in search/trunk/src: test/java/org/hibernate/search/test/bridge and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-02-06 08:59:15 -0500 (Sat, 06 Feb 2010)
New Revision: 18711

Modified:
   search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java
   search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
Log:
(HSEARCH-456) CalendarBridge ignoring setParameterValues

Modified: search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java	2010-02-06 12:54:40 UTC (rev 18710)
+++ search/trunk/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java	2010-02-06 13:59:15 UTC (rev 18711)
@@ -39,6 +39,8 @@
 
 public class CalendarBridge implements TwoWayStringBridge, ParameterizedBridge {
     
+	public static final String RESOLUTION_PARAMETER = "resolution";
+	
 	private DateTools.Resolution resolution;
 	public static final TwoWayStringBridge CALENDAR_YEAR = new CalendarBridge( Resolution.YEAR );
 	public static final TwoWayStringBridge CALENDAR_MONTH = new CalendarBridge( Resolution.MONTH );
@@ -56,7 +58,7 @@
 	}
 
 	public void setParameterValues(Map parameters) {
-		Object resolution = parameters.get( "resolution" );
+		Object resolution = parameters.get( RESOLUTION_PARAMETER );
 		Resolution hibResolution;
 		if ( resolution instanceof String ) {
 			hibResolution = Resolution.valueOf( ( (String) resolution ).toUpperCase( Locale.ENGLISH ) );
@@ -64,7 +66,7 @@
 		else {
 			hibResolution = (Resolution) resolution;
 		}
-		resolution = DateResolutionUtil.getLuceneResolution( hibResolution );
+		this.resolution = DateResolutionUtil.getLuceneResolution( hibResolution );
 	}
 
     public Object stringToObject(String stringValue) {

Modified: search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java	2010-02-06 12:54:40 UTC (rev 18710)
+++ search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java	2010-02-06 13:59:15 UTC (rev 18711)
@@ -29,6 +29,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -46,6 +47,8 @@
 import org.hibernate.search.Environment;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
+import org.hibernate.search.annotations.Resolution;
+import org.hibernate.search.bridge.builtin.CalendarBridge;
 import org.hibernate.search.test.SearchTestCase;
 
 /**
@@ -252,6 +255,17 @@
 		s.delete( s.get( Cloud.class, cloud.getId() ) );
 		tx.commit();
 		s.close();
+		
+		//now unit-test the bridge directly:
+		
+		CalendarBridge bridge = new CalendarBridge();
+		HashMap<String, String> bridgeParams = new HashMap<String, String>();
+		bridgeParams.put( CalendarBridge.RESOLUTION_PARAMETER, Resolution.YEAR.toString() );
+		bridge.setParameterValues( bridgeParams );
+		assertEquals( "2000", bridge.objectToString( c ) );
+		bridgeParams.put( CalendarBridge.RESOLUTION_PARAMETER, Resolution.DAY.toString() );
+		bridge.setParameterValues( bridgeParams );
+		assertEquals( "20001215", bridge.objectToString( c ) );
 
 	}