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

SOLR-2672, SOLR-2673: Fix a bunch of tests to no longer depend on order 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150362 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2011-07-24 13:44:04 +00:00
parent e5ac5ed28a
commit 9558bfe674
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solr/core/src/test/org/apache/solr/EchoParamsTest.java
View File

@ -33,23 +33,30 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
private static final String HEADER_XPATH = "/response/lst[@name='responseHeader']";
@Test
public void testDefaultEchoParams() {
public void test() {
defaultEchoParams();
defaultEchoParamsDefaultVersion();
explicitEchoParams();
allEchoParams();
}
// the following test methods rely on their order, which is no longer guaranteed by Java 7, so call them directly above:
private void defaultEchoParams() {
lrf.args.put("wt", "xml");
lrf.args.put(CommonParams.VERSION, "2.2");
assertQ(req("foo"),HEADER_XPATH + "/int[@name='status']");
assertQ(req("foo"),"not(//lst[@name='params'])");
}
@Test
public void testDefaultEchoParamsDefaultVersion() {
private void defaultEchoParamsDefaultVersion() {
lrf.args.put("wt", "xml");
lrf.args.remove(CommonParams.VERSION);
assertQ(req("foo"),HEADER_XPATH + "/int[@name='status']");
assertQ(req("foo"),"not(//lst[@name='params'])");
}
@Test
public void testExplicitEchoParams() {
private void explicitEchoParams() {
lrf.args.put("wt", "xml");
lrf.args.put(CommonParams.VERSION, "2.2");
lrf.args.put("echoParams", "explicit");
@ -58,8 +65,7 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
assertQ(req("foo"),HEADER_XPATH + "/lst[@name='params']/str[@name='wt'][.='xml']");
}
@Test
public void testAllEchoParams() {
private void allEchoParams() {
lrf = h.getRequestFactory
("crazy_custom_qt", 0, 20,
CommonParams.VERSION,"2.2",

1
solr/core/src/test/org/apache/solr/search/TestFiltering.java
View File

@ -36,6 +36,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
public void testCaching() throws Exception {
clearIndex();
assertU(adoc("id","4", "val_i","1"));
assertU(adoc("id","1", "val_i","2"));
assertU(adoc("id","3", "val_i","3"));