You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/12/18 10:27:36 UTC
svn commit: r1646416 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/
lucene/core/src/test/org/apache/lucene/ lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/index...
Author: mikemccand
Date: Thu Dec 18 09:27:35 2014
New Revision: 1646416
URL: http://svn.apache.org/r1646416
Log:
LUCENE-6019, LUCENE-6117: remove -Dtests.assert: this is too big a change for a bug-fix release (and it introduced a bug)
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
lucene/dev/branches/lucene_solr_4_10/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/TestAssertions.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Thu Dec 18 09:27:35 2014
@@ -3,6 +3,13 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+======================= Lucene 4.10.4 ======================
+
+Bug fixes
+
+* LUCENE-6019, LUCENE-6117: Remove -Dtests.assert to make IndexWriter
+ infoStream sane. (Robert Muir, Mike McCandless)
+
======================= Lucene 4.10.3 ======================
Bug fixes
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/common-build.xml?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/common-build.xml Thu Dec 18 09:27:35 2014
@@ -130,17 +130,13 @@
<property name="tests.monster" value="false" />
<property name="tests.slow" value="true" />
<property name="tests.cleanthreads.sysprop" value="perMethod"/>
+ <property name="tests.asserts.gracious" value="false"/>
<property name="tests.verbose" value="false"/>
<property name="tests.infostream" value="${tests.verbose}"/>
<property name="tests.filterstacks" value="true"/>
<property name="tests.luceneMatchVersion" value="${version.base}"/>
- <property name="tests.asserts" value="true" />
- <condition property="tests.asserts.args" value="-ea -esa" else="">
- <istrue value="${tests.asserts}"/>
- </condition>
-
- <condition property="tests.heapsize" value="768M" else="512M">
+ <condition property="tests.heapsize" value="768M">
<isset property="run.clover"/>
</condition>
<property name="tests.heapsize" value="512M"/>
@@ -972,11 +968,16 @@
<classpath refid="@{junit.classpath}"/>
<classpath refid="clover.classpath" />
+ <!-- Assertions. -->
+ <assertions>
+ <enable package="org.apache.lucene"/>
+ <enable package="org.apache.solr"/>
+ </assertions>
+
<!-- JVM arguments and system properties. -->
<jvmarg line="${args}"/>
<jvmarg line="${tests.heapdump.args}"/>
<jvmarg line="${tests.clover.args}"/>
- <jvmarg line="${tests.asserts.args}"/>
<!-- set the number of times tests should run -->
<sysproperty key="tests.iters" value="${tests.iters}"/>
@@ -1014,7 +1015,7 @@
<sysproperty key="tests.slow" value="@{tests.slow}"/>
<!-- set whether tests framework should not require java assertions enabled -->
- <sysproperty key="tests.asserts" value="${tests.asserts}"/>
+ <sysproperty key="tests.asserts.gracious" value="${tests.asserts.gracious}"/>
<!-- TODO: create propertyset for test properties, so each project can have its own set -->
<sysproperty key="tests.multiplier" value="@{tests.multiplier}"/>
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Thu Dec 18 09:27:35 2014
@@ -77,8 +77,9 @@ class DocumentsWriterPerThread {
this.infoStream = infoStream;
}
- public void testPoint(String name) {
- docWriter.testPoint(name);
+ // Only called by asserts
+ public boolean testPoint(String name) {
+ return docWriter.testPoint(name);
}
public void clear() {
@@ -201,10 +202,11 @@ class DocumentsWriterPerThread {
return retval;
}
- final void testPoint(String message) {
+ final boolean testPoint(String message) {
if (infoStream.isEnabled("TP")) {
infoStream.message("TP", message);
}
+ return true;
}
/** Anything that will add N docs to the index should reserve first to
@@ -218,7 +220,7 @@ class DocumentsWriterPerThread {
}
public void updateDocument(Iterable<? extends IndexableField> doc, Analyzer analyzer, Term delTerm) throws IOException {
- testPoint("DocumentsWriterPerThread addDocument start");
+ assert testPoint("DocumentsWriterPerThread addDocument start");
assert deleteQueue != null;
docState.doc = doc;
docState.analyzer = analyzer;
@@ -256,7 +258,7 @@ class DocumentsWriterPerThread {
}
public int updateDocuments(Iterable<? extends Iterable<? extends IndexableField>> docs, Analyzer analyzer, Term delTerm) throws IOException {
- testPoint("DocumentsWriterPerThread addDocuments start");
+ assert testPoint("DocumentsWriterPerThread addDocuments start");
assert deleteQueue != null;
docState.analyzer = analyzer;
if (INFO_VERBOSE && infoStream.isEnabled("DWPT")) {
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java Thu Dec 18 09:27:35 2014
@@ -70,9 +70,9 @@ final class DocumentsWriterStallControl
if (stalled) { // react on the first wakeup call!
// don't loop here, higher level logic will re-stall!
try {
- incWaiters();
+ assert incWaiters();
wait();
- decrWaiters();
+ assert decrWaiters();
} catch (InterruptedException e) {
throw new ThreadInterruptedException(e);
}
@@ -86,16 +86,17 @@ final class DocumentsWriterStallControl
}
- private void incWaiters() {
+ private boolean incWaiters() {
numWaiting++;
assert waiting.put(Thread.currentThread(), Boolean.TRUE) == null;
- assert numWaiting > 0;
+
+ return numWaiting > 0;
}
- private void decrWaiters() {
+ private boolean decrWaiters() {
numWaiting--;
assert waiting.remove(Thread.currentThread()) != null;
- assert numWaiting >= 0;
+ return numWaiting >= 0;
}
synchronized boolean hasBlocked() { // for tests
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java Thu Dec 18 09:27:35 2014
@@ -107,6 +107,8 @@ final class FreqProxTermsWriterPerField
void newTerm(final int termID) {
// First time we're seeing this term since the last
// flush
+ assert docState.testPoint("FreqProxTermsWriterPerField.newTerm start");
+
final FreqProxPostingsArray postings = freqProxPostingsArray;
postings.lastDocIDs[termID] = docState.docID;
@@ -131,6 +133,9 @@ final class FreqProxTermsWriterPerField
@Override
void addTerm(final int termID) {
+
+ assert docState.testPoint("FreqProxTermsWriterPerField.addTerm start");
+
final FreqProxPostingsArray postings = freqProxPostingsArray;
assert !hasFreq || postings.termFreqs[termID] > 0;
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Dec 18 09:27:35 2014
@@ -2126,7 +2126,7 @@ public class IndexWriter implements Clos
infoStream.message("IW", "rollback: infos=" + segString(segmentInfos));
}
- testPoint("rollback before checkpoint");
+ assert testPoint("rollback before checkpoint");
// Ask deleter to locate unreferenced files & remove
// them:
@@ -2932,7 +2932,7 @@ public class IndexWriter implements Clos
}
doBeforeFlush();
- testPoint("startDoFlush");
+ assert testPoint("startDoFlush");
SegmentInfos toCommit = null;
boolean anySegmentsFlushed = false;
@@ -3218,7 +3218,7 @@ public class IndexWriter implements Clos
}
doBeforeFlush();
- testPoint("startDoFlush");
+ assert testPoint("startDoFlush");
boolean success = false;
try {
@@ -3310,7 +3310,9 @@ public class IndexWriter implements Clos
// for testing only
DocumentsWriter getDocsWriter() {
- return docWriter;
+ boolean test = false;
+ assert test = true;
+ return test ? docWriter : null;
}
/** Expert: Return the number of documents currently
@@ -3395,7 +3397,7 @@ public class IndexWriter implements Clos
*/
synchronized private ReadersAndUpdates commitMergedDeletesAndUpdates(MergePolicy.OneMerge merge, MergeState mergeState) throws IOException {
- testPoint("startCommitMergeDeletes");
+ assert testPoint("startCommitMergeDeletes");
final List<SegmentCommitInfo> sourceSegments = merge.segments;
@@ -3580,7 +3582,7 @@ public class IndexWriter implements Clos
synchronized private boolean commitMerge(MergePolicy.OneMerge merge, MergeState mergeState) throws IOException {
- testPoint("startCommitMerge");
+ assert testPoint("startCommitMerge");
if (tragedy != null) {
throw new IllegalStateException("this writer hit an unrecoverable error; cannot complete merge", tragedy);
@@ -3924,7 +3926,7 @@ public class IndexWriter implements Clos
synchronized private void _mergeInit(MergePolicy.OneMerge merge) throws IOException {
- testPoint("startMergeInit");
+ assert testPoint("startMergeInit");
assert merge.registerDone;
assert merge.maxNumSegments == -1 || merge.maxNumSegments > 0;
@@ -4163,9 +4165,9 @@ public class IndexWriter implements Clos
// we pass merge.getMergeReaders() instead of merge.readers to allow the
// OneMerge to return a view over the actual segments to merge
final SegmentMerger merger = new SegmentMerger(merge.getMergeReaders(),
- merge.info.info, infoStream, dirWrapper, config.getTermIndexInterval(),
- checkAbort, globalFieldNumberMap,
- context, config.getCheckIntegrityAtMerge());
+ merge.info.info, infoStream, dirWrapper, config.getTermIndexInterval(),
+ checkAbort, globalFieldNumberMap,
+ context, config.getCheckIntegrityAtMerge());
merge.checkAborted(directory);
@@ -4457,7 +4459,7 @@ public class IndexWriter implements Clos
* it. */
private void startCommit(final SegmentInfos toSync) throws IOException {
- testPoint("startStartCommit");
+ assert testPoint("startStartCommit");
assert pendingCommit == null;
if (tragedy != null) {
@@ -4495,13 +4497,13 @@ public class IndexWriter implements Clos
assert filesExist(toSync);
}
- testPoint("midStartCommit");
+ assert testPoint("midStartCommit");
boolean pendingCommitSet = false;
try {
- testPoint("midStartCommit2");
+ assert testPoint("midStartCommit2");
synchronized(this) {
@@ -4539,7 +4541,7 @@ public class IndexWriter implements Clos
infoStream.message("IW", "done all syncs: " + filesToSync);
}
- testPoint("midStartCommitSuccess");
+ assert testPoint("midStartCommitSuccess");
} finally {
synchronized(this) {
@@ -4563,7 +4565,7 @@ public class IndexWriter implements Clos
} catch (OutOfMemoryError oom) {
tragicEvent(oom, "startCommit");
}
- testPoint("finishStartCommit");
+ assert testPoint("finishStartCommit");
}
/**
@@ -4643,7 +4645,7 @@ public class IndexWriter implements Clos
IOUtils.reThrowUnchecked(tragedy);
}
- // Used for testing. Current points:
+ // Used only by assert for testing. Current points:
// startDoFlush
// startCommitMerge
// startStartCommit
@@ -4654,10 +4656,11 @@ public class IndexWriter implements Clos
// startCommitMergeDeletes
// startMergeInit
// DocumentsWriter.ThreadState.init start
- private final void testPoint(String message) {
+ private final boolean testPoint(String message) {
if (infoStream.isEnabled("TP")) {
infoStream.message("TP", message);
}
+ return true;
}
synchronized boolean nrtIsCurrent(SegmentInfos infos) {
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java Thu Dec 18 09:27:35 2014
@@ -1,5 +1,17 @@
package org.apache.lucene.index;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.codecs.DocValuesFormat;
+import org.apache.lucene.codecs.DocValuesProducer;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RefCount;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,18 +29,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.lucene.codecs.DocValuesFormat;
-import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.RefCount;
-
/**
* Manages the {@link DocValuesProducer} held by {@link SegmentReader} and
* keeps track of their reference counting.
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java Thu Dec 18 09:27:35 2014
@@ -93,6 +93,8 @@ final class TermVectorsConsumer extends
@Override
void finishDocument() throws IOException {
+ assert docWriter.testPoint("TermVectorsTermsWriter.finishDocument start");
+
if (!hasVectors) {
return;
}
@@ -117,6 +119,7 @@ final class TermVectorsConsumer extends
super.reset();
resetFields();
+ assert docWriter.testPoint("TermVectorsTermsWriter.finishDocument end");
}
@Override
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java Thu Dec 18 09:27:35 2014
@@ -63,6 +63,8 @@ final class TermVectorsConsumerPerField
doVectors = false;
+ assert docState.testPoint("TermVectorsTermsWriterPerField.finish start");
+
final int numPostings = bytesHash.size();
final BytesRef flushTerm = termsWriter.flushTerm;
@@ -224,6 +226,7 @@ final class TermVectorsConsumerPerField
@Override
void newTerm(final int termID) {
+ assert docState.testPoint("TermVectorsTermsWriterPerField.newTerm start");
TermVectorsPostingsArray postings = termVectorsPostingsArray;
postings.freqs[termID] = 1;
@@ -235,6 +238,7 @@ final class TermVectorsConsumerPerField
@Override
void addTerm(final int termID) {
+ assert docState.testPoint("TermVectorsTermsWriterPerField.addTerm start");
TermVectorsPostingsArray postings = termVectorsPostingsArray;
postings.freqs[termID]++;
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/TestAssertions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/TestAssertions.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/TestAssertions.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/TestAssertions.java Thu Dec 18 09:27:35 2014
@@ -17,8 +17,8 @@ package org.apache.lucene;
* limitations under the License.
*/
-import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.analysis.TokenStream;
/**
* validate that assertions are enabled during tests
@@ -43,13 +43,13 @@ public class TestAssertions extends Luce
public void testTokenStreams() {
new TestTokenStream1();
new TestTokenStream2();
+ boolean doFail = false;
try {
new TestTokenStream3();
- if (assertsAreEnabled) {
- fail("TestTokenStream3 should fail assertion");
- }
+ doFail = true;
} catch (AssertionError e) {
// expected
}
+ assertFalse("TestTokenStream3 should fail assertion", doFail);
}
}
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Thu Dec 18 09:27:35 2014
@@ -55,7 +55,7 @@ public class RandomIndexWriter implement
public static IndexWriter mockIndexWriter(Directory dir, IndexWriterConfig conf, Random r) throws IOException {
// Randomly calls Thread.yield so we mixup thread scheduling
final Random random = new Random(r.nextLong());
- return mockIndexWriter(dir, conf, new TestPoint() {
+ return mockIndexWriter(dir, conf, new TestPoint() {
@Override
public void apply(String message) {
if (random.nextInt(4) == 2)
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Thu Dec 18 09:27:35 2014
@@ -814,7 +814,7 @@ public class MockDirectoryWrapper extend
extras += "\n\nThese files we had previously tried to delete, but couldn't: " + pendingDeletions;
}
- throw new RuntimeException("unreferenced files: before delete:\n " + Arrays.toString(startFiles) + "\n after delete:\n " + Arrays.toString(endFiles) + extras);
+ assert false : "unreferenced files: before delete:\n " + Arrays.toString(startFiles) + "\n after delete:\n " + Arrays.toString(endFiles) + extras;
}
DirectoryReader ir1 = DirectoryReader.open(this);
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Thu Dec 18 09:27:35 2014
@@ -396,8 +396,6 @@ public abstract class LuceneTestCase ext
*/
public static final int RANDOM_MULTIPLIER = systemPropertyAsInt("tests.multiplier", 1);
- public static final boolean TEST_ASSERTS_ENABLED = systemPropertyAsBoolean("tests.asserts", true);
-
/** TODO: javadoc? */
public static final String DEFAULT_LINE_DOCS_FILE = "europarl.lines.txt.gz";
@@ -2692,13 +2690,4 @@ public abstract class LuceneTestCase ext
}
}
}
-
- /** True if assertions (-ea) are enabled (at least for this class). */
- public static final boolean assertsAreEnabled;
-
- static {
- boolean enabled = false;
- assert enabled = true; // Intentional side-effect!!!
- assertsAreEnabled = enabled;
- }
}
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java Thu Dec 18 09:27:35 2014
@@ -177,12 +177,6 @@ public final class RunListenerPrintRepro
}
}
- if (LuceneTestCase.assertsAreEnabled) {
- addVmOpt(b, "tests.asserts", "true");
- } else {
- addVmOpt(b, "tests.asserts", "false");
- }
-
addVmOpt(b, "tests.file.encoding", System.getProperty("file.encoding"));
System.err.println(b.toString());
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java?rev=1646416&r1=1646415&r2=1646416&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java Thu Dec 18 09:27:35 2014
@@ -31,22 +31,11 @@ public class TestRuleAssertionsRequired
@Override
public void evaluate() throws Throwable {
try {
- // Make sure -ea matches -Dtests.asserts, to catch accidental mis-use:
- if (LuceneTestCase.assertsAreEnabled != LuceneTestCase.TEST_ASSERTS_ENABLED) {
- String msg = "Assertions mismatch: ";
- if (LuceneTestCase.assertsAreEnabled) {
- msg += "-ea was specified";
- } else {
- msg += "-ea was not specified";
- }
- if (LuceneTestCase.TEST_ASSERTS_ENABLED) {
- msg += " but -Dtests.asserts=true";
- } else {
- msg += " but -Dtests.asserts=false";
- }
- System.err.println(msg);
- throw new Exception(msg);
- }
+ assert false;
+ String msg = "Test class requires enabled assertions, enable globally (-ea)" +
+ " or for Solr/Lucene subpackages only: " + description.getClassName();
+ System.err.println(msg);
+ throw new Exception(msg);
} catch (AssertionError e) {
// Ok, enabled.
}