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/12/14 17:37:56 UTC
svn commit: r1049148 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/src/test/org/apache/lucene/index/
lucene/src/test/org/apache/lucene/util/ solr/
Author: rmuir
Date: Tue Dec 14 16:37:55 2010
New Revision: 1049148
URL: http://svn.apache.org/viewvc?rev=1049148&view=rev
Log:
improve the random handling in these tests
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestSetOnce.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1049148&r1=1049147&r2=1049148&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Tue Dec 14 16:37:55 2010
@@ -49,7 +49,7 @@ public class TestIndexWriterExceptions e
IndexWriter writer;
- final Random r = new java.util.Random(47);
+ final Random r = new Random(random.nextLong());
Throwable failure;
public IndexerThread(int i, IndexWriter writer) {
@@ -124,7 +124,7 @@ public class TestIndexWriterExceptions e
ThreadLocal<Thread> doFail = new ThreadLocal<Thread>();
private class MockIndexWriter extends IndexWriter {
- Random r = new java.util.Random(17);
+ Random r = new Random(random.nextLong());
public MockIndexWriter(Directory dir, IndexWriterConfig conf) throws IOException {
super(dir, conf);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1049148&r1=1049147&r2=1049148&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Tue Dec 14 16:37:55 2010
@@ -821,10 +821,11 @@ public class TestIndexWriterReader exten
final Thread[] threads = new Thread[NUM_THREAD];
for(int i=0;i<NUM_THREAD;i++) {
threads[i] = new Thread() {
+ final Random r = new Random(random.nextLong());
+
@Override
public void run() {
int count = 0;
- final Random r = new Random();
do {
try {
for(int docUpto=0;docUpto<10;docUpto++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java?rev=1049148&r1=1049147&r2=1049148&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java Tue Dec 14 16:37:55 2010
@@ -26,7 +26,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.LuceneTestCase;
public class TestNRTReaderWithThreads extends LuceneTestCase {
- Random random = new Random();
AtomicInteger seq = new AtomicInteger(1);
public void testIndexing() throws Exception {
@@ -75,7 +74,8 @@ public class TestNRTReaderWithThreads ex
int delCount = 0;
int addCount = 0;
int type;
-
+ final Random r = new Random(random.nextLong());
+
public RunThread(int type, IndexWriter writer) {
this.type = type;
this.writer = writer;
@@ -95,7 +95,7 @@ public class TestNRTReaderWithThreads ex
// we may or may not delete because the term may not exist,
// however we're opening and closing the reader rapidly
IndexReader reader = writer.getReader();
- int id = random.nextInt(seq.intValue());
+ int id = r.nextInt(seq.intValue());
Term term = new Term("id", Integer.toString(id));
int count = TestIndexWriterReader.count(term, reader);
writer.deleteDocuments(term);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestSetOnce.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestSetOnce.java?rev=1049148&r1=1049147&r2=1049148&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestSetOnce.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestSetOnce.java Tue Dec 14 16:37:55 2010
@@ -29,6 +29,11 @@ public class TestSetOnce extends LuceneT
private static final class SetOnceThread extends Thread {
SetOnce<Integer> set;
boolean success = false;
+ final Random RAND;
+
+ public SetOnceThread(Random random) {
+ RAND = new Random(random.nextLong());
+ }
@Override
public void run() {
@@ -46,8 +51,6 @@ public class TestSetOnce extends LuceneT
}
}
- private static final Random RAND = new Random();
-
@Test
public void testEmptyCtor() throws Exception {
SetOnce<Integer> set = new SetOnce<Integer>();
@@ -71,15 +74,10 @@ public class TestSetOnce extends LuceneT
@Test
public void testSetMultiThreaded() throws Exception {
- long seed = RAND.nextLong();
- RAND.setSeed(seed);
- if (VERBOSE) {
- System.out.println("testSetMultiThreaded: seed=" + seed);
- }
final SetOnce<Integer> set = new SetOnce<Integer>();
SetOnceThread[] threads = new SetOnceThread[10];
for (int i = 0; i < threads.length; i++) {
- threads[i] = new SetOnceThread();
+ threads[i] = new SetOnceThread(random);
threads[i].setName("t-" + (i+1));
threads[i].set = set;
}