You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/01/10 21:53:17 UTC
svn commit: r1229723 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/ lucene/contrib/analyzers/common/
lucene/contrib/icu/ solr/ solr/CHANGES.txt
solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
Author: hossman
Date: Tue Jan 10 20:53:17 2012
New Revision: 1229723
URL: http://svn.apache.org/viewvc?rev=1229723&view=rev
Log:
SOLR-3024: Fixed JSONTestUtil.matchObj to respect delta param (merge 1229713 from trunk)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/icu/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1229723&r1=1229722&r2=1229723&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Tue Jan 10 20:53:17 2012
@@ -82,6 +82,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
----------------------
Modified: lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java?rev=1229723&r1=1229722&r2=1229723&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java (original)
+++ lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java Tue Jan 10 20:53:17 2012
@@ -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) {
@@ -177,19 +177,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());