From 0047a77f83f7cc194cb9c0be8d48615bb16090f1 Mon Sep 17 00:00:00 2001 From: Steven Rowe Date: Mon, 19 Sep 2011 05:13:52 +0000 Subject: [PATCH] SOLR-2771: Solr modules' tests should not depend on solr-core test classes; move BufferingRequestProcessor from solr-core tests to test-framework so that the Solr Cell module can use it. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1172428 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 4 ++++ solr/common-build.xml | 1 - .../solr/handler/extraction/ExtractingRequestHandlerTest.java | 2 +- .../test/org/apache/solr/handler/CSVRequestHandlerTest.java | 1 + .../core/src/test/org/apache/solr/handler/JsonLoaderTest.java | 1 + .../org/apache/solr/handler/XmlUpdateRequestHandlerTest.java | 1 + .../solr/update/processor}/BufferingRequestProcessor.java | 3 +-- 7 files changed, 9 insertions(+), 4 deletions(-) rename solr/{core/src/test/org/apache/solr/handler => test-framework/src/java/org/apache/solr/update/processor}/BufferingRequestProcessor.java (95%) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 7d448d6b818..528a18df18f 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -370,6 +370,10 @@ Bug Fixes * SOLR-2766: Package individual javadoc sites for solrj and test-framework. (Steve Rowe, Mike McCandless) +* SOLR-2771: Solr modules' tests should not depend on solr-core test classes; + move BufferingRequestProcessor from solr-core tests to test-framework so that + the Solr Cell module can use it. (janhoy, Steve Rowe) + ================== 3.4.0 ================== Upgrading from Solr 3.3 diff --git a/solr/common-build.xml b/solr/common-build.xml index 59d00751a32..5c42cf24320 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -98,7 +98,6 @@ - diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java index b2dd1bb501c..799b51c148d 100644 --- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java +++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java @@ -28,10 +28,10 @@ import org.apache.solr.handler.extraction.ExtractingDocumentLoader; import org.apache.solr.handler.extraction.ExtractingParams; import org.apache.solr.handler.extraction.ExtractingRequestHandler; import org.apache.solr.request.LocalSolrQueryRequest; -import org.apache.solr.handler.BufferingRequestProcessor; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; +import org.apache.solr.update.processor.BufferingRequestProcessor; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java index 9ac4fc2ce82..f208724d073 100644 --- a/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java @@ -22,6 +22,7 @@ import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; +import org.apache.solr.update.processor.BufferingRequestProcessor; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java index 67bec011a50..0544e16f077 100644 --- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java @@ -26,6 +26,7 @@ import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; import org.apache.solr.update.CommitUpdateCommand; import org.apache.solr.update.DeleteUpdateCommand; +import org.apache.solr.update.processor.BufferingRequestProcessor; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java index 84bb36fed58..51fd7d02ea5 100644 --- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java @@ -28,6 +28,7 @@ import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; +import org.apache.solr.update.processor.BufferingRequestProcessor; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java b/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java similarity index 95% rename from solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java rename to solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java index e8d708301ed..3acad80afed 100644 --- a/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java +++ b/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.handler; +package org.apache.solr.update.processor; import java.io.IOException; import java.util.ArrayList; @@ -25,7 +25,6 @@ import org.apache.solr.update.AddUpdateCommand; import org.apache.solr.update.CommitUpdateCommand; import org.apache.solr.update.DeleteUpdateCommand; import org.apache.solr.update.RollbackUpdateCommand; -import org.apache.solr.update.processor.UpdateRequestProcessor; public class BufferingRequestProcessor extends UpdateRequestProcessor {