You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/08/09 08:28:59 UTC
svn commit: r983533 [3/3] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/inde...
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java Mon Aug 9 06:28:54 2010
@@ -17,9 +17,9 @@
package org.apache.solr.analysis;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
-public class TestMappingCharFilterFactory extends TestCase {
+public class TestMappingCharFilterFactory extends LuceneTestCase {
public void testParseString() throws Exception {
MappingCharFilterFactory f = new MappingCharFilterFactory();
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java:950008
-/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465
,957520,957634,957707,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465
,957520,957634,957707,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java:748824
/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymMap.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymMap.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymMap.java Mon Aug 9 06:28:54 2010
@@ -22,11 +22,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.lucene.analysis.Token;
+import org.apache.lucene.util.LuceneTestCase;
-public class TestSynonymMap extends TestCase {
+public class TestSynonymMap extends LuceneTestCase {
public void testInvalidMappingRules() throws Exception {
SynonymMap synMap = new SynonymMap( true );
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java:950008
-/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,95
7707,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,95
7707,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java:748824
/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java:818601-821336
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,3 +1,3 @@
/lucene/dev/branches/preflexfixes/solr/src/test/org/apache/solr/client:967125-979432
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,960
719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,960
719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java Mon Aug 9 06:28:54 2010
@@ -19,7 +19,7 @@ package org.apache.solr.client.solrj;
import java.net.UnknownHostException;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
@@ -32,7 +32,7 @@ import org.apache.solr.common.SolrExcept
* @version $Id$
* @since solr 1.3
*/
-public class SolrExceptionTest extends TestCase {
+public class SolrExceptionTest extends LuceneTestCase {
public void testSolrException() throws Throwable {
// test a connection to a solr server that probably doesn't exist
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java Mon Aug 9 06:28:54 2010
@@ -17,17 +17,17 @@
package org.apache.solr.client.solrj;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.params.FacetParams;
import junit.framework.Assert;
-import junit.framework.TestCase;
/**
*
* @version $Id$
* @since solr 1.3
*/
-public class SolrQueryTest extends TestCase {
+public class SolrQueryTest extends LuceneTestCase {
public void testSolrQueryMethods() {
SolrQuery q = new SolrQuery("dog");
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Mon Aug 9 06:28:54 2010
@@ -17,10 +17,10 @@
package org.apache.solr.client.solrj;
-import junit.framework.TestCase;
import junit.framework.Assert;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
@@ -43,7 +43,7 @@ import java.util.Set;
* @version $Id$
* @since solr 1.4
*/
-public class TestLBHttpSolrServer extends TestCase {
+public class TestLBHttpSolrServer extends LuceneTestCase {
SolrInstance[] solr = new SolrInstance[3];
HttpClient httpClient = new HttpClient();
@@ -223,7 +223,7 @@ public class TestLBHttpSolrServer extend
jetty.start();
int newPort = jetty.getLocalPort();
if (port != 0 && newPort != port) {
- TestCase.fail("TESTING FAILURE: could not grab requested port.");
+ fail("TESTING FAILURE: could not grab requested port.");
}
this.port = newPort;
// System.out.println("waiting.........");
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java Mon Aug 9 06:28:54 2010
@@ -16,7 +16,7 @@
*/
package org.apache.solr.client.solrj.beans;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -36,7 +36,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class TestDocumentObjectBinder extends TestCase
+public class TestDocumentObjectBinder extends LuceneTestCase
{
public void testSimple() throws Exception {
DocumentObjectBinder binder = new DocumentObjectBinder();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Mon Aug 9 06:28:54 2010
@@ -21,7 +21,7 @@ import java.io.File;
import java.net.URL;
import java.util.Random;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.commons.io.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
@@ -35,7 +35,7 @@ import org.mortbay.jetty.webapp.WebAppCo
* @version $Id$
* @since solr 1.3
*/
-public class JettyWebappTest extends TestCase
+public class JettyWebappTest extends LuceneTestCase
{
int port = 0;
static final String context = "/test";
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java Mon Aug 9 06:28:54 2010
@@ -17,14 +17,14 @@
package org.apache.solr.client.solrj.util;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
/**
*
* @version $Id$
* @since solr 1.3
*/
-public class ClientUtilsTest extends TestCase {
+public class ClientUtilsTest extends LuceneTestCase {
public void testEscapeQuery()
{
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/SolrDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/SolrDocumentTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/SolrDocumentTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/SolrDocumentTest.java Mon Aug 9 06:28:54 2010
@@ -24,14 +24,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
-import junit.framework.TestCase;
-
/**
*/
-public class SolrDocumentTest extends TestCase
+public class SolrDocumentTest extends LuceneTestCase
{
public void testSimple()
{
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java Mon Aug 9 06:28:54 2010
@@ -10,7 +10,7 @@
*/
package org.apache.solr.common.params;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
/**
* Unit Test Case for {@link org.apache.solr.common.params.ModifiableSolrParams
@@ -18,7 +18,7 @@ import junit.framework.TestCase;
*
* @author kkumar
*/
-public class ModifiableSolrParamsTest extends TestCase
+public class ModifiableSolrParamsTest extends LuceneTestCase
{
@Override
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/SolrParamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/SolrParamTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/SolrParamTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/params/SolrParamTest.java Mon Aug 9 06:28:54 2010
@@ -17,11 +17,10 @@
package org.apache.solr.common.params;
-import junit.framework.TestCase;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.DefaultSolrParams;
import org.apache.solr.common.params.MapSolrParams;
@@ -29,7 +28,7 @@ import org.apache.solr.common.params.Sol
/**
*/
-public class SolrParamTest extends TestCase
+public class SolrParamTest extends LuceneTestCase
{
public void testGetParams() {
Map<String,String> pmap = new HashMap<String, String>();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/ContentStreamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/ContentStreamTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/ContentStreamTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/ContentStreamTest.java Mon Aug 9 06:28:54 2010
@@ -27,13 +27,12 @@ import java.io.StringReader;
import java.net.URL;
import org.apache.commons.io.IOUtils;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.ContentStreamBase;
-import junit.framework.TestCase;
-
/**
*/
-public class ContentStreamTest extends TestCase
+public class ContentStreamTest extends LuceneTestCase
{
public void testStringStream() throws IOException
{
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/DOMUtilTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/DOMUtilTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/DOMUtilTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/DOMUtilTest.java Mon Aug 9 06:28:54 2010
@@ -28,14 +28,16 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
-public class DOMUtilTest extends TestCase {
+public class DOMUtilTest extends LuceneTestCase {
private DocumentBuilder builder;
private static final XPathFactory xpathFactory = XPathFactory.newInstance();
+ @Override
public void setUp() throws Exception {
+ super.setUp();
builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/FileUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/FileUtilsTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/FileUtilsTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/FileUtilsTest.java Mon Aug 9 06:28:54 2010
@@ -20,9 +20,9 @@ package org.apache.solr.common.util;
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
-public class FileUtilsTest extends TestCase {
+public class FileUtilsTest extends LuceneTestCase {
public void testResolve() throws IOException {
String cwd = new File(".").getAbsolutePath();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/IteratorChainTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/IteratorChainTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/IteratorChainTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/IteratorChainTest.java Mon Aug 9 06:28:54 2010
@@ -21,11 +21,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.IteratorChain;
-import junit.framework.TestCase;
-
-public class IteratorChainTest extends TestCase {
+public class IteratorChainTest extends LuceneTestCase {
private Iterator<String> makeIterator(String marker,int howMany) {
final List<String> c = new ArrayList<String>();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/NamedListTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/NamedListTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/NamedListTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/NamedListTest.java Mon Aug 9 06:28:54 2010
@@ -17,9 +17,9 @@
package org.apache.solr.common.util;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
-public class NamedListTest extends TestCase {
+public class NamedListTest extends LuceneTestCase {
public void testRemove() {
NamedList<String> nl = new NamedList<String>();
nl.add("key1", "value1");
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestHash.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestHash.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestHash.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestHash.java Mon Aug 9 06:28:54 2010
@@ -17,14 +17,14 @@ package org.apache.solr.common.util;
* limitations under the License.
*/
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
import java.util.Random;
/** Tests for lookup3ycs hash functions
* @author yonik
*/
-public class TestHash extends TestCase {
+public class TestHash extends LuceneTestCase {
// Test that the java version produces the same output as the C version
public void testEqualsLOOKUP3() {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java Mon Aug 9 06:28:54 2010
@@ -16,6 +16,7 @@
*/
package org.apache.solr.common.util;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.TestDistributedSearch;
@@ -28,9 +29,7 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
-import junit.framework.TestCase;
-
-public class TestNamedListCodec extends TestCase {
+public class TestNamedListCodec extends LuceneTestCase {
public void testSimple() throws Exception{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
NamedList nl = new NamedList();
@@ -252,7 +251,7 @@ public class TestNamedListCodec extends
if (cmp != null) {
System.out.println(nl);
System.out.println(res);
- TestCase.fail(cmp);
+ fail(cmp);
}
}
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestXMLEscaping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestXMLEscaping.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestXMLEscaping.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/common/util/TestXMLEscaping.java Mon Aug 9 06:28:54 2010
@@ -17,17 +17,16 @@
package org.apache.solr.common.util;
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.io.StringWriter;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.XML;
/** Test (some of the) character escaping functions of the XML class
* $Id$
*/
-public class TestXMLEscaping extends TestCase {
+public class TestXMLEscaping extends LuceneTestCase {
private void doSimpleTest(String input,String expectedOutput) throws IOException {
final StringWriter sw = new StringWriter();
XML.escapeCharData(input, sw);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java Mon Aug 9 06:28:54 2010
@@ -17,9 +17,9 @@
package org.apache.solr.core;
-import junit.framework.TestCase;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.LuceneTestCase;
import org.easymock.EasyMock;
import java.io.IOException;
@@ -28,7 +28,7 @@ import java.io.File;
/**
* Test-case for RAMDirectoryFactory
*/
-public class RAMDirectoryFactoryTest extends TestCase {
+public class RAMDirectoryFactoryTest extends LuceneTestCase {
public void testOpenReturnsTheSameForSamePath() throws IOException {
final Directory directory = new RefCntRamDirectory();
RAMDirectoryFactory factory = new RAMDirectoryFactory() {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/ResourceLoaderTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/ResourceLoaderTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/ResourceLoaderTest.java Mon Aug 9 06:28:54 2010
@@ -18,8 +18,8 @@
package org.apache.solr.core;
import junit.framework.Assert;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.analysis.KeywordTokenizerFactory;
import org.apache.solr.analysis.NGramFilterFactory;
import org.apache.solr.common.SolrException;
@@ -35,7 +35,7 @@ import java.nio.charset.CharacterCodingE
import java.util.Arrays;
import java.util.List;
-public class ResourceLoaderTest extends TestCase
+public class ResourceLoaderTest extends LuceneTestCase
{
public void testInstanceDir() throws Exception {
SolrResourceLoader loader = new SolrResourceLoader(null);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java Mon Aug 9 06:28:54 2010
@@ -21,9 +21,8 @@ import java.io.*;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.noggit.JSONParser;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
import org.apache.solr.update.AddUpdateCommand;
@@ -32,7 +31,7 @@ import org.apache.solr.update.DeleteUpda
import org.apache.solr.update.RollbackUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-public class JsonLoaderTest extends TestCase {
+public class JsonLoaderTest extends LuceneTestCase {
static String input = ("{\n" +
"\n" +
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java Mon Aug 9 06:28:54 2010
@@ -20,12 +20,11 @@ package org.apache.solr.handler.admin;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
-import junit.framework.TestCase;
-
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.SimpleOrderedMap;
-public class SystemInfoHandlerTest extends TestCase {
+public class SystemInfoHandlerTest extends LuceneTestCase {
public void testMagickGetter() {
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:931183-980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:931183-980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:748824
/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java Mon Aug 9 06:28:54 2010
@@ -20,15 +20,14 @@ package org.apache.solr.schema;
import org.apache.solr.schema.DateField;
import org.apache.solr.util.DateMathParser;
import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.util.LocalizedTestCase;
import java.util.Date;
import java.util.TimeZone;
import java.util.Locale;
import java.text.DateFormat;
-import junit.framework.TestCase;
-
-public class LegacyDateFieldTest extends TestCase {
+public class LegacyDateFieldTest extends LocalizedTestCase {
// if and when this class is removed, make sure to refactor all
// appropriate code to DateFieldTest
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/UUIDFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/UUIDFieldTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/UUIDFieldTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/UUIDFieldTest.java Mon Aug 9 06:28:54 2010
@@ -16,11 +16,10 @@
*/
package org.apache.solr.schema;
-import junit.framework.TestCase;
-
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrException;
-public class UUIDFieldTest extends TestCase {
+public class UUIDFieldTest extends LuceneTestCase {
public void testToInternal() {
boolean ok = false;
UUIDField uuidfield = new UUIDField();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestDocSet.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestDocSet.java Mon Aug 9 06:28:54 2010
@@ -17,12 +17,11 @@
package org.apache.solr.search;
-import junit.framework.TestCase;
-
import java.util.Random;
import java.util.Arrays;
import java.io.IOException;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.OpenBitSet;
import org.apache.lucene.util.OpenBitSetIterator;
import org.apache.lucene.index.IndexReader;
@@ -35,7 +34,7 @@ import org.apache.lucene.search.DocIdSet
/**
* @version $Id$
*/
-public class TestDocSet extends TestCase {
+public class TestDocSet extends LuceneTestCase {
Random rand = new Random();
float loadfactor;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java Mon Aug 9 06:28:54 2010
@@ -16,7 +16,7 @@
*/
package org.apache.solr.search;
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.ConcurrentLRUCache;
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.Atomi
* @see org.apache.solr.search.FastLRUCache
* @since solr 1.4
*/
-public class TestFastLRUCache extends TestCase {
+public class TestFastLRUCache extends LuceneTestCase {
public void testSimple() throws IOException {
FastLRUCache sc = new FastLRUCache();
Map l = new HashMap();
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/update/AutoCommitTest.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,9577
07,960367,960374,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982442,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/test/org/apache/solr/update/AutoCommitTest.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,9577
07,960367,960374,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982442,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/update/AutoCommitTest.java:748824
/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/update/AutoCommitTest.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/update/AutoCommitTest.java:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ArraysUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ArraysUtilsTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ArraysUtilsTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ArraysUtilsTest.java Mon Aug 9 06:28:54 2010
@@ -16,9 +16,9 @@ package org.apache.solr.util;
* limitations under the License.
*/
-import junit.framework.TestCase;
+import org.apache.lucene.util.LuceneTestCase;
-public class ArraysUtilsTest extends TestCase {
+public class ArraysUtilsTest extends LuceneTestCase {
public ArraysUtilsTest(String s) {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/DateMathParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/DateMathParserTest.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/DateMathParserTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/DateMathParserTest.java Mon Aug 9 06:28:54 2010
@@ -17,9 +17,9 @@
package org.apache.solr.util;
+import org.apache.lucene.util.LocalizedTestCase;
import org.apache.solr.util.DateMathParser;
-import junit.framework.TestCase;
import java.text.SimpleDateFormat;
import java.text.DateFormat;
import java.util.Calendar;
@@ -34,7 +34,7 @@ import java.text.ParseException;
/**
* Tests that the functions in DateMathParser
*/
-public class DateMathParserTest extends TestCase {
+public class DateMathParserTest extends LocalizedTestCase {
public static TimeZone UTC = TimeZone.getTimeZone("UTC");
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java Mon Aug 9 06:28:54 2010
@@ -17,6 +17,7 @@
package org.apache.solr.util;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.NumberUtils;
import org.apache.solr.util.BCDUtils;
import org.junit.Assert;
@@ -25,9 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
-public class TestNumberUtils extends TestCase {
+public class TestNumberUtils extends LuceneTestCase {
private static String arrstr(char[] arr, int start, int end) {
String str="[";
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestOpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestOpenBitSet.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestOpenBitSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestOpenBitSet.java Mon Aug 9 06:28:54 2010
@@ -17,11 +17,10 @@
package org.apache.solr.util;
-import junit.framework.TestCase;
-
import java.util.Random;
import java.util.BitSet;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.OpenBitSetIterator;
import org.apache.lucene.search.DocIdSetIterator;
@@ -29,7 +28,7 @@ import org.apache.lucene.search.DocIdSet
* @deprecated
* @version $Id$
*/
-public class TestOpenBitSet extends TestCase {
+public class TestOpenBitSet extends LuceneTestCase {
static Random rand = new Random();
void doGet(BitSet a, OpenBitSet b) {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestUtils.java?rev=983533&r1=983532&r2=983533&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestUtils.java Mon Aug 9 06:28:54 2010
@@ -17,13 +17,12 @@
package org.apache.solr.util;
-import junit.framework.TestCase;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.StrUtils;
import org.junit.Assert;
@@ -31,7 +30,7 @@ import org.junit.Assert;
/**
* @version $Id$
*/
-public class TestUtils extends TestCase {
+public class TestUtils extends LuceneTestCase {
public static void testSplitEscaping() {
List<String> arr = StrUtils.splitSmart("\\r\\n:\\t\\f\\b", ":", true);
assertEquals(2,arr.size());
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,3 +1,3 @@
/lucene/dev/branches/preflexfixes/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:967125-979432
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957
707,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957
707,960367,960374,960719,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 06:28:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr/src/webapp/web/admin:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,961821,961941,
962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964306,964312,964430,964459,964720,964753,964832,964856,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500
+/lucene/dev/trunk/solr/src/webapp/web/admin:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,961821,961941,
962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964306,964312,964430,964459,964720,964753,964832,964856,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530
/lucene/java/branches/lucene_2_4/solr/src/webapp/web/admin:748824
/lucene/java/branches/lucene_2_9/solr/src/webapp/web/admin:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/webapp/web/admin:818601-821336