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 21:06:34 UTC
svn commit: r983778 - in /lucene/dev/trunk:
lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/
lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/
lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projection...
Author: rmuir
Date: Mon Aug 9 19:06:34 2010
New Revision: 983778
URL: http://svn.apache.org/viewvc?rev=983778&view=rev
Log:
extend LuceneTestCase instead of Object here too
Modified:
lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java
lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java
lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
Modified: lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java Mon Aug 9 19:06:34 2010
@@ -19,12 +19,13 @@ package org.apache.lucene.spatial.geohas
import static junit.framework.Assert.*;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
/**
* Tests for {@link GeoHashUtils}
*/
-public class TestGeoHashUtils {
+public class TestGeoHashUtils extends LuceneTestCase {
/**
* Pass condition: lat=42.6, lng=-5.6 should be encoded as "ezs42e44yx96",
Modified: lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java Mon Aug 9 19:06:34 2010
@@ -2,12 +2,13 @@ package org.apache.lucene.spatial.geomet
import static junit.framework.Assert.*;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
/**
* Tests for {@link org.apache.lucene.spatial.geometry.DistanceUnits}
*/
-public class TestDistanceUnits {
+public class TestDistanceUnits extends LuceneTestCase {
/**
* Pass condition: When finding the DistanceUnit for "km", KILOMETRES is found. When finding the DistanceUnit for
Modified: lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java Mon Aug 9 19:06:34 2010
@@ -1,5 +1,6 @@
package org.apache.lucene.spatial.tier.projections;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
@@ -7,7 +8,7 @@ import org.junit.Test;
*
*
**/
-public class SinusoidalProjectorTest {
+public class SinusoidalProjectorTest extends LuceneTestCase {
@Test
public void testProjection() throws Exception {
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Mon Aug 9 19:06:34 2010
@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.emb
import static junit.framework.Assert.assertEquals;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
@@ -44,7 +45,7 @@ import org.slf4j.LoggerFactory;
* @version $Id$
* @since solr 1.3
*/
-public class TestSolrProperties {
+public class TestSolrProperties extends LuceneTestCase {
protected static Logger log = LoggerFactory.getLogger(TestSolrProperties.class);
protected CoreContainer cores = null;
@@ -58,6 +59,7 @@ public class TestSolrProperties {
@Before
public void setUp() throws Exception {
+ super.setUp();
System.setProperty("solr.solr.home", getSolrHome());
log.info("pwd: " + (new File(".")).getAbsolutePath());
@@ -81,6 +83,7 @@ public class TestSolrProperties {
}
File persistedFile = new File(getSolrHome() + File.separator + "solr-persist.xml");
persistedFile.delete();
+ super.tearDown();
}
protected SolrServer getSolrCore0() {
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java Mon Aug 9 19:06:34 2010
@@ -17,6 +17,8 @@
package org.apache.solr.client.solrj.request;
import junit.framework.Assert;
+
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
import org.junit.Test;
@@ -38,7 +40,7 @@ import java.util.ArrayList;
* @version $Id$
* @see org.apache.solr.client.solrj.request.UpdateRequest
*/
-public class TestUpdateRequestCodec {
+public class TestUpdateRequestCodec extends LuceneTestCase {
@Test
public void simple() throws IOException {
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java Mon Aug 9 19:06:34 2010
@@ -17,6 +17,7 @@
package org.apache.solr.client.solrj.response;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -31,7 +32,7 @@ import java.util.List;
* @since solr 1.4
*/
@SuppressWarnings("unchecked")
-public class AnlysisResponseBaseTest {
+public class AnlysisResponseBaseTest extends LuceneTestCase {
/**
* Tests the {@link AnalysisResponseBase#buildTokenInfo(org.apache.solr.common.util.NamedList)} method.
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java Mon Aug 9 19:06:34 2010
@@ -17,6 +17,7 @@
package org.apache.solr.client.solrj.response;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -31,7 +32,7 @@ import java.util.List;
* @version $Id$
* @since solr 1.4
*/
-public class DocumentAnalysisResponseTest {
+public class DocumentAnalysisResponseTest extends LuceneTestCase {
/**
* Tests the {@link DocumentAnalysisResponse#setResponse(org.apache.solr.common.util.NamedList)} method
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java Mon Aug 9 19:06:34 2010
@@ -17,6 +17,7 @@
package org.apache.solr.client.solrj.response;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -32,7 +33,7 @@ import java.util.List;
* @since solr 1.4
*/
@SuppressWarnings("unchecked")
-public class FieldAnalysisResponseTest {
+public class FieldAnalysisResponseTest extends LuceneTestCase {
/**
* Tests the {@link FieldAnalysisResponse#setResponse(org.apache.solr.common.util.NamedList)} method.
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java Mon Aug 9 19:06:34 2010
@@ -23,6 +23,7 @@ import java.io.FileReader;
import junit.framework.Assert;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.common.util.NamedList;
import org.junit.Test;
@@ -33,7 +34,7 @@ import static org.junit.Assert.assertTru
*
* @since solr 1.3
*/
-public class QueryResponseTest {
+public class QueryResponseTest extends LuceneTestCase {
@Test
public void testDateFacets() throws Exception {
XMLResponseParser parser = new XMLResponseParser();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java Mon Aug 9 19:06:34 2010
@@ -17,6 +17,8 @@
package org.apache.solr.common.util;
import static org.junit.Assert.assertEquals;
+
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
import java.io.*;
@@ -29,7 +31,7 @@ import java.util.zip.GZIPOutputStream;
* @version $Id$
* @see org.apache.solr.common.util.FastInputStream
*/
-public class TestFastInputStream {
+public class TestFastInputStream extends LuceneTestCase {
@Test
public void testgzip() throws Exception {
ByteArrayOutputStream b = new ByteArrayOutputStream();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java Mon Aug 9 19:06:34 2010
@@ -16,6 +16,7 @@
*/
package org.apache.solr.core;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrConfig.JmxConfiguration;
import org.junit.After;
@@ -42,7 +43,7 @@ import java.util.Set;
* @version $Id$
* @since solr 1.3
*/
-public class TestJmxMonitoredMap {
+public class TestJmxMonitoredMap extends LuceneTestCase {
private int port = 0;
@@ -54,6 +55,7 @@ public class TestJmxMonitoredMap {
@Before
public void setUp() throws Exception {
+ super.setUp();
int retries = 5;
for (int i = 0; i < retries; i++) {
try {
@@ -90,6 +92,7 @@ public class TestJmxMonitoredMap {
connector.close();
} catch (Exception e) {
}
+ super.tearDown();
}
@Test
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java?rev=983778&r1=983777&r2=983778&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java Mon Aug 9 19:06:34 2010
@@ -19,6 +19,7 @@ package org.apache.solr.spelling;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.util.NamedList;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
@@ -35,7 +36,7 @@ import java.util.ArrayList;
* @version $Id$
* @since solr 1.3
*/
-public class SpellingQueryConverterTest {
+public class SpellingQueryConverterTest extends LuceneTestCase {
@Test
public void test() throws Exception {