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

SOLR-3024: Fixed JSONTestUtil.matchObj to respect delta param 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1229713 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2012-01-10 20:34:09 +00:00
parent 6a085c2fa9
commit ef4e44f30b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -448,6 +448,9 @@ Bug Fixes
* SOLR-2956: Fixed inconsistencies in the flags (and flag key) reported by
the LukeRequestHandler (hossman)
* SOLR-3024: Fixed JSONTestUtil.matchObj, in previous releases it was not
respecting the 'delta' arg (David Smiley via hossman)
Other Changes
----------------------

15
solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
View File

@ -78,7 +78,7 @@ public class JSONTestUtil {
public static String match(String path, String input, String expected, double delta) throws Exception {
Object inputObj = ObjectBuilder.fromJSON(input);
Object expectObj = ObjectBuilder.fromJSON(expected);
return matchObj(path, inputObj, expectObj);
return matchObj(path, inputObj, expectObj, delta);
}
/**
@ -88,7 +88,7 @@ public class JSONTestUtil {
* @param delta tollerance allowed in comparing float/double values
*/
public static String matchObj(String path, Object input, Object expected, double delta) throws Exception {
CollectionTester tester = new CollectionTester(input);
CollectionTester tester = new CollectionTester(input,delta);
boolean reversed = path.startsWith("!");
String positivePath = reversed ? path.substring(1) : path;
if (!tester.seek(positivePath) ^ reversed) {
@ -181,19 +181,16 @@ class CollectionTester {
// make an exception for some numerics
if ((expected instanceof Integer && val instanceof Long || expected instanceof Long && val instanceof Integer)
&& ((Number)expected).longValue() == ((Number)val).longValue())
{
&& ((Number)expected).longValue() == ((Number)val).longValue()) {
return true;
} else if ((expected instanceof Float && val instanceof Double || expected instanceof Double && val instanceof Float)) {
} else if ((expected instanceof Double || expected instanceof Float) && (val instanceof Double || val instanceof Float)) {
double a = ((Number)expected).doubleValue();
double b = ((Number)val).doubleValue();
if (Double.compare(a,b) == 0) return true;
if (Math.abs(a-b) < delta) return true;
return false;
} else {
setErr("mismatch: '" + expected + "'!='" + val + "'");
return false;
}
setErr("mismatch: '" + expected + "'!='" + val + "'");
return false;
}
// setErr("unknown expected type " + expected.getClass().getName());