lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1172429 - in /lucene/dev/branches/branch_3x/solr: ./ contrib/extraction/src/test/org/apache/solr/handler/extraction/ core/src/test/org/apache/solr/handler/ test-framework/src/java/org/apache/solr/update/ test-framework/src/java/org/apache/...
Date Mon, 19 Sep 2011 05:14:04 GMT
Author: sarowe
Date: Mon Sep 19 05:14:04 2011
New Revision: 1172429

URL: http://svn.apache.org/viewvc?rev=1172429&view=rev
Log:
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.

Added:
    lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/
    lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/processor/
    lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java
      - copied, changed from r1172419, lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java
Removed:
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java
Modified:
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/common-build.xml
    lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1172429&r1=1172428&r2=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Mon Sep 19 05:14:04 2011
@@ -81,6 +81,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

Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1172429&r1=1172428&r2=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Mon Sep 19 05:14:04 2011
@@ -92,7 +92,6 @@
 
   <path id="solr.test.base.classpath">
     <pathelement path="${common-solr.dir}/build/solr-test-framework/classes/java"/>
-    <pathelement path="${common-solr.dir}/build/solr-core/classes/test"/>
   	<pathelement path="${tests.userdir}"/>
   	<path refid="test.base.classpath"/>
   </path>

Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java?rev=1172429&r1=1172428&r2=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
Mon Sep 19 05:14:04 2011
@@ -28,10 +28,10 @@ import org.apache.solr.handler.extractio
 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;

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java?rev=1172429&r1=1172428&r2=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java
(original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java
Mon Sep 19 05:14:04 2011
@@ -22,6 +22,7 @@ import org.apache.solr.common.util.Conte
 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;
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java?rev=1172429&r1=1172428&r2=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
(original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
Mon Sep 19 05:14:04 2011
@@ -26,6 +26,7 @@ import org.apache.solr.response.SolrQuer
 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;
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?rev=1172429&r1=1172428&r2=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
(original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
Mon Sep 19 05:14:04 2011
@@ -19,6 +19,7 @@ package org.apache.solr.handler;
 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.apache.solr.util.AbstractSolrTestCase;
 import java.io.StringReader;
 import java.util.Collection;

Copied: lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java
(from r1172419, lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java?p2=lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java&p1=lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java&r1=1172419&r2=1172429&rev=1172429&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/BufferingRequestProcessor.java
(original)
+++ lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java
Mon Sep 19 05:14:04 2011
@@ -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.AddUpdateC
 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
 {



Mime
View raw message