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 2013/01/21 17:28:07 UTC
svn commit: r1436459 - in
/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene:
index/TestNorms.java index/TestOmitTf.java search/TestBooleanOr.java
search/TestDocValuesScoring.java search/TestSort.java
Author: rmuir
Date: Mon Jan 21 16:28:05 2013
New Revision: 1436459
URL: http://svn.apache.org/viewvc?rev=1436459&view=rev
Log:
clear nocommits
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1436459&r1=1436458&r2=1436459&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Mon Jan 21 16:28:05 2013
@@ -40,8 +40,7 @@ import org.apache.lucene.util._TestUtil;
* Test that norms info is preserved during index life - including
* separate norms, addDocument, addIndexes, forceMerge.
*/
-// nocommit put SimpleText back in suppress list:
-@SuppressCodecs({ "Memory", "Direct" })
+@SuppressCodecs({ "Memory", "Direct", "SimpleText" })
@Slow
public class TestNorms extends LuceneTestCase {
final String byteTestField = "normsTestByte";
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1436459&r1=1436458&r2=1436459&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java Mon Jan 21 16:28:05 2013
@@ -254,8 +254,7 @@ public class TestOmitTf extends LuceneTe
newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).
setMaxBufferedDocs(2).
setSimilarity(new SimpleSimilarity()).
- setMergePolicy(newLogMergePolicy(2)).
- setMergeScheduler(new SerialMergeScheduler()) // nocommit
+ setMergePolicy(newLogMergePolicy(2))
);
StringBuilder sb = new StringBuilder(265);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1436459&r1=1436458&r2=1436459&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java Mon Jan 21 16:28:05 2013
@@ -162,8 +162,7 @@ public class TestBooleanOr extends Lucen
public void testBooleanScorerMax() throws IOException {
Directory dir = newDirectory();
- // nocommit remove SMS:
- RandomIndexWriter riw = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergeScheduler(new SerialMergeScheduler()));
+ RandomIndexWriter riw = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
int docCount = atLeast(10000);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1436459&r1=1436458&r2=1436459&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Mon Jan 21 16:28:05 2013
@@ -40,8 +40,6 @@ import org.apache.lucene.util.LuceneTest
* In the example, a docvalues field is used as a per-document boost (separate from the norm)
* @lucene.experimental
*/
-// nocommit Lucene40 doesn't yet impl SimpleDV:
-@SuppressCodecs("Lucene40")
public class TestDocValuesScoring extends LuceneTestCase {
private static final float SCORE_EPSILON = 0.001f; /* for comparing floats */
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1436459&r1=1436458&r2=1436459&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java Mon Jan 21 16:28:05 2013
@@ -74,8 +74,6 @@ import org.junit.BeforeClass;
* @since lucene 1.4
*/
-// nocommit unsuppress this once Lucene40 impls DV 2.0:
-@SuppressCodecs({"Lucene40"})
public class TestSort extends LuceneTestCase {
private static int NUM_STRINGS;
private IndexSearcher full;
@@ -200,10 +198,7 @@ public class TestSort extends LuceneTest
IndexReader reader = writer.getReader();
writer.close ();
- // nocommit back to newSearcher(true)? problem is this
- // sometimes uses slow reader wrapper which does not
- // provide DV 2.0
- IndexSearcher s = newSearcher(reader, false);
+ IndexSearcher s = newSearcher(reader);
return s;
}
@@ -277,10 +272,7 @@ public class TestSort extends LuceneTest
//System.out.println(writer.getSegmentCount());
writer.close();
IndexReader reader = DirectoryReader.open(indexStore);
- // nocommit back to newSearcher(true)? problem is this
- // sometimes uses slow reader wrapper which does not
- // provide DV 2.0
- IndexSearcher searcher = newSearcher(reader, false);
+ IndexSearcher searcher = newSearcher(reader);
/*
for(int docID=0;docID<reader.maxDoc();docID++) {