Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use the new _TestUtil.randomUnicodeString here 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@941780 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2010-05-06 15:39:35 +00:00
parent 1e1296e6f8
commit 4a1c8c37c4
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
View File

@ -38,6 +38,7 @@ import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util._TestUtil;
/** /**
* Verifies that Lucene MemoryIndex and RAMDirectory have the same behaviour, * Verifies that Lucene MemoryIndex and RAMDirectory have the same behaviour,
@ -166,44 +167,7 @@ public class MemoryIndexTest extends BaseTokenStreamTestCase {
return TEST_TERMS[random.nextInt(TEST_TERMS.length)]; return TEST_TERMS[random.nextInt(TEST_TERMS.length)];
} else { } else {
// return a random unicode term // return a random unicode term
return randomString(); return _TestUtil.randomUnicodeString(random);
} }
} }
/**
* Return a random unicode term, like TestStressIndexing.
*/
private String randomString() {
final int end = random.nextInt(20);
if (buffer.length < 1 + end) {
char[] newBuffer = new char[(int) ((1 + end) * 1.25)];
System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
buffer = newBuffer;
}
for (int i = 0; i < end - 1; i++) {
int t = random.nextInt(6);
if (0 == t && i < end - 1) {
// Make a surrogate pair
// High surrogate
buffer[i++] = (char) nextInt(0xd800, 0xdc00);
// Low surrogate
buffer[i] = (char) nextInt(0xdc00, 0xe000);
} else if (t <= 1) buffer[i] = (char) random.nextInt(0x80);
else if (2 == t) buffer[i] = (char) nextInt(0x80, 0x800);
else if (3 == t) buffer[i] = (char) nextInt(0x800, 0xd800);
else if (4 == t) buffer[i] = (char) nextInt(0xe000, 0xffff);
else if (5 == t) {
// Illegal unpaired surrogate
if (random.nextBoolean()) buffer[i] = (char) nextInt(0xd800, 0xdc00);
else buffer[i] = (char) nextInt(0xdc00, 0xe000);
}
}
return new String(buffer, 0, end);
}
private char buffer[] = new char[20];
// start is inclusive and end is exclusive
private int nextInt(int start, int end) {
return start + random.nextInt(end - start);
}
} }