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 2017/06/13 02:16:03 UTC
[3/8] lucene-solr:jira/SOLR-10834: some scripted conversion of
xpaths: int|float -> str when dealing with @name=id
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index cf43a68..43d07c5 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -166,31 +166,31 @@ public class DocValuesTest extends SolrTestCaseJ4 {
assertU(adoc("id", "4"));
assertU(commit());
assertQ(req("q", "*:*", "sort", "floatdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='2']");
+ "//str[@name='id'][.='2']");
assertQ(req("q", "*:*", "sort", "intdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='2']");
+ "//str[@name='id'][.='2']");
assertQ(req("q", "*:*", "sort", "doubledv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
assertQ(req("q", "*:*", "sort", "longdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
assertQ(req("q", "*:*", "sort", "datedv desc", "rows", "1", "fl", "id,datedv"),
- "//int[@name='id'][.='2']",
+ "//str[@name='id'][.='2']",
"//result/doc[1]/date[@name='datedv'][.='1997-12-31T23:59:59.999Z']"
);
assertQ(req("q", "*:*", "sort", "stringdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='4']");
+ "//str[@name='id'][.='4']");
assertQ(req("q", "*:*", "sort", "floatdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='4']");
+ "//str[@name='id'][.='4']");
assertQ(req("q", "*:*", "sort", "intdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='3']");
+ "//str[@name='id'][.='3']");
assertQ(req("q", "*:*", "sort", "doubledv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='3']");
+ "//str[@name='id'][.='3']");
assertQ(req("q", "*:*", "sort", "longdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='3']");
+ "//str[@name='id'][.='3']");
assertQ(req("q", "*:*", "sort", "datedv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
assertQ(req("q", "*:*", "sort", "stringdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='2']");
+ "//str[@name='id'][.='2']");
assertQ(req("q", "*:*", "sort", "booldv asc", "rows", "10", "fl", "booldv,stringdv"),
"//result/doc[1]/bool[@name='booldv'][.='false']",
"//result/doc[2]/bool[@name='booldv'][.='true']",
@@ -212,13 +212,13 @@ public class DocValuesTest extends SolrTestCaseJ4 {
assertU(adoc("id", "7", "doubledv", "1.7976931348623157E308"));
assertU(commit());
assertQ(req("fl", "id", "q", "*:*", "sort", "doubledv asc"),
- "//result/doc[1]/int[@name='id'][.='6']",
- "//result/doc[2]/int[@name='id'][.='5']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']",
- "//result/doc[5]/int[@name='id'][.='1']",
- "//result/doc[6]/int[@name='id'][.='2']",
- "//result/doc[7]/int[@name='id'][.='7']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='1']",
+ "//result/doc[6]/str[@name='id'][.='2']",
+ "//result/doc[7]/str[@name='id'][.='7']"
);
}
@@ -368,154 +368,154 @@ public class DocValuesTest extends SolrTestCaseJ4 {
// string: termquery
assertQ(req("q", "stringdv:car", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// string: range query
assertQ(req("q", "stringdv:[b TO d]", "sort", "id asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// string: prefix query
assertQ(req("q", "stringdv:c*", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// string: wildcard query
assertQ(req("q", "stringdv:c?r", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// string: regexp query
assertQ(req("q", "stringdv:/c[a-b]r/", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// float: termquery
assertQ(req("q", "floatdv:3", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// float: rangequery
assertQ(req("q", "floatdv:[2 TO 3]", "sort", "id asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// (neg) float: termquery
assertQ(req("q", "floatdv:\"-5\"", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (neg) float: rangequery
assertQ(req("q", "floatdv:[-6 TO -4]", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (cross zero bounds) float: rangequery
assertQ(req("q", "floatdv:[-6 TO 2.1]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]"
);
// int: termquery
assertQ(req("q", "intdv:1", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=3]"
);
// int: rangequery
assertQ(req("q", "intdv:[3 TO 4]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]"
);
// (neg) int: termquery
assertQ(req("q", "intdv:\"-1\"", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// (neg) int: rangequery
assertQ(req("q", "intdv:[-1 TO 1]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// long: termquery
assertQ(req("q", "longdv:1", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// long: rangequery
assertQ(req("q", "longdv:[1 TO 2]", "sort", "id asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// double: termquery
assertQ(req("q", "doubledv:3.1", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=1]"
);
// double: rangequery
assertQ(req("q", "doubledv:[2 TO 3.3]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]"
);
// (neg) double: termquery
assertQ(req("q", "doubledv:\"-4.3\"", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (neg) double: rangequery
assertQ(req("q", "doubledv:[-6 TO -4]", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (cross zero bounds) double: rangequery
assertQ(req("q", "doubledv:[-6 TO 2.0]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// boolean basic queries:
assertQ(req("q", "booldv:false", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]"
);
assertQ(req("q", "booldv:true", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -617,7 +617,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
if((minInclusive && minSortable<=valSortable || !minInclusive && minSortable<valSortable) &&
(maxInclusive && maxSortable>=valSortable || !maxInclusive && maxSortable>valSortable)) {
counter++;
- tests.add("//result/doc["+counter+"]/int[@name='id'][.="+(k+1)+"]");
+ tests.add("//result/doc["+counter+"]/str[@name='id'][.="+(k+1)+"]");
tests.add("//result/doc["+counter+"]/float[@name='score'][.=1.0]");
}
}
@@ -656,86 +656,86 @@ public class DocValuesTest extends SolrTestCaseJ4 {
// Negative Zero to Positive
assertQ(req("q", fieldName[i]+":[-0.0 TO 2.5]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=1]"
);
// Negative to Positive Zero
assertQ(req("q", fieldName[i]+":[-6 TO 0]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=5]"
);
// Negative to Positive
assertQ(req("q", fieldName[i]+":[-6 TO 2.5]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
// Positive to Positive
assertQ(req("q", fieldName[i]+":[2 TO 3]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// Positive to POSITIVE_INF
assertQ(req("q", fieldName[i]+":[2 TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]",
- "//result/doc[4]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]",
+ "//result/doc[4]/str[@name='id'][.=7]"
);
// NEGATIVE_INF to Negative
assertQ(req("q", fieldName[i]+":[* TO -1]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=6]"
);
// NEGATIVE_INF to Positive
assertQ(req("q", fieldName[i]+":[* TO 2]", "sort", "id asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=5]",
- "//result/doc[4]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=5]",
+ "//result/doc[4]/str[@name='id'][.=6]"
);
// NEGATIVE_INF to Positive (non-inclusive)
assertQ(req("q", fieldName[i]+":[* TO 2}", "sort", "id asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=5]",
- "//result/doc[3]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=5]",
+ "//result/doc[3]/str[@name='id'][.=6]"
);
// Negative to POSITIVE_INF
assertQ(req("q", fieldName[i]+":[-6 TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='6']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]",
- "//result/doc[4]/int[@name='id'][.=4]",
- "//result/doc[5]/int[@name='id'][.=5]",
- "//result/doc[6]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]",
+ "//result/doc[4]/str[@name='id'][.=4]",
+ "//result/doc[5]/str[@name='id'][.=5]",
+ "//result/doc[6]/str[@name='id'][.=7]"
);
// NEGATIVE_INF to POSITIVE_INF
assertQ(req("q", fieldName[i]+":[* TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='7']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]",
- "//result/doc[4]/int[@name='id'][.=4]",
- "//result/doc[5]/int[@name='id'][.=5]",
- "//result/doc[6]/int[@name='id'][.=6]",
- "//result/doc[7]/int[@name='id'][.=7]",
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]",
+ "//result/doc[4]/str[@name='id'][.=4]",
+ "//result/doc[5]/str[@name='id'][.=5]",
+ "//result/doc[6]/str[@name='id'][.=6]",
+ "//result/doc[7]/str[@name='id'][.=7]",
"//result/doc[1]/float[@name='score'][.=1.0]",
"//result/doc[2]/float[@name='score'][.=1.0]",
"//result/doc[3]/float[@name='score'][.=1.0]",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
index 1a429b2..3237b65 100644
--- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
@@ -57,14 +57,14 @@ public class IndexSchemaRuntimeFieldTest extends SolrTestCaseJ4 {
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
// Check to see if our copy field made it out safely
query.setQuery( "dynamic_runtime:aaa" );
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
clearIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
index 44716bb..7790859 100644
--- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
@@ -58,7 +58,7 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
args = new HashMap<>();
@@ -67,7 +67,7 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("dynamic source", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
args = new HashMap<>();
@@ -76,7 +76,7 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("dynamic destination", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
clearIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCollationField.java b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
index 6351b82..7a26d4d 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
@@ -98,8 +98,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -112,8 +112,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -124,8 +124,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -137,8 +137,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -161,9 +161,9 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -175,8 +175,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_zh_full:Testing", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=6]",
- "//result/doc[2]/int[@name='id'][.=8]"
+ "//result/doc[1]/str[@name='id'][.=6]",
+ "//result/doc[2]/str[@name='id'][.=8]"
);
}
@@ -188,8 +188,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java b/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
index 1de339a..676dd65 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
@@ -97,8 +97,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -111,8 +111,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -123,8 +123,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -136,8 +136,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -160,9 +160,9 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -174,8 +174,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_zh_full:Testing", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=6]",
- "//result/doc[2]/int[@name='id'][.=8]"
+ "//result/doc[1]/str[@name='id'][.=6]",
+ "//result/doc[2]/str[@name='id'][.=8]"
);
}
@@ -187,8 +187,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java b/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
index feb9236..eb8c196 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
@@ -123,9 +123,9 @@ public class TestHalfAndHalfDocValues extends SolrTestCaseJ4 {
// Assert sort order is correct
assertQ(req("q", "string_add_dv_later:*", "sort", "string_add_dv_later asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java b/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
index 19081b9..0fcc9fe 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
@@ -34,8 +34,8 @@ public class TestOmitPositions extends SolrTestCaseJ4 {
assertQ("term query: ",
req("fl", "id", "q", "nopositionstext:test"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
index 720f9b5..66034c9 100644
--- a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
+++ b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
@@ -142,7 +142,7 @@ public class SpatialFilterTest extends SolrTestCaseJ4 {
if (docIds != null && docIds.length > 0) {
int i = 1;
for (int docId : docIds) {
- tests[i++] = "//result/doc/int[@name='id'][.='" + docId + "']";
+ tests[i++] = "//result/doc/str[@name='id'][.='" + docId + "']";
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index ef0404c..562c865 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -73,8 +73,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_i asc, test_l desc, id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='7.0']"
- ,"//result/doc[2]/float[@name='id'][.='3.0']"
+ ,"//result/doc[1]/str[@name='id'][.='7.0']"
+ ,"//result/doc[2]/str[@name='id'][.='3.0']"
);
// group heads are selected using a complex sort, simpler sort used for final groups
@@ -84,8 +84,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='3.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='3.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
);
// diff up the sort directions, only first clause matters with our data
@@ -95,8 +95,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='8.0']"
- ,"//result/doc[2]/float[@name='id'][.='4.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8.0']"
+ ,"//result/doc[2]/str[@name='id'][.='4.0']"
);
// tie broken by index order
@@ -106,8 +106,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='6.0']"
- ,"//result/doc[2]/float[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='6.0']"
+ ,"//result/doc[2]/str[@name='id'][.='2.0']"
);
// score, then tiebreakers; note top level sort by score ASCENDING (just for weirdness)
@@ -117,8 +117,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='2.0']"
- ,"//result/doc[2]/float[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='2.0']"
+ ,"//result/doc[2]/str[@name='id'][.='5.0']"
);
// score, then tiebreakers; note no score in top level sort/fl to check needsScores logic
@@ -128,8 +128,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='5.0']"
- ,"//result/doc[2]/float[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5.0']"
+ ,"//result/doc[2]/str[@name='id'][.='2.0']"
);
// term_s desc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -139,8 +139,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='1.0']"
- ,"//result/doc[2]/float[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1.0']"
+ ,"//result/doc[2]/str[@name='id'][.='5.0']"
);
// term_s asc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -150,8 +150,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='1.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
);
// collapse on int field
@@ -161,8 +161,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='4.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='4.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
);
// collapse on term_s (very sparse) with nullPolicy=collapse
@@ -172,9 +172,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc, id asc");
assertQ(req(params)
, "*[count(//doc)=3]"
- ,"//result/doc[1]/float[@name='id'][.='5.0']"
- ,"//result/doc[2]/float[@name='id'][.='2.0']"
- ,"//result/doc[3]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5.0']"
+ ,"//result/doc[2]/str[@name='id'][.='2.0']"
+ ,"//result/doc[3]/str[@name='id'][.='7.0']"
);
// sort local param + elevation
@@ -187,8 +187,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']");
//
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -199,8 +199,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "7.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='7.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='7.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
}
@@ -250,13 +250,13 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i min=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='6.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i max=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/float[@name='id'][.='2.0']");
+ "//result/doc[1]/str[@name='id'][.='2.0']");
}
@@ -378,8 +378,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']"
);
@@ -391,10 +391,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(test_i)");
params.add("sort","");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']"
);
// Test value source collapse criteria
@@ -403,9 +403,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=collapse min=field(test_i)"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']"
);
// Test value source collapse criteria with cscore function
@@ -415,9 +415,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']"
);
// Test value source collapse criteria with cscore function but no top level score sort
@@ -429,9 +429,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fl", "id");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='1.0']"
);
// Test value source collapse criteria with compound cscore function
@@ -441,9 +441,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']"
);
//Test collapse by score with elevation
@@ -456,10 +456,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']");
//Test SOLR-5773 with score collapse criteria
// try both default & sort localparams as alternate ways to ask for max score
@@ -473,9 +473,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']");
}
//Test SOLR-5773 with max field collapse criteria
@@ -490,9 +490,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']");
}
//Test SOLR-5773 with min field collapse criteria
@@ -507,9 +507,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']");
}
//Test SOLR-5773 elevating documents with null group
@@ -522,10 +522,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "3,4");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']");
// Non trivial sort local param for picking group head
@@ -535,9 +535,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='1.0']"
);
//
params = new ModifiableSolrParams();
@@ -546,9 +546,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='3.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='3.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']"
);
@@ -562,8 +562,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -571,8 +571,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -580,8 +580,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc,id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -591,8 +591,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(id)");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
}
@@ -602,8 +602,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_i"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']"
);
try {
@@ -613,8 +613,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']");
//Test collapse by max long field
@@ -623,8 +623,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']");
} catch (Exception e) {
if(!numeric) {
throw e;
@@ -638,8 +638,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_f"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']");
//Test collapse by min float field
params = new ModifiableSolrParams();
@@ -647,8 +647,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
//Test collapse by min float field sort by score
params = new ModifiableSolrParams();
@@ -662,8 +662,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("facet.field", "{!ex=test}term_s");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
// Test collapse using selector field in no docs
// tie selector in all of these cases
@@ -718,9 +718,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
assertQ(req(collapse, "q", "*:*", "sort", "test_i desc"),
"*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']");
}
@@ -730,10 +730,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=expand"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']",
- "//result/doc[4]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']",
+ "//result/doc[4]/str[@name='id'][.='1.0']");
//Test nullPolicy collapse
params = new ModifiableSolrParams();
@@ -741,9 +741,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=collapse"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='1.0']");
params = new ModifiableSolrParams();
@@ -778,9 +778,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='7.0']");
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='7.0']");
}
@@ -861,14 +861,14 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=expand "+selector+"}");
assertQ(req(params)
, "*[count(//doc)=8]"
- ,"//result/doc[1]/float[@name='id'][.='8.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
- ,"//result/doc[3]/float[@name='id'][.='6.0']"
- ,"//result/doc[4]/float[@name='id'][.='5.0']"
- ,"//result/doc[5]/float[@name='id'][.='4.0']"
- ,"//result/doc[6]/float[@name='id'][.='3.0']"
- ,"//result/doc[7]/float[@name='id'][.='2.0']"
- ,"//result/doc[8]/float[@name='id'][.='1.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[3]/str[@name='id'][.='6.0']"
+ ,"//result/doc[4]/str[@name='id'][.='5.0']"
+ ,"//result/doc[5]/str[@name='id'][.='4.0']"
+ ,"//result/doc[6]/str[@name='id'][.='3.0']"
+ ,"//result/doc[7]/str[@name='id'][.='2.0']"
+ ,"//result/doc[8]/str[@name='id'][.='1.0']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
index fb982b8..5ceb224 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
@@ -346,4 +346,4 @@ public class TestFoldingMultitermQuery extends SolrTestCaseJ4 {
public void testCJKWidth() {
assertQ(req("q", "content_width:ヴィ*"), "//result[@numFound='1']");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
index 05ec982..ee107dd 100644
--- a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
@@ -74,11 +74,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s maxDocFreq=10}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='7.0']"
);
//Test without maxDocFreq param. Should default to Integer.MAX_VALUE and match all terms.
@@ -86,11 +86,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='7.0']"
);
params = new ModifiableSolrParams();
@@ -104,11 +104,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=10}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='7.0']"
);
//Test with int field
@@ -116,8 +116,8 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=2}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='7.0']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
index 46b7b60..a4fa1b8 100644
--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
@@ -91,7 +91,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set1.add(s);
}
@@ -109,7 +109,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set2.add(s);
}
@@ -128,7 +128,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set3.add(s);
}
@@ -158,7 +158,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set1.add(s);
}
@@ -176,7 +176,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set2.add(s);
}
@@ -203,7 +203,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set1.add(s);
}
@@ -221,7 +221,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set2.add(s);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index 93cc294..f79d498 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -93,12 +93,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='1.0']",
- "//result/doc[6]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='1.0']",
+ "//result/doc[6]/str[@name='id'][.='5.0']"
);
params = new ModifiableSolrParams();
@@ -113,12 +113,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
//Test with sort by score.
@@ -134,12 +134,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score desc");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -157,12 +157,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -179,12 +179,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='6.0']",
- "//result/doc[4]/float[@name='id'][.='5.0']",
- "//result/doc[5]/float[@name='id'][.='4.0']",
- "//result/doc[6]/float[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='6.0']",
+ "//result/doc[4]/str[@name='id'][.='5.0']",
+ "//result/doc[5]/str[@name='id'][.='4.0']",
+ "//result/doc[6]/str[@name='id'][.='3.0']"
);
@@ -201,12 +201,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -223,12 +223,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='5.0']",
- "//result/doc[6]/float[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='5.0']",
+ "//result/doc[6]/str[@name='id'][.='3.0']"
);
@@ -245,12 +245,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='5.0']",
- "//result/doc[6]/float[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='5.0']",
+ "//result/doc[6]/str[@name='id'][.='3.0']"
);
@@ -268,12 +268,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='6.0']",
- "//result/doc[4]/float[@name='id'][.='5.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='2.0']" //Not in reRankeDocs
+ "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='6.0']",
+ "//result/doc[4]/str[@name='id'][.='5.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='2.0']" //Not in reRankeDocs
);
//Test Elevation with start beyond the rerank docs
@@ -289,8 +289,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']" //Was not in reRankDocs
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']" //Was not in reRankDocs
);
//Test Elevation with zero results
@@ -320,12 +320,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
params = new ModifiableSolrParams();
@@ -338,12 +338,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
params = new ModifiableSolrParams();
@@ -356,12 +356,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
//Test reRankWeight of 0, reranking will have no effect.
@@ -375,11 +375,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']"
);
MetricsMap metrics = (MetricsMap)h.getCore().getCoreMetricManager().getRegistry().getMetrics().get("CACHE.searcher.queryResultCache");
@@ -399,11 +399,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='2.0']",
- "//result/doc[5]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='2.0']",
+ "//result/doc[5]/str[@name='id'][.='1.0']"
);
@@ -424,11 +424,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='2.0']",
- "//result/doc[5]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='2.0']",
+ "//result/doc[5]/str[@name='id'][.='1.0']"
);
stats = metrics.getValue();
@@ -450,12 +450,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='2.0']", // reranked out of orig order
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='2.0']", // reranked out of orig order
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -469,8 +469,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']"
);
@@ -485,7 +485,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "1");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']"
);
@@ -556,8 +556,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='8.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='8.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']"
);
//Test Elevation
@@ -573,9 +573,9 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='8.0']"); //Boosted during rerank.
+ "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='8.0']"); //Boosted during rerank.
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestReload.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReload.java b/solr/core/src/test/org/apache/solr/search/TestReload.java
index f721d41..872abec 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReload.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReload.java
@@ -98,4 +98,4 @@ public class TestReload extends TestRTGBase {
// test framework should ensure that all searchers opened have been closed.
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
index a4b506b..4c63309 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
@@ -246,4 +246,4 @@ public class TestSearchPerf extends AbstractSolrTestCase {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index 1a2e572..ee0da09 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@ -1038,4 +1038,4 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
, "/response/numFound==1"
);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java b/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
index b8dbf2a..d1be4fe 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
@@ -142,4 +142,4 @@ public class DebugAgg extends AggValueSource {
return new FacetLongMerger();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
index 58a1b53..ada1208 100644
--- a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
+++ b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
@@ -49,51 +49,51 @@ public class SortByFunctionTest extends AbstractSolrTestCase {
assertQ(req("fl", "*,score", "q", "*:*"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("fl", "*,score", "q", "*:*", "sort", "score desc"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("fl", "id,score", "q", "f_t:ipod", "sort", "score desc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("fl", "*,score", "q", "*:*", "sort", "sum(x_td1, y_td1) desc"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
- "//result/doc[1]/int[@name='id'][.='4']",
- "//result/doc[2]/int[@name='id'][.='3']",
- "//result/doc[3]/int[@name='id'][.='2']",
- "//result/doc[4]/int[@name='id'][.='1']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='3']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='1']"
);
assertQ(req("fl", "*,score", "q", "*:*", "sort", "sum(x_td1, y_td1) asc"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
//the function is equal, w_td1 separates
assertQ(req("q", "*:*", "fl", "id", "sort", "sum(z_td1, y_td1) asc, w_td1 asc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='2']",
- "//result/doc[2]/int[@name='id'][.='1']",
- "//result/doc[3]/int[@name='id'][.='4']",
- "//result/doc[4]/int[@name='id'][.='3']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']"
);
}
@@ -108,24 +108,24 @@ public class SortByFunctionTest extends AbstractSolrTestCase {
assertQ(req("q", "links_mfacet:B", "fl", "id", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.='3']",
- "//result/doc[2]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']"
);
assertQ(req("q", "*:*", "fl", "id", "sort", "joindf(id_s1, links_mfacet) desc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("q", "*:*", "fl", "id", "sort", "joindf(id_s1, links_mfacet) asc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='4']",
- "//result/doc[2]/int[@name='id'][.='3']",
- "//result/doc[3]/int[@name='id'][.='2']",
- "//result/doc[4]/int[@name='id'][.='1']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='3']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='1']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
index f725994..4a8f75d 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
@@ -372,8 +372,8 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
"sort", func + " " + dir)
,"//*[@numFound='2']"
// no assumptions about order for now, see bug: SOLR-8005
- ,"//float[@name='id']='1.0'"
- ,"//float[@name='id']='2.0'"
+ ,"//str[@name='id']='1.0'"
+ ,"//str[@name='id']='2.0'"
);
}
}
@@ -430,7 +430,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc[1]/float[@name='id']='0.0'"
+ ,"//result/doc[1]/str[@name='id']='0.0'"
);
}
/** helper for testSimpleSort */
@@ -438,7 +438,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc["+numDocs+"]/float[@name='id']='0.0'"
+ ,"//result/doc["+numDocs+"]/str[@name='id']='0.0'"
);
}