You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/14 16:41:39 UTC
svn commit: r1049131 - in /lucene/dev/trunk/solr/src/test/org/apache/solr:
./ client/solrj/embedded/ common/util/ search/ search/function/ util/
Author: yonik
Date: Tue Dec 14 15:41:38 2010
New Revision: 1049131
URL: http://svn.apache.org/viewvc?rev=1049131&view=rev
Log:
tests: use Lucene's static random
Modified:
lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestHash.java
lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestDocSet.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSearchPerf.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
lucene/dev/trunk/solr/src/test/org/apache/solr/util/TestNumberUtils.java
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java Tue Dec 14 15:41:38 2010
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.5
*/
public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
- public static Random r = new Random(0);
+ public static Random r = random;
protected int shardCount = 4;
/**
@@ -581,7 +581,7 @@ public abstract class BaseDistributedSea
}
public static abstract class RandVal {
- public static Random r = new Random();
+ public static Random r = random;
public static Set uniqueValues = new HashSet();
public abstract Object val();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Tue Dec 14 15:41:38 2010
@@ -56,7 +56,7 @@ public class JettyWebappTest extends Luc
server = new Server(port);
// insecure: only use for tests!!!!
- server.setSessionIdManager(new HashSessionIdManager(new Random()));
+ server.setSessionIdManager(new HashSessionIdManager(new Random(random.nextLong())));
new WebAppContext(server, path, context );
SocketConnector connector = new SocketConnector();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestHash.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestHash.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestHash.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestHash.java Tue Dec 14 15:41:38 2010
@@ -73,7 +73,7 @@ public class TestHash extends LuceneTest
public void testHash() {
- Random r = new Random(0);
+ Random r = random;
int[] utf32 = new int[20];
tstEquiv(utf32,0);
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java Tue Dec 14 15:41:38 2010
@@ -199,7 +199,7 @@ public class TestNamedListCodec extends
return lst;
}
- Random r = new Random();
+ Random r = random;
public Object makeRandom(int lev) {
switch (r.nextInt(10)) {
@@ -231,7 +231,7 @@ public class TestNamedListCodec extends
public void testRandom() throws Exception {
- Random r = new Random(0);
+ // Random r = random;
// let's keep it deterministic since just the wrong
// random stuff could cause failure because of an OOM (too big)
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestDocSet.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestDocSet.java Tue Dec 14 15:41:38 2010
@@ -35,7 +35,7 @@ import org.apache.lucene.search.DocIdSet
* @version $Id$
*/
public class TestDocSet extends LuceneTestCase {
- Random rand = new Random();
+ Random rand = random;
float loadfactor;
public OpenBitSet getRandomSet(int sz, int bitsToSet) {
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestFastLRUCache.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestFastLRUCache.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestFastLRUCache.java Tue Dec 14 15:41:38 2010
@@ -260,7 +260,7 @@ public class TestFastLRUCache extends Lu
int lowerWaterMark = cacheSize;
int upperWaterMark = (int)(lowerWaterMark * 1.1);
- Random r = new Random(0);
+ Random r = random;
ConcurrentLRUCache cache = new ConcurrentLRUCache(upperWaterMark, lowerWaterMark, (upperWaterMark+lowerWaterMark)/2, upperWaterMark, false, false, null);
boolean getSize=false;
int minSize=0,maxSize=0;
@@ -310,9 +310,8 @@ public class TestFastLRUCache extends Lu
}
void fillCache(SolrCache sc, int cacheSize, int maxKey) {
- Random r = new Random(0);
for (int i=0; i<cacheSize; i++) {
- Integer kv = r.nextInt(maxKey);
+ Integer kv = random.nextInt(maxKey);
sc.put(kv,kv);
}
}
@@ -333,7 +332,7 @@ public class TestFastLRUCache extends Lu
Thread[] threads = new Thread[nThreads];
final AtomicInteger puts = new AtomicInteger(0);
for (int i=0; i<threads.length; i++) {
- final int seed=i;
+ final int seed=random.nextInt();
threads[i] = new Thread() {
public void run() {
int ret = useCache(sc, numGets/nThreads, maxKey, seed);
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSearchPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSearchPerf.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSearchPerf.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSearchPerf.java Tue Dec 14 15:41:38 2010
@@ -50,7 +50,7 @@ public class TestSearchPerf extends Abst
return String.format("%08d", tnum);
}
- Random r = new Random(0);
+ Random r = new Random(0); // specific seed for reproducible perf testing
int nDocs;
void createIndex(int nDocs) {
this.nDocs = nDocs;
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java Tue Dec 14 15:41:38 2010
@@ -36,7 +36,7 @@ public class TestSort extends AbstractSo
public String getSchemaFile() { return null; }
public String getSolrConfigFile() { return null; }
- Random r = new Random();
+ Random r = random;
int ndocs = 77;
int iter = 50;
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java Tue Dec 14 15:41:38 2010
@@ -220,7 +220,7 @@ public class TestFunctionQuery extends S
assertTrue(orig != FileFloatSource.onlyForTesting);
- Random r = new Random();
+ Random r = random;
for (int i=0; i<10; i++) { // do more iterations for a thorough test
int len = r.nextInt(ids.length+1);
boolean sorted = r.nextBoolean();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/util/TestNumberUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/util/TestNumberUtils.java?rev=1049131&r1=1049130&r2=1049131&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/util/TestNumberUtils.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/util/TestNumberUtils.java Tue Dec 14 15:41:38 2010
@@ -34,7 +34,7 @@ public class TestNumberUtils extends Luc
return str+"]";
}
- static Random rng = new Random();
+ static Random rng = random;
static int[] special = {0,10,100,1000,10000,Integer.MAX_VALUE, Integer.MIN_VALUE};
static int getSpecial() {