You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/07/18 10:26:11 UTC
lucene-solr:apiv2: SOLR-8029: Addressing test failures
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 b333e6bd0 -> 552ad6e90
SOLR-8029: Addressing test failures
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/552ad6e9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/552ad6e9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/552ad6e9
Branch: refs/heads/apiv2
Commit: 552ad6e906f8ef63b378909d9689a20955d3e1fd
Parents: b333e6b
Author: Noble Paul <no...@apache.org>
Authored: Mon Jul 18 15:56:01 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Jul 18 15:56:01 2016 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../src/test/org/apache/solr/core/TestSolrConfigHandler.java | 8 +++++---
.../org/apache/solr/security/BasicAuthIntegrationTest.java | 4 ++--
.../src/java/org/apache/solr/common/cloud/ZkStateReader.java | 5 +++++
4 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/552ad6e9/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index d83b238..19b95c2 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -1037,7 +1037,7 @@ public class HttpSolrCall {
@Override
public Object getHandler() {
- return handler;
+ return _getHandler();
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/552ad6e9/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 8ced184..5cec10f 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -436,10 +436,12 @@ public class TestSolrConfigHandler extends RestTestBase {
payload = "{\n" +
" 'add-requesthandler': {\n" +
- " name : '/dump100',\n" +
+ " name : '/dump100', " +
" class : 'org.apache.solr.handler.DumpRequestHandler'," +
" suggester: [{name: s1,lookupImpl: FuzzyLookupFactory, dictionaryImpl : DocumentDictionaryFactory}," +
- " {name: s2,lookupImpl: FuzzyLookupFactory , dictionaryImpl : DocumentExpressionDictionaryFactory}]" +
+ " {name: s2,lookupImpl: FuzzyLookupFactory , dictionaryImpl : DocumentExpressionDictionaryFactory}], " +
+ " registerPath :'/,/v2'\n" +
+
" }\n" +
"}";
runConfigCommand(writeHarness, "/config?wt=json", payload);
@@ -453,7 +455,7 @@ public class TestSolrConfigHandler extends RestTestBase {
map = getRespMap("/dump100?wt=json&json.nl=arrmap&initArgs=true", writeHarness);
List initArgs = (List) map.get("initArgs");
- assertEquals(2, initArgs.size());
+ assertTrue(initArgs.size() >= 2);
assertTrue(((Map)initArgs.get(0)).containsKey("suggester"));
assertTrue(((Map)initArgs.get(1)).containsKey("suggester"));
System.out.println(map);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/552ad6e9/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
index f23daa6..cad1fad 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -115,8 +115,8 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase {
GenericSolrRequest genericReq = new GenericSolrRequest(SolrRequest.METHOD.POST, authcPrefix, new ModifiableSolrParams());
genericReq.setContentStreams(Collections.singletonList(new ContentStreamBase.ByteArrayStream(command.getBytes(UTF_8), "")));
try {
- cloudSolrClient.request(genericReq);
- fail("Should have failed with a 401");
+ rsp = cloudSolrClient.request(genericReq);
+ fail("Should have failed with a 401, got :" + rsp);
} catch (HttpSolrClient.RemoteSolrException e) {
}
command = "{\n" +
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/552ad6e9/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index aff5bba..8adeb65 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1294,6 +1294,11 @@ public class ZkStateReader implements Closeable {
this.version = version;
}
+
+ @Override
+ public String toString() {
+ return Utils.toJSONString(data);
+ }
}
private void notifyStateWatchers(Set<String> liveNodes, String collection, DocCollection collectionState) {