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

SOLR-11598: Fix test case + class name typo

This commit is contained in:
Varun Thacker 2018-07-23 12:21:59 -07:00
parent 028c86b1fa
commit 877bde7347
2 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
solr/core/src/java/org/apache/solr/handler/export/DoubeValue.java → solr/core/src/java/org/apache/solr/handler/export/DoubleValue.java
View File

100
solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
View File

@ -22,13 +22,16 @@ import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.SuppressForbidden;
import org.apache.solr.common.util.Utils;
import org.apache.solr.request.SolrQueryRequest;
@ -41,6 +44,7 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.noggit.ObjectBuilder;
public class TestExportWriter extends SolrTestCaseJ4 {
@ -594,7 +598,7 @@ public class TestExportWriter extends SolrTestCaseJ4 {
"field1_s_dv", String.valueOf(str_vals[number]),
"field2_i_p", String.valueOf(number),
"field3_l_p", String.valueOf(number)));
if (numDocs % 3000 ==0) {
if (numDocs % 300 ==0) {
assertU(commit());
}
}
@ -624,66 +628,56 @@ public class TestExportWriter extends SolrTestCaseJ4 {
String fieldsStr = String.join(",", fieldStrs); // fl : field1, field2
String resp = h.query(req("q", "*:*", "qt", "/export", "fl", "id," + fieldsStr, "sort", sortStr));
ObjectMapper mapper = new ObjectMapper();
HashMap respMap = mapper.readValue(resp, HashMap.class);
List docs = (ArrayList) ((HashMap) respMap.get("response")).get("docs");
//We cannot compare /select vs /export as for docs with the same values ( ties ) the ordering is different
SolrQueryRequest req = null;
try {
req = req("q", "*:*", "qt", "/select", "fl", "id," + fieldsStr, "sort", sortStr, "rows", Integer.toString(numDocs));
SolrQueryRequest selectReq = req("q", "*:*", "qt", "/select", "fl", "id," + fieldsStr, "sort", sortStr, "rows", Integer.toString(numDocs), "wt", "json");
String response = h.query(selectReq);
Map rsp = (Map)ObjectBuilder.fromJSON(response);
List doclist = (List)(((Map)rsp.get("response")).get("docs"));
SolrQueryResponse selectRsp = h.queryAndResponse("", req);
DocList selectDocList = ((ResultContext)selectRsp.getResponse()).getDocList();
assert selectDocList.size() == numDocs;
DocIterator selectDocListIter = selectDocList.iterator();
assert docs.size() == numDocs;
ObjectMapper mapper = new ObjectMapper();
HashMap respMap = mapper.readValue(resp, HashMap.class);
List docs = (ArrayList) ((HashMap) respMap.get("response")).get("docs");
assert docs.size() == numDocs;
for (int i = 0; i < docs.size() - 1; i++) { // docs..
assertEquals("Position:" + i + " has different id value" , ((LinkedHashMap)doclist.get(i)).get("id"), String.valueOf(((HashMap) docs.get(i)).get("id")));
for (int i = 0; i < docs.size() - 1; i++) { // docs..
assertEquals("Position:" + i + " has different id value" , String.valueOf(selectDocListIter.nextDoc()), String.valueOf(((HashMap) docs.get(i)).get("id")));
for (int j = 0; j < fieldSorts.length; j++) { // fields ..
String field = fieldSorts[j].getField();
String sort = fieldSorts[j].getSort();
String fieldVal1 = String.valueOf(((HashMap) docs.get(i)).get(field)); // 1st doc
String fieldVal2 = String.valueOf(((HashMap) docs.get(i + 1)).get(field)); // 2nd obj
if (fieldVal1.equals(fieldVal2)) {
continue;
} else {
if (sort.equals("asc")) {
if (field.equals("stringdv") || field.equals("field1_s_dv")|| field.equals("datedv") || field.equals("booleandv")) { // use string comparator
assertTrue(fieldVal1.compareTo(fieldVal2) < 0);
} else if (field.equals("doubledv")){
assertTrue(Double.compare(Double.valueOf(fieldVal1), Double.valueOf(fieldVal2)) <= 0);
} else if(field.equals("floatdv")) {
assertTrue(Float.compare(Float.valueOf(fieldVal1), Float.valueOf(fieldVal2)) <= 0);
} else if(field.equals("intdv") || "field2_i_p".equals(field)) {
assertTrue(Integer.compare(Integer.valueOf(fieldVal1), Integer.valueOf(fieldVal2)) <= 0);
} else if(field.equals("longdv") || field.equals("field3_l_p")) {
assertTrue(Long.compare(Integer.valueOf(fieldVal1), Long.valueOf(fieldVal2)) <= 0);
}
} else {
if (field.equals("stringdv") || field.equals("field1_s_dv")|| field.equals("datedv") || field.equals("booleandv")) { // use string comparator
assertTrue(fieldVal1.compareTo(fieldVal2) > 0);
} else if (field.equals("doubledv")){
assertTrue(Double.compare(Double.valueOf(fieldVal1), Double.valueOf(fieldVal2)) >= 0);
} else if(field.equals("floatdv")) {
assertTrue(Float.compare(Float.valueOf(fieldVal1), Float.valueOf(fieldVal2)) >= 0);
} else if(field.equals("intdv") || "field2_i_p".equals(field)) {
assertTrue(Integer.compare(Integer.valueOf(fieldVal1), Integer.valueOf(fieldVal2)) >= 0);
} else if(field.equals("longdv") || field.equals("field3_l_p")) {
assertTrue(Long.compare(Integer.valueOf(fieldVal1), Long.valueOf(fieldVal2)) >= 0);
}
for (int j = 0; j < fieldSorts.length; j++) { // fields ..
String field = fieldSorts[j].getField();
String sort = fieldSorts[j].getSort();
String fieldVal1 = String.valueOf(((HashMap) docs.get(i)).get(field)); // 1st doc
String fieldVal2 = String.valueOf(((HashMap) docs.get(i + 1)).get(field)); // 2nd obj
if (fieldVal1.equals(fieldVal2)) {
continue;
} else {
if (sort.equals("asc")) {
if (field.equals("stringdv") || field.equals("field1_s_dv")|| field.equals("datedv") || field.equals("booleandv")) { // use string comparator
assertTrue(fieldVal1.compareTo(fieldVal2) < 0);
} else if (field.equals("doubledv")){
assertTrue(Double.compare(Double.valueOf(fieldVal1), Double.valueOf(fieldVal2)) <= 0);
} else if(field.equals("floatdv")) {
assertTrue(Float.compare(Float.valueOf(fieldVal1), Float.valueOf(fieldVal2)) <= 0);
} else if(field.equals("intdv") || "field2_i_p".equals(field)) {
assertTrue(Integer.compare(Integer.valueOf(fieldVal1), Integer.valueOf(fieldVal2)) <= 0);
} else if(field.equals("longdv") || field.equals("field3_l_p")) {
assertTrue(Long.compare(Integer.valueOf(fieldVal1), Long.valueOf(fieldVal2)) <= 0);
}
} else {
if (field.equals("stringdv") || field.equals("field1_s_dv")|| field.equals("datedv") || field.equals("booleandv")) { // use string comparator
assertTrue(fieldVal1.compareTo(fieldVal2) > 0);
} else if (field.equals("doubledv")){
assertTrue(Double.compare(Double.valueOf(fieldVal1), Double.valueOf(fieldVal2)) >= 0);
} else if(field.equals("floatdv")) {
assertTrue(Float.compare(Float.valueOf(fieldVal1), Float.valueOf(fieldVal2)) >= 0);
} else if(field.equals("intdv") || "field2_i_p".equals(field)) {
assertTrue(Integer.compare(Integer.valueOf(fieldVal1), Integer.valueOf(fieldVal2)) >= 0);
} else if(field.equals("longdv") || field.equals("field3_l_p")) {
assertTrue(Long.compare(Integer.valueOf(fieldVal1), Long.valueOf(fieldVal2)) >= 0);
}
break;
}
break;
}
}
} finally {
if (req != null) {
req.close();
}
}
}