Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge up to trunk rev 922991 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/solr@922996 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2010-03-14 22:58:18 +00:00
parent cc4ba444c9 f29488d551
commit 43924496f8
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -261,6 +261,9 @@ Other Changes
* SOLR-1776: DismaxQParser and ExtendedDismaxQParser now use the schema.xml * SOLR-1776: DismaxQParser and ExtendedDismaxQParser now use the schema.xml
"defaultSearchField" as the default value for the "qf" param instead of failing "defaultSearchField" as the default value for the "qf" param instead of failing
with an error when "qf" is not specified. (hossman) with an error when "qf" is not specified. (hossman)
* SOLR-1821: Fix TimeZone-dependent test failure in TestEvaluatorBag.
(Chris Male via rmuir)
Build Build
---------------------- ----------------------

13
contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
View File

@ -123,15 +123,20 @@ public class TestEvaluatorBag {
ContextImpl context = new ContextImpl(null, resolver, null, Context.FULL_DUMP, Collections.EMPTY_MAP, null, null); ContextImpl context = new ContextImpl(null, resolver, null, Context.FULL_DUMP, Collections.EMPTY_MAP, null, null);
Context.CURRENT_CONTEXT.set(context); Context.CURRENT_CONTEXT.set(context);
try { try {
long time = System.currentTimeMillis(); Calendar calendar = new GregorianCalendar();
assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date(time - 2*86400*1000)), calendar.add(Calendar.DAY_OF_YEAR, -2);
assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(calendar.getTime()),
dateFormatEval.evaluate("'NOW-2DAYS','yyyy-MM-dd HH:mm'", Context.CURRENT_CONTEXT.get())); dateFormatEval.evaluate("'NOW-2DAYS','yyyy-MM-dd HH:mm'", Context.CURRENT_CONTEXT.get()));
calendar = new GregorianCalendar();
Date date = calendar.getTime();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("key", new Date(time)); map.put("key", date);
resolver.addNamespace("A", map); resolver.addNamespace("A", map);
assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date(time)), assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(date),
dateFormatEval.evaluate("A.key, 'yyyy-MM-dd HH:mm'", Context.CURRENT_CONTEXT.get())); dateFormatEval.evaluate("A.key, 'yyyy-MM-dd HH:mm'", Context.CURRENT_CONTEXT.get()));
} finally { } finally {
Context.CURRENT_CONTEXT.remove(); Context.CURRENT_CONTEXT.remove();