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 2012/04/16 05:52:31 UTC
svn commit: r1326473 -
/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
Author: rmuir
Date: Mon Apr 16 03:52:31 2012
New Revision: 1326473
URL: http://svn.apache.org/viewvc?rev=1326473&view=rev
Log:
close the linefiledocs always
Modified:
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java?rev=1326473&r1=1326472&r2=1326473&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Mon Apr 16 03:52:31 2012
@@ -34,6 +34,7 @@ import java.util.HashMap;
import org.apache.lucene.analysis.tokenattributes.*;
import org.apache.lucene.util.Attribute;
import org.apache.lucene.util.AttributeImpl;
+import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util._TestUtil;
@@ -454,42 +455,46 @@ public abstract class BaseTokenStreamTes
private static void checkRandomData(Random random, Analyzer a, int iterations, int maxWordLength, boolean useCharFilter, boolean simple, boolean offsetsAreCorrect) throws IOException {
final LineFileDocs docs = new LineFileDocs(random);
-
- for (int i = 0; i < iterations; i++) {
- String text;
-
- if (random.nextInt(10) == 7) {
- // real data from linedocs
- text = docs.nextDoc().get("body");
- if (text.length() > maxWordLength) {
-
- // Take a random slice from the text...:
- int startPos = random.nextInt(text.length() - maxWordLength);
- if (startPos > 0 && Character.isLowSurrogate(text.charAt(startPos))) {
- // Take care not to split up a surrogate pair:
- startPos--;
- assert Character.isHighSurrogate(text.charAt(startPos));
- }
- int endPos = startPos + maxWordLength - 1;
- if (Character.isHighSurrogate(text.charAt(endPos))) {
- // Take care not to split up a surrogate pair:
- endPos--;
+
+ try {
+ for (int i = 0; i < iterations; i++) {
+ String text;
+
+ if (random.nextInt(10) == 7) {
+ // real data from linedocs
+ text = docs.nextDoc().get("body");
+ if (text.length() > maxWordLength) {
+
+ // Take a random slice from the text...:
+ int startPos = random.nextInt(text.length() - maxWordLength);
+ if (startPos > 0 && Character.isLowSurrogate(text.charAt(startPos))) {
+ // Take care not to split up a surrogate pair:
+ startPos--;
+ assert Character.isHighSurrogate(text.charAt(startPos));
+ }
+ int endPos = startPos + maxWordLength - 1;
+ if (Character.isHighSurrogate(text.charAt(endPos))) {
+ // Take care not to split up a surrogate pair:
+ endPos--;
+ }
+ text = text.substring(startPos, 1+endPos);
}
- text = text.substring(startPos, 1+endPos);
+ } else {
+ // synthetic
+ text = randomAnalysisString(random, maxWordLength, simple);
+ }
+
+ try {
+ checkAnalysisConsistency(random, a, useCharFilter, text, offsetsAreCorrect);
+ } catch (Throwable t) {
+ // TODO: really we should pass a random seed to
+ // checkAnalysisConsistency then print it here too:
+ System.err.println("TEST FAIL: useCharFilter=" + useCharFilter + " text='" + escape(text) + "'");
+ Rethrow.rethrow(t);
}
- } else {
- // synthetic
- text = randomAnalysisString(random, maxWordLength, simple);
- }
-
- try {
- checkAnalysisConsistency(random, a, useCharFilter, text, offsetsAreCorrect);
- } catch (Throwable t) {
- // TODO: really we should pass a random seed to
- // checkAnalysisConsistency then print it here too:
- System.err.println("TEST FAIL: useCharFilter=" + useCharFilter + " text='" + escape(text) + "'");
- Rethrow.rethrow(t);
}
+ } finally {
+ IOUtils.closeWhileHandlingException(docs);
}
}