You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/08/12 13:20:15 UTC
[01/34] lucenenet git commit: Changing static variables to static
readonly
Repository: lucenenet
Updated Branches:
refs/heads/lucenenet-indexablefield-api [created] 69a7ce8e1
Changing static variables to static readonly
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/93acfd93
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/93acfd93
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/93acfd93
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 93acfd936b64d602e3e59d56c9d4b53e2820214b
Parents: 0af102e
Author: Connie Yau <co...@microsoft.com>
Authored: Mon Jul 11 16:33:47 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Tue Jul 12 05:25:40 2016 -0700
----------------------------------------------------------------------
.../Util/LuceneTestCase.cs | 46 ++++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/93acfd93/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 147c4a7..69de2b0 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -286,13 +286,13 @@ namespace Lucene.Net.Util
/// Use this constant when creating Analyzers and any other version-dependent stuff.
/// <p><b>NOTE:</b> Change this when development starts for new Lucene version:
/// </summary>
- public static LuceneVersion TEST_VERSION_CURRENT = LuceneVersion.LUCENE_48;
+ public static readonly LuceneVersion TEST_VERSION_CURRENT = LuceneVersion.LUCENE_48;
/// <summary>
/// True if and only if tests are run in verbose mode. If this flag is false
/// tests are not expected to print any messages.
/// </summary>
- public static bool VERBOSE = RandomizedTest.SystemPropertyAsBoolean("tests.verbose",
+ public static readonly bool VERBOSE = RandomizedTest.SystemPropertyAsBoolean("tests.verbose",
#if DEBUG
true
#else
@@ -302,65 +302,65 @@ namespace Lucene.Net.Util
/// <summary>
/// TODO: javadoc? </summary>
- public static bool INFOSTREAM = RandomizedTest.SystemPropertyAsBoolean("tests.infostream", VERBOSE);
+ public static readonly bool INFOSTREAM = RandomizedTest.SystemPropertyAsBoolean("tests.infostream", VERBOSE);
/// <summary>
/// A random multiplier which you should use when writing random tests:
/// multiply it by the number of iterations to scale your tests (for nightly builds).
/// </summary>
- public static int RANDOM_MULTIPLIER = RandomizedTest.SystemPropertyAsInt("tests.multiplier", 1);
+ public static readonly int RANDOM_MULTIPLIER = RandomizedTest.SystemPropertyAsInt("tests.multiplier", 1);
/// <summary>
/// TODO: javadoc? </summary>
- public static string DEFAULT_LINE_DOCS_FILE = "europarl.lines.txt.gz";
+ public static readonly string DEFAULT_LINE_DOCS_FILE = "europarl.lines.txt.gz";
/// <summary>
/// TODO: javadoc? </summary>
- public static string JENKINS_LARGE_LINE_DOCS_FILE = "enwiki.random.lines.txt";
+ public static readonly string JENKINS_LARGE_LINE_DOCS_FILE = "enwiki.random.lines.txt";
/// <summary>
/// Gets the codec to run tests with. </summary>
- public static string TEST_CODEC = SystemProperties.GetProperty("tests.codec", "random");
+ public static readonly string TEST_CODEC = SystemProperties.GetProperty("tests.codec", "random");
/// <summary>
/// Gets the postingsFormat to run tests with. </summary>
- public static string TEST_POSTINGSFORMAT = SystemProperties.GetProperty("tests.postingsformat", "random");
+ public static readonly string TEST_POSTINGSFORMAT = SystemProperties.GetProperty("tests.postingsformat", "random");
/// <summary>
/// Gets the docValuesFormat to run tests with </summary>
- public static string TEST_DOCVALUESFORMAT = SystemProperties.GetProperty("tests.docvaluesformat", "random");
+ public static readonly string TEST_DOCVALUESFORMAT = SystemProperties.GetProperty("tests.docvaluesformat", "random");
/// <summary>
/// Gets the directory to run tests with </summary>
- public static string TEST_DIRECTORY = SystemProperties.GetProperty("tests.directory", "random");
+ public static readonly string TEST_DIRECTORY = SystemProperties.GetProperty("tests.directory", "random");
/// <summary>
/// the line file used by LineFileDocs </summary>
- public static string TEST_LINE_DOCS_FILE = SystemProperties.GetProperty("tests.linedocsfile", DEFAULT_LINE_DOCS_FILE);
+ public static readonly string TEST_LINE_DOCS_FILE = SystemProperties.GetProperty("tests.linedocsfile", DEFAULT_LINE_DOCS_FILE);
/// <summary>
/// Whether or not <seealso cref="Nightly"/> tests should run. </summary>
- public static bool TEST_NIGHTLY = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_NIGHTLY, false);
+ public static readonly bool TEST_NIGHTLY = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_NIGHTLY, false);
/// <summary>
/// Whether or not <seealso cref="Weekly"/> tests should run. </summary>
- public static bool TEST_WEEKLY = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_WEEKLY, false);
+ public static readonly bool TEST_WEEKLY = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_WEEKLY, false);
/// <summary>
/// Whether or not <seealso cref="AwaitsFix"/> tests should run. </summary>
- public static bool TEST_AWAITSFIX = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_AWAITSFIX, false);
+ public static readonly bool TEST_AWAITSFIX = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_AWAITSFIX, false);
/// <summary>
/// Whether or not <seealso cref="Slow"/> tests should run. </summary>
- public static bool TEST_SLOW = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_SLOW, false);
+ public static readonly bool TEST_SLOW = RandomizedTest.SystemPropertyAsBoolean(SYSPROP_SLOW, false);
/// <summary>
/// Throttling, see <seealso cref="MockDirectoryWrapper#setThrottling(Throttling)"/>. </summary>
- public static MockDirectoryWrapper.Throttling_e TEST_THROTTLING = TEST_NIGHTLY ? MockDirectoryWrapper.Throttling_e.SOMETIMES : MockDirectoryWrapper.Throttling_e.NEVER;
+ public static readonly MockDirectoryWrapper.Throttling_e TEST_THROTTLING = TEST_NIGHTLY ? MockDirectoryWrapper.Throttling_e.SOMETIMES : MockDirectoryWrapper.Throttling_e.NEVER;
/// <summary>
/// Leave temporary files on disk, even on successful runs. </summary>
- public static bool LEAVE_TEMPORARY;
+ public static readonly bool LEAVE_TEMPORARY;
static LuceneTestCase()
{
@@ -400,17 +400,17 @@ namespace Lucene.Net.Util
/// <seealso> cref= SystemPropertiesInvariantRule </seealso>
/// <seealso> cref= #ruleChain </seealso>
/// <seealso> cref= #classRules </seealso>
- private static string[] IGNORED_INVARIANT_PROPERTIES = { "user.timezone", "java.rmi.server.randomIDs" };
+ private static readonly string[] IGNORED_INVARIANT_PROPERTIES = { "user.timezone", "java.rmi.server.randomIDs" };
/// <summary>
/// Filesystem-based <seealso cref="Directory"/> implementations. </summary>
- private static IList<string> FS_DIRECTORIES = Arrays.AsList("SimpleFSDirectory", "NIOFSDirectory", "MMapDirectory");
+ private static readonly IList<string> FS_DIRECTORIES = Arrays.AsList("SimpleFSDirectory", "NIOFSDirectory", "MMapDirectory");
/// <summary>
/// All <seealso cref="Directory"/> implementations. </summary>
- private static IList<string> CORE_DIRECTORIES;
+ private static readonly IList<string> CORE_DIRECTORIES;
- protected static HashSet<string> DoesntSupportOffsets = new HashSet<string>(Arrays.AsList("Lucene3x", "MockFixedIntBlock", "MockVariableIntBlock", "MockSep", "MockRandom"));
+ protected static readonly HashSet<string> DoesntSupportOffsets = new HashSet<string>(Arrays.AsList("Lucene3x", "MockFixedIntBlock", "MockVariableIntBlock", "MockSep", "MockRandom"));
// -----------------------------------------------------------------
// Fields initialized in class or instance rules.
@@ -443,7 +443,7 @@ namespace Lucene.Net.Util
/// <summary>
/// Suite failure marker (any error in the test or suite scope).
/// </summary>
- public static /*TestRuleMarkFailure*/ bool SuiteFailureMarker = true; // Means: was successful
+ public static readonly /*TestRuleMarkFailure*/ bool SuiteFailureMarker = true; // Means: was successful
/// <summary>
/// Ignore tests after hitting a designated number of initial failures. this
@@ -473,7 +473,7 @@ namespace Lucene.Net.Util
/// Max 10mb of static data stored in a test suite class after the suite is complete.
/// Prevents static data structures leaking and causing OOMs in subsequent tests.
/// </summary>
- private static long STATIC_LEAK_THRESHOLD = 10 * 1024 * 1024;
+ private static readonly long STATIC_LEAK_THRESHOLD = 10 * 1024 * 1024;
/// <summary>
/// By-name list of ignored types like loggers etc. </summary>
[07/34] lucenenet git commit: Fixing build errors from adding extra
params to RandomIndexWriter
Posted by sy...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
index 592048c..0e6915a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search
string[] values = new string[] { "1", "2", "3", "4" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < values.Length; i++)
{
Document doc = new Document();
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search
// changes, we have a test to back it up.
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Commit();
IndexReader ir = writer.Reader;
writer.Dispose();
@@ -321,7 +321,7 @@ namespace Lucene.Net.Search
public virtual void TestEmbeddedBooleanScorer()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "doctors are people who prescribe medicines of which they know little, to cure diseases of which they know less, in human beings of whom they know nothing", Field.Store.NO));
w.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
index 393ddab..180d890 100644
--- a/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- Iw = new RandomIndexWriter(Random(), Dir);
+ Iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field idField = new StringField("id", "", Field.Store.NO);
doc.Add(idField);
@@ -173,7 +173,7 @@ namespace Lucene.Net.Search
public virtual void TestCachingWorks()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Dispose();
IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -201,7 +201,7 @@ namespace Lucene.Net.Search
public virtual void TestNullDocIdSet()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Dispose();
IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -240,7 +240,7 @@ namespace Lucene.Net.Search
public virtual void TestNullDocIdSetIterator()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Dispose();
IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -324,7 +324,7 @@ namespace Lucene.Net.Search
public virtual void TestIsCacheAble()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.AddDocument(new Document());
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs b/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
index d95f108..5097f22 100644
--- a/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
@@ -125,7 +125,7 @@ namespace Lucene.Net.Search
try
{
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("field", "term", Field.Store.NO));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDateSort.cs b/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
index b92cdf3..122c9f1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
base.SetUp();
// Create an index writer.
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// oldest doc:
// Add the first document. text = "Document 1" dateTime = Oct 10 03:25:22 EDT 2007
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs b/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
index 1caf080..a4a1569 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search
// Tests that if a Filter produces a null DocIdSet, which is given to
// IndexSearcher, everything works fine. this came up in LUCENE-1754.
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("c", "val", Field.Store.NO));
writer.AddDocument(doc);
@@ -185,7 +185,7 @@ namespace Lucene.Net.Search
public virtual void TestNullIteratorFilteredDocIdSet()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("c", "val", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs b/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
index 8c9eae4..b7708c3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
public virtual void TestSimple()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field field = NewTextField("foo", "", Field.Store.NO);
doc.Add(field);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs b/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
index 5eca218..e59f004 100644
--- a/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- Writer = new RandomIndexWriter(Random(), Dir);
+ Writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
index e924529..f6e5977 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search
public virtual void TestFuzziness()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
AddDoc("aaaaa", writer);
AddDoc("aaaab", writer);
AddDoc("aaabb", writer);
@@ -244,7 +244,7 @@ namespace Lucene.Net.Search
public virtual void TestTieBreaker()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
AddDoc("a123456", writer);
AddDoc("c123456", writer);
AddDoc("d123456", writer);
@@ -282,7 +282,7 @@ namespace Lucene.Net.Search
public virtual void TestBoostOnlyRewrite()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
AddDoc("Lucene", writer);
AddDoc("Lucene", writer);
AddDoc("Lucenne", writer);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs b/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
index b14ccb3..f16306d 100644
--- a/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 100; i++)
{
Document doc = new Document();
@@ -117,7 +117,7 @@ namespace Lucene.Net.Search
{
// LUCENE-5128: ensure we get a meaningful message if searchAfter exceeds maxDoc
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
w.AddDocument(new Document());
IndexReader r = w.Reader;
w.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index 8ea7fc5..312bc2a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Search
public static void BeforeClass()
{
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(300);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
index 587adca..82f15e6 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
@@ -408,7 +408,7 @@ namespace Lucene.Net.Search
tokens[2].Append("c");
tokens[2].PositionIncrement = 0;
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new TextField("field", new CannedTokenStream(tokens)));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index 548e64e..c7f05e5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search
public static void BeforeClass()
{
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Dispose();
Reader = DirectoryReader.Open(Directory);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index de56994..014b3ab 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -265,7 +265,7 @@ namespace Lucene.Net.Search
public virtual void TestPhraseQueryInConjunctionScorer()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Documents.Document doc = new Documents.Document();
doc.Add(NewTextField("source", "marketing info", Field.Store.YES));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs b/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
index 44ce0ab..f3461ea 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
@@ -90,7 +90,7 @@ namespace Lucene.Net.Search
}
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Commit();
IndexReader ir = writer.Reader;
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
index 87773f9..6e33a0b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Search
Directory directory = NewDirectory();
string[] categories = new string[] { "/Computers/Linux", "/Computers/Mac/One", "/Computers/Mac/Two", "/Computers/Windows" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < categories.Length; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index a4b7b55..d1b0c90 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
public static void BeforeClass()
{
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field field = NewStringField(FIELD, "meaninglessnames", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
index b1e4c16..fd5b85a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Search
Directory directory = NewDirectory();
string[] categories = new string[] { "/Computers", "/Computers/Mac", "/Computers/Windows" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < categories.Length; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
index 235ff28..b9ab94b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search
public virtual void TestBasic()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
public virtual void TestCustomCombine()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search
public virtual void TestExplain()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -277,7 +277,7 @@ namespace Lucene.Net.Search
public virtual void TestMissingSecondPassScore()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -335,7 +335,7 @@ namespace Lucene.Net.Search
{
Directory dir = NewDirectory();
int numDocs = AtLeast(1000);
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int[] idToNum = new int[numDocs];
int maxValue = TestUtil.NextInt(Random(), 10, 1000000);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs b/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
index adbdff4..1de5e61 100644
--- a/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Search
public virtual void TestBasic()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "value", Field.Store.NO));
writer.AddDocument(doc);
@@ -139,7 +139,7 @@ namespace Lucene.Net.Search
public virtual void TestThousandDocuments()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 1000; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs b/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
index d4811c0..fc7ebcc 100644
--- a/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField(FN, "the quick brown fox jumps over the lazy ??? dog 493432 49344", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs b/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
index 17c6450..42cef6e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Search
public virtual void TestGetScores()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.Commit();
IndexReader ir = writer.Reader;
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
index c11c9f6..e76a79d 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search
}
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(200);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs b/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
index c4d033a..ed6f1df 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Search
public virtual void Test()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
long startTime = Environment.TickCount;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
index a175d0f..97c862c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
@@ -581,7 +581,7 @@ namespace Lucene.Net.Search
// make sure that maybeRefreshBlocking releases the lock, otherwise other
// threads cannot obtain it.
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
w.Dispose();
SearcherManager sm = new SearcherManager(dir, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
index f566da9..5cf923c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
@@ -290,7 +290,7 @@ namespace Lucene.Net.Search
public virtual void TestSlopWithHoles()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.OmitNorms = true;
Field f = new Field("lyrics", "", customType);
@@ -329,7 +329,7 @@ namespace Lucene.Net.Search
string document = "drug druggy drug drug drug";
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
iw.AddDocument(doc);
@@ -355,7 +355,7 @@ namespace Lucene.Net.Search
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
iw.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSort.cs b/src/Lucene.Net.Tests/core/Search/TestSort.cs
index 57b4f82..29991d1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSort.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Search
public virtual void TestString()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search
public virtual void TestStringMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -130,7 +130,7 @@ namespace Lucene.Net.Search
public virtual void TestStringReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "bar", Field.Store.YES));
writer.AddDocument(doc);
@@ -159,7 +159,7 @@ namespace Lucene.Net.Search
public virtual void TestStringVal()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -188,7 +188,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search
public virtual void TestStringMissingSortedFirst()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -257,7 +257,7 @@ namespace Lucene.Net.Search
public virtual void TestStringMissingSortedFirstReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -292,7 +292,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValMissingSortedLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -328,7 +328,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValMissingSortedLastReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -362,7 +362,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "bar", Field.Store.YES));
writer.AddDocument(doc);
@@ -391,7 +391,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldDoc()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.NO));
writer.AddDocument(doc);
@@ -420,7 +420,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldDocReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.NO));
writer.AddDocument(doc);
@@ -449,7 +449,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldScore()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("value", "foo bar bar bar bar", Field.Store.NO));
writer.AddDocument(doc);
@@ -483,7 +483,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldScoreReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("value", "foo bar bar bar bar", Field.Store.NO));
writer.AddDocument(doc);
@@ -515,7 +515,7 @@ namespace Lucene.Net.Search
public virtual void TestByte()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "23", Field.Store.YES));
writer.AddDocument(doc);
@@ -548,7 +548,7 @@ namespace Lucene.Net.Search
public virtual void TestByteMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -580,7 +580,7 @@ namespace Lucene.Net.Search
public virtual void TestByteMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -614,7 +614,7 @@ namespace Lucene.Net.Search
public virtual void TestByteReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "23", Field.Store.YES));
writer.AddDocument(doc);
@@ -647,7 +647,7 @@ namespace Lucene.Net.Search
public virtual void TestShort()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300", Field.Store.YES));
writer.AddDocument(doc);
@@ -680,7 +680,7 @@ namespace Lucene.Net.Search
public virtual void TestShortMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -712,7 +712,7 @@ namespace Lucene.Net.Search
public virtual void TestShortMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -746,7 +746,7 @@ namespace Lucene.Net.Search
public virtual void TestShortReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300", Field.Store.YES));
writer.AddDocument(doc);
@@ -779,7 +779,7 @@ namespace Lucene.Net.Search
public virtual void TestInt()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300000", Field.Store.YES));
writer.AddDocument(doc);
@@ -812,7 +812,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -844,7 +844,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -878,7 +878,7 @@ namespace Lucene.Net.Search
public virtual void TestIntReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300000", Field.Store.YES));
writer.AddDocument(doc);
@@ -911,7 +911,7 @@ namespace Lucene.Net.Search
public virtual void TestLong()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
writer.AddDocument(doc);
@@ -944,7 +944,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -976,7 +976,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1010,7 +1010,7 @@ namespace Lucene.Net.Search
public virtual void TestLongReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
writer.AddDocument(doc);
@@ -1043,7 +1043,7 @@ namespace Lucene.Net.Search
public virtual void TestFloat()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1076,7 +1076,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1108,7 +1108,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1142,7 +1142,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1175,7 +1175,7 @@ namespace Lucene.Net.Search
public virtual void TestDouble()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1212,7 +1212,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleSignedZero()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "+0", Field.Store.YES));
writer.AddDocument(doc);
@@ -1242,7 +1242,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1278,7 +1278,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1316,7 +1316,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1480,7 +1480,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1537,7 +1537,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1595,7 +1595,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1652,7 +1652,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1709,7 +1709,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1767,7 +1767,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1821,7 +1821,7 @@ namespace Lucene.Net.Search
public virtual void TestSortOneDocument()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -1845,7 +1845,7 @@ namespace Lucene.Net.Search
public virtual void TestSortOneDocumentWithScores()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -1872,7 +1872,7 @@ namespace Lucene.Net.Search
public virtual void TestSortTwoFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("tievalue", "tied", Field.Store.NO));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -1902,7 +1902,7 @@ namespace Lucene.Net.Search
public virtual void TestScore()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "bar", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
index eb4eb94..ae71595 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
public virtual void TestString()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("foo")));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -94,7 +94,7 @@ namespace Lucene.Net.Search
public virtual void TestStringReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("bar")));
doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search
public virtual void TestStringVal()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new BinaryDocValuesField("value", new BytesRef("foo")));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -158,7 +158,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new BinaryDocValuesField("value", new BytesRef("bar")));
doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -190,7 +190,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValSorted()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("foo")));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValReverseSorted()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("bar")));
doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -254,7 +254,7 @@ namespace Lucene.Net.Search
public virtual void TestByte()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 23));
doc.Add(NewStringField("value", "23", Field.Store.YES));
@@ -291,7 +291,7 @@ namespace Lucene.Net.Search
public virtual void TestByteReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 23));
doc.Add(NewStringField("value", "23", Field.Store.YES));
@@ -328,7 +328,7 @@ namespace Lucene.Net.Search
public virtual void TestShort()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300));
doc.Add(NewStringField("value", "300", Field.Store.YES));
@@ -365,7 +365,7 @@ namespace Lucene.Net.Search
public virtual void TestShortReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300));
doc.Add(NewStringField("value", "300", Field.Store.YES));
@@ -402,7 +402,7 @@ namespace Lucene.Net.Search
public virtual void TestInt()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300000));
doc.Add(NewStringField("value", "300000", Field.Store.YES));
@@ -439,7 +439,7 @@ namespace Lucene.Net.Search
public virtual void TestIntReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300000));
doc.Add(NewStringField("value", "300000", Field.Store.YES));
@@ -476,7 +476,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -510,7 +510,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -546,7 +546,7 @@ namespace Lucene.Net.Search
public virtual void TestLong()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 3000000000L));
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
@@ -583,7 +583,7 @@ namespace Lucene.Net.Search
public virtual void TestLongReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 3000000000L));
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
@@ -620,7 +620,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -654,7 +654,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -690,7 +690,7 @@ namespace Lucene.Net.Search
public virtual void TestFloat()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new FloatDocValuesField("value", 30.1F));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -727,7 +727,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new FloatDocValuesField("value", 30.1F));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -764,7 +764,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -798,7 +798,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -834,7 +834,7 @@ namespace Lucene.Net.Search
public virtual void TestDouble()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new DoubleDocValuesField("value", 30.1));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -876,7 +876,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleSignedZero()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new DoubleDocValuesField("value", +0D));
doc.Add(NewStringField("value", "+0", Field.Store.YES));
@@ -908,7 +908,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new DoubleDocValuesField("value", 30.1));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -950,7 +950,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -989,7 +989,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs b/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
index a7a5673..e51f798 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "1", Field.Store.YES));
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search
{
Directory dir = NewDirectory();
int numDocs = AtLeast(1000);
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int[] idToNum = new int[numDocs];
int maxValue = TestUtil.NextInt(Random(), 10, 1000000);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
index d5097ec..c767ede 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Search
// populate an index with 30 documents, this should be enough for the test.
// The documents have no content - the test uses MatchAllDocsQuery().
Dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 30; i++)
{
writer.AddDocument(new Document());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
index 63bbcf9..df1c4ce 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search
{
dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// w.setDoRandomForceMerge(false);
// w.w.getConfig().SetMaxBufferedDocs(AtLeast(100));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
index 4ec8488..d282f76 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
index 6733998..eb19642 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Search
public virtual void TestOutOfOrderCollection()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 10; i++)
{
writer.AddDocument(new Document());
[23/34] lucenenet git commit: Changing methods that do not have to be
static to non-static. (ie. TestFixture TearDown/Setup)
Posted by sy...@apache.org.
Changing methods that do not have to be static to non-static. (ie. TestFixture TearDown/Setup)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c15ab48b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c15ab48b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c15ab48b
Branch: refs/heads/lucenenet-indexablefield-api
Commit: c15ab48b5d3f4b75672ef06c90c7ae645f9cd3e9
Parents: 3930ae4
Author: Connie Yau <co...@microsoft.com>
Authored: Sun Jul 31 22:53:24 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Sun Jul 31 22:53:24 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs | 8 ++++----
.../Function/FunctionTestSetup.cs | 4 ++--
src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs | 10 +++++-----
src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs | 4 ++--
.../core/Search/FuzzyTermOnShortTermsTest.cs | 2 +-
.../core/Search/Payloads/TestPayloadNearQuery.cs | 2 +-
.../core/Search/Payloads/TestPayloadTermQuery.cs | 2 +-
src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs | 2 +-
.../core/Search/Spans/TestFieldMaskingSpanQuery.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestBoolean2.cs | 2 +-
.../core/Search/TestBooleanMinShouldMatch.cs | 2 +-
src/Lucene.Net.Tests/core/Search/TestExplanations.cs | 2 +-
.../core/Search/TestMultiTermConstantScore.cs | 2 +-
.../core/Search/TestMultiTermQueryRewrites.cs | 2 +-
src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs | 2 +-
.../core/Search/TestPrefixInBooleanQuery.cs | 2 +-
src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs b/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs
index 637cd4a..3eeaebb 100644
--- a/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs
+++ b/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Tests.Join
StringAssert.Contains(ToChildBlockJoinQuery.InvalidQueryMessage, ex.Message);
}
- private static IList<Document> CreateDocsForSegment(int segmentNumber)
+ private IList<Document> CreateDocsForSegment(int segmentNumber)
{
IList<IList<Document>> blocks = new List<IList<Document>>(AMOUNT_OF_PARENT_DOCS);
for (int i = 0; i < AMOUNT_OF_PARENT_DOCS; i++)
@@ -143,7 +143,7 @@ namespace Lucene.Net.Tests.Join
return result;
}
- private static IList<Document> CreateParentDocWithChildren(int segmentNumber, int parentNumber)
+ private IList<Document> CreateParentDocWithChildren(int segmentNumber, int parentNumber)
{
IList<Document> result = new List<Document>(AMOUNT_OF_CHILD_DOCS + 1);
for (int i = 0; i < AMOUNT_OF_CHILD_DOCS; i++)
@@ -154,7 +154,7 @@ namespace Lucene.Net.Tests.Join
return result;
}
- private static Document CreateParentDoc(int segmentNumber, int parentNumber)
+ private Document CreateParentDoc(int segmentNumber, int parentNumber)
{
Document result = new Document();
result.Add(NewStringField("id", CreateFieldValue(segmentNumber * AMOUNT_OF_PARENT_DOCS + parentNumber), Field.Store.YES));
@@ -162,7 +162,7 @@ namespace Lucene.Net.Tests.Join
return result;
}
- private static Document CreateChildDoc(int segmentNumber, int parentNumber, int childNumber)
+ private Document CreateChildDoc(int segmentNumber, int parentNumber, int childNumber)
{
Document result = new Document();
result.Add(NewStringField("id", CreateFieldValue(segmentNumber * AMOUNT_OF_PARENT_DOCS + parentNumber, childNumber), Field.Store.YES));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
index f06b671..a94231c 100644
--- a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Tests.Queries.Function
}
- protected internal static void CreateIndex(bool doMultiSegment)
+ protected internal void CreateIndex(bool doMultiSegment)
{
if (VERBOSE)
{
@@ -111,7 +111,7 @@ namespace Lucene.Net.Tests.Queries.Function
}
}
- private static void AddDoc(RandomIndexWriter iw, int i)
+ private void AddDoc(RandomIndexWriter iw, int i)
{
Document d = new Document();
Field f;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
index b528d57..3b33bdc 100644
--- a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
+++ b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
base.TearDown();
}
- private static void AddDoc(RandomIndexWriter writer, string text)
+ private void AddDoc(RandomIndexWriter writer, string text)
{
Document doc = new Document();
doc.Add(NewTextField("text", text, Field.Store.YES));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 3646aef..aa61570 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -497,7 +497,7 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- internal static void AddDocumentWithFields(IndexWriter writer)
+ internal void AddDocumentWithFields(IndexWriter writer)
{
Document doc = new Document();
@@ -510,7 +510,7 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
- internal static void AddDocumentWithDifferentFields(IndexWriter writer)
+ internal void AddDocumentWithDifferentFields(IndexWriter writer)
{
Document doc = new Document();
@@ -523,7 +523,7 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
- internal static void AddDocumentWithTermVectorFields(IndexWriter writer)
+ internal void AddDocumentWithTermVectorFields(IndexWriter writer)
{
Document doc = new Document();
FieldType customType5 = new FieldType(TextField.TYPE_STORED);
@@ -547,7 +547,7 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
- internal static void AddDoc(IndexWriter writer, string value)
+ internal void AddDoc(IndexWriter writer, string value)
{
Document doc = new Document();
doc.Add(NewTextField("content", value, Field.Store.NO));
@@ -718,7 +718,7 @@ namespace Lucene.Net.Index
d.Dispose();
}
- internal static Document CreateDocument(string id)
+ internal Document CreateDocument(string id)
{
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_STORED);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
index adaa8c8..29ef55e 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Search
}
[TestFixtureSetUp]
- public static void BeforeClassBaseTestRangeFilter()
+ public void BeforeClassBaseTestRangeFilter()
{
MaxId = AtLeast(500);
SignedIndexDir = new TestIndex(Random(), int.MaxValue, int.MinValue, true);
@@ -118,7 +118,7 @@ namespace Lucene.Net.Search
UnsignedIndexDir = null;
}
- private static IndexReader Build(Random random, TestIndex index)
+ private IndexReader Build(Random random, TestIndex index)
{
/* build an index */
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
index b668aad..a6678f6 100644
--- a/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
+++ b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Search
}
}
- public static Directory GetDirectory(Analyzer analyzer, string[] vals)
+ public Directory GetDirectory(Analyzer analyzer, string[] vals)
{
Directory directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).SetMaxBufferedDocs(TestUtil.NextInt(Random(), 100, 1000)).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
index 9b9bada..7b756ce 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search.Payloads
}
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(Similarity));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
index 9226a89..7e5038c 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -116,7 +116,7 @@ namespace Lucene.Net.Search.Payloads
}
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(Similarity).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
index 0ccea8f..968becb 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -94,7 +94,7 @@ namespace Lucene.Net.Search.Spans
internal static Analyzer SimplePayloadAnalyzer;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
SimplePayloadAnalyzer = new AnalyzerAnonymousInnerClassHelper();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index fcdada5..3d3bf4a 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search.Spans
return doc;
}
- protected internal static Field GetField(string name, string value)
+ protected internal Field GetField(string name, string value)
{
return NewTextField(name, value, Field.Store.NO);
}
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search.Spans
protected internal static IndexReader Reader;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index 360c465..cb2ce62 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search
private static int MulFactor;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index f1ea5f6..450cd73 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
private static IndexSearcher s;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
string[] data = new string[] { "A 1 2 3 4 5 6", "Z 4 5 6", null, "B 2 4 5 6", "Y 3 5 6", null, "C 3 6", "X 4 5 6" };
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index 7a677ec..4cd748d 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Search
}
[TestFixtureSetUp]
- public static void BeforeClassTestExplanations()
+ public void BeforeClassTestExplanations()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
index f120af5..60105a1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
}
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
string[] data = new string[] { "A 1 2 3 4 5 6", "Z 4 5 6", null, "B 2 4 5 6", "Y 3 5 6", null, "C 3 6", "X 4 5 6" };
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
index 94c5087..1fc0a89 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search
internal static IndexSearcher Searcher, MultiSearcher, MultiSearcherDupls;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Dir = NewDirectory();
Sdir1 = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index 014b3ab..ec8cd62 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Search
private static Directory Directory;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index d1b0c90..f0a291b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Search
private static IndexSearcher Searcher;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c15ab48b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
index 8b8f358..1b60b0e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Search
private static IndexSearcher s;
[TestFixtureSetUp]
- public static void MakeIndex()
+ public void MakeIndex()
{
Dir = new RAMDirectory();
RandomIndexWriter w = new RandomIndexWriter(Random(), Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy()));
[14/34] lucenenet git commit: Fixing NewField build errors in
ThreadingIndexingAndSearching
Posted by sy...@apache.org.
Fixing NewField build errors in ThreadingIndexingAndSearching
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/72840c65
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/72840c65
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/72840c65
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 72840c6544d310155d7e1849283d9ec38bab79c3
Parents: 9591b70
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 15:07:12 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 15:07:12 2016 -0700
----------------------------------------------------------------------
.../Index/ThreadedIndexingAndSearchingTestCase.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/72840c65/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index 9aad57a..72e6994 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -202,7 +202,7 @@ namespace Lucene.Net.Index
if (Random().NextBoolean())
{
addedField = "extra" + Random().Next(40);
- doc.Add(NewTextField(addedField, "a random field", Field.Store.YES));
+ doc.Add(OuterInstance.NewTextField(addedField, "a random field", Field.Store.YES));
}
else
{
@@ -231,7 +231,7 @@ namespace Lucene.Net.Index
packID = OuterInstance.PackCount.IncrementAndGet() + "";
}
- Field packIDField = NewStringField("packID", packID, Field.Store.YES);
+ Field packIDField = OuterInstance.NewStringField("packID", packID, Field.Store.YES);
IList<string> docIDs = new List<string>();
SubDocs subDocs = new SubDocs(packID, docIDs);
IList<Document> docsList = new List<Document>();
[19/34] lucenenet git commit: Changed IndexableField.GetBoost() to
IndexableField.Boost (method into a property) for API consistency.
Posted by sy...@apache.org.
Changed IndexableField.GetBoost() to IndexableField.Boost (method into a property) for API consistency.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/87aa4246
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/87aa4246
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/87aa4246
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 87aa4246960f41cf2df24e2561f2ef981f14f60d
Parents: b83de2c
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Jul 29 00:46:54 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Jul 29 00:46:54 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Document/Field.cs | 17 ++++++-----------
src/Lucene.Net.Core/Index/DocInverterPerField.cs | 4 ++--
src/Lucene.Net.Core/Index/IndexableField.cs | 2 +-
src/Lucene.Net.Tests/core/Document/TestField.cs | 4 ++--
.../core/Index/TestIndexWriterExceptions.cs | 4 ++--
.../core/Index/TestIndexableField.cs | 4 ++--
6 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/87aa4246/src/Lucene.Net.Core/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Field.cs b/src/Lucene.Net.Core/Document/Field.cs
index 6fcdc2e..3e6f834 100644
--- a/src/Lucene.Net.Core/Document/Field.cs
+++ b/src/Lucene.Net.Core/Document/Field.cs
@@ -486,22 +486,17 @@ namespace Lucene.Net.Documents
}
/// <summary>
- /// {@inheritDoc}
- /// <p>
- /// The default value is <code>1.0f</code> (no boost). </summary>
- /// <seealso> cref= #setBoost(float) </seealso>
- public float GetBoost()
- {
- return Boost_Renamed;
- }
-
- /// <summary>
- /// Sets the boost factor on this field. </summary>
+ /// Gets or sets the boost factor on this field. </summary>
+ /// <remarks>The default value is <code>1.0f</code> (no boost).</remarks>
/// <exception cref="IllegalArgumentException"> if this field is not indexed,
/// or if it omits norms. </exception>
/// <seealso> cref= #boost() </seealso>
public virtual float Boost
{
+ get
+ {
+ return Boost_Renamed;
+ }
set
{
if (value != 1.0f)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/87aa4246/src/Lucene.Net.Core/Index/DocInverterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocInverterPerField.cs b/src/Lucene.Net.Core/Index/DocInverterPerField.cs
index e6c9ac4..4dab2e9 100644
--- a/src/Lucene.Net.Core/Index/DocInverterPerField.cs
+++ b/src/Lucene.Net.Core/Index/DocInverterPerField.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Index
bool analyzed = fieldType.Tokenized && DocState.Analyzer != null;
// if the field omits norms, the boost cannot be indexed.
- if (fieldType.OmitNorms && field.GetBoost() != 1.0f)
+ if (fieldType.OmitNorms && field.Boost != 1.0f)
{
throw new System.NotSupportedException("You cannot set an index-time boost: norms are omitted for field '" + field.Name + "'");
}
@@ -234,7 +234,7 @@ namespace Lucene.Net.Index
}
FieldState.Offset_Renamed += analyzed ? DocState.Analyzer.GetOffsetGap(fieldInfo.Name) : 0;
- FieldState.Boost_Renamed *= field.GetBoost();
+ FieldState.Boost_Renamed *= field.Boost;
}
// LUCENE-2387: don't hang onto the field, so GC can
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/87aa4246/src/Lucene.Net.Core/Index/IndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexableField.cs b/src/Lucene.Net.Core/Index/IndexableField.cs
index cf4005e..fbd6a85 100644
--- a/src/Lucene.Net.Core/Index/IndexableField.cs
+++ b/src/Lucene.Net.Core/Index/IndexableField.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Index
/// </summary>
/// <seealso cref= Similarity#computeNorm(FieldInvertState) </seealso>
/// <seealso cref= DefaultSimilarity#encodeNormValue(float) </seealso>
- float GetBoost();
+ float Boost { get; }
/// <summary>
/// Non-null if this field has a binary value </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/87aa4246/src/Lucene.Net.Tests/core/Document/TestField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestField.cs b/src/Lucene.Net.Tests/core/Document/TestField.cs
index 8a0bde7..ab1016f 100644
--- a/src/Lucene.Net.Tests/core/Document/TestField.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestField.cs
@@ -280,7 +280,7 @@ namespace Lucene.Net.Document
field.TokenStream = new CannedTokenStream(new Token("foo", 0, 3));
Assert.AreEqual("baz", field.StringValue);
- Assert.AreEqual(5f, field.GetBoost(), 0f);
+ Assert.AreEqual(5f, field.Boost, 0f);
}
}
@@ -303,7 +303,7 @@ namespace Lucene.Net.Document
field.TokenStream = new CannedTokenStream(new Token("foo", 0, 3));
Assert.IsNotNull(field.ReaderValue);
- Assert.AreEqual(5f, field.GetBoost(), 0f);
+ Assert.AreEqual(5f, field.Boost, 0f);
}
/* TODO: this is pretty expert and crazy
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/87aa4246/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index a80f4ee..cfc66b4 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -2014,9 +2014,9 @@ namespace Lucene.Net.Index
get { return StringField.TYPE_NOT_STORED; }
}
- public float GetBoost()
+ public float Boost
{
- return 5f;
+ get { return 5f; }
}
public BytesRef BinaryValue()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/87aa4246/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index 6da64d2..8790059 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -157,9 +157,9 @@ namespace Lucene.Net.Index
get { return "f" + Counter; }
}
- public float GetBoost()
+ public float Boost
{
- return 1.0f + (float)Random().NextDouble();
+ get { return 1.0f + (float)Random().NextDouble(); }
}
public BytesRef BinaryValue()
[26/34] lucenenet git commit: Passing Similarity and TimeZone into
RandomIndexWriter ctors.
Posted by sy...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
index ae71595..a780c85 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
public virtual void TestString()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("foo")));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -94,7 +94,7 @@ namespace Lucene.Net.Search
public virtual void TestStringReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("bar")));
doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search
public virtual void TestStringVal()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new BinaryDocValuesField("value", new BytesRef("foo")));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -158,7 +158,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new BinaryDocValuesField("value", new BytesRef("bar")));
doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -190,7 +190,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValSorted()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("foo")));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValReverseSorted()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new SortedDocValuesField("value", new BytesRef("bar")));
doc.Add(NewStringField("value", "bar", Field.Store.YES));
@@ -254,7 +254,7 @@ namespace Lucene.Net.Search
public virtual void TestByte()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 23));
doc.Add(NewStringField("value", "23", Field.Store.YES));
@@ -291,7 +291,7 @@ namespace Lucene.Net.Search
public virtual void TestByteReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 23));
doc.Add(NewStringField("value", "23", Field.Store.YES));
@@ -328,7 +328,7 @@ namespace Lucene.Net.Search
public virtual void TestShort()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300));
doc.Add(NewStringField("value", "300", Field.Store.YES));
@@ -365,7 +365,7 @@ namespace Lucene.Net.Search
public virtual void TestShortReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300));
doc.Add(NewStringField("value", "300", Field.Store.YES));
@@ -402,7 +402,7 @@ namespace Lucene.Net.Search
public virtual void TestInt()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300000));
doc.Add(NewStringField("value", "300000", Field.Store.YES));
@@ -439,7 +439,7 @@ namespace Lucene.Net.Search
public virtual void TestIntReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 300000));
doc.Add(NewStringField("value", "300000", Field.Store.YES));
@@ -476,7 +476,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -510,7 +510,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -546,7 +546,7 @@ namespace Lucene.Net.Search
public virtual void TestLong()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 3000000000L));
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
@@ -583,7 +583,7 @@ namespace Lucene.Net.Search
public virtual void TestLongReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new NumericDocValuesField("value", 3000000000L));
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
@@ -620,7 +620,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -654,7 +654,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -690,7 +690,7 @@ namespace Lucene.Net.Search
public virtual void TestFloat()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new FloatDocValuesField("value", 30.1F));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -727,7 +727,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new FloatDocValuesField("value", 30.1F));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -764,7 +764,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -798,7 +798,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -834,7 +834,7 @@ namespace Lucene.Net.Search
public virtual void TestDouble()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new DoubleDocValuesField("value", 30.1));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -876,7 +876,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleSignedZero()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new DoubleDocValuesField("value", +0D));
doc.Add(NewStringField("value", "+0", Field.Store.YES));
@@ -908,7 +908,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new DoubleDocValuesField("value", 30.1));
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
@@ -950,7 +950,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -989,7 +989,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSortRandom.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSortRandom.cs b/src/Lucene.Net.Tests/core/Search/TestSortRandom.cs
index f48e716..c354b54 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSortRandom.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSortRandom.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
int NUM_DOCS = AtLeast(100);
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir, Similarity, TimeZone);
bool allowDups = random.NextBoolean();
HashSet<string> seen = new HashSet<string>();
int maxLength = TestUtil.NextInt(random, 5, 100);
@@ -148,7 +148,7 @@ namespace Lucene.Net.Search
Console.WriteLine(" reader=" + r);
}
- IndexSearcher idxS = NewSearcher(r, false);
+ IndexSearcher idxS = NewSearcher(r, false, Similarity);
int ITERS = AtLeast(100);
for (int iter = 0; iter < ITERS; iter++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs b/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
index e51f798..8bc3712 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSortRescorer.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "1", Field.Store.YES));
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search
{
Directory dir = NewDirectory();
int numDocs = AtLeast(1000);
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int[] idToNum = new int[numDocs];
int maxValue = TestUtil.NextInt(Random(), 10, 1000000);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index 959b7c0..bdb76fd 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
private static Directory Directory;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random(), MockTokenizer.SIMPLE, true)).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
index c767ede..6addfca 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Search
// populate an index with 30 documents, this should be enough for the test.
// The documents have no content - the test uses MatchAllDocsQuery().
Dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
for (int i = 0; i < 30; i++)
{
writer.AddDocument(new Document());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
index df1c4ce..a5a1531 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search
{
dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
// w.setDoRandomForceMerge(false);
// w.w.getConfig().SetMaxBufferedDocs(AtLeast(100));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
index d282f76..40cb656 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopFieldCollector.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
index eb19642..536ba3f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopScoreDocCollector.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Search
public virtual void TestOutOfOrderCollection()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
for (int i = 0; i < 10; i++)
{
writer.AddDocument(new Document());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestTotalHitCountCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTotalHitCountCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTotalHitCountCollector.cs
index b353cc9..c403b4a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTotalHitCountCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTotalHitCountCollector.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search
public virtual void TestBasics()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
for (int i = 0; i < 5; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestWildcard.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestWildcard.cs b/src/Lucene.Net.Tests/core/Search/TestWildcard.cs
index 76bee54..d40ff62 100644
--- a/src/Lucene.Net.Tests/core/Search/TestWildcard.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestWildcard.cs
@@ -260,7 +260,7 @@ namespace Lucene.Net.Search
private Directory GetIndexStore(string field, string[] contents)
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
for (int i = 0; i < contents.Length; ++i)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs b/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
index 55c2002..c413f12 100644
--- a/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
@@ -388,7 +388,7 @@ namespace Lucene.Net.Store
try
{
reader = DirectoryReader.Open(Dir);
- searcher = NewSearcher(reader);
+ searcher = OuterInstance.NewSearcher(reader);
}
catch (Exception e)
{
[24/34] lucenenet git commit: Adding TestWriterMethods so that it
does not rely on external static call
Posted by sy...@apache.org.
Adding TestWriterMethods so that it does not rely on external static call
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b9bb484d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b9bb484d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b9bb484d
Branch: refs/heads/lucenenet-indexablefield-api
Commit: b9bb484d00225721081efc02782ce9191be8a83a
Parents: c15ab48
Author: Connie Yau <co...@microsoft.com>
Authored: Sun Jul 31 22:54:23 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Sun Jul 31 22:54:23 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 2 +-
.../core/Index/TestIndexWriterCommit.cs | 56 +++++++++++++-------
.../core/Index/TestIndexWriterForceMerge.cs | 22 +++++++-
3 files changed, 59 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b9bb484d/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
index ca0113b..1091e5e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -890,7 +890,7 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestDisableImpersonation()
{
- Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec() };
+ Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE), new Lucene41RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE), new Lucene42RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE) };
Directory dir = NewDirectory();
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
conf.SetCodec(oldCodecs[Random().Next(oldCodecs.Length)]);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b9bb484d/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
index 3f898e7..3f06879 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
@@ -40,6 +40,8 @@ namespace Lucene.Net.Index
[TestFixture]
public class TestIndexWriterCommit : LuceneTestCase
{
+ private static readonly FieldType StoredTextType = new FieldType(TextField.TYPE_NOT_STORED);
+
/*
* Simple test for "commit on close": open writer then
* add a bunch of docs, making sure reader does not see
@@ -53,7 +55,7 @@ namespace Lucene.Net.Index
IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())));
for (int i = 0; i < 14; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
writer.Dispose();
@@ -71,7 +73,7 @@ namespace Lucene.Net.Index
{
for (int j = 0; j < 11; j++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
IndexReader r = DirectoryReader.Open(dir);
searcher = NewSearcher(r);
@@ -110,7 +112,7 @@ namespace Lucene.Net.Index
IndexWriter writer = new IndexWriter(dir, (IndexWriterConfig)NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMaxBufferedDocs(10));
for (int i = 0; i < 14; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
writer.Dispose();
@@ -124,7 +126,7 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, (IndexWriterConfig)NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetOpenMode(OpenMode_e.APPEND).SetMaxBufferedDocs(10));
for (int j = 0; j < 17; j++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
// Delete all docs:
writer.DeleteDocuments(searchTerm);
@@ -161,7 +163,7 @@ namespace Lucene.Net.Index
{
for (int j = 0; j < 17; j++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
IndexReader r = DirectoryReader.Open(dir);
searcher = NewSearcher(r);
@@ -217,7 +219,7 @@ namespace Lucene.Net.Index
IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).SetMaxBufferedDocs(10).SetReaderPooling(false).SetMergePolicy(NewLogMergePolicy(10)));
for (int j = 0; j < 30; j++)
{
- TestIndexWriter.AddDocWithIndex(writer, j);
+ AddDocWithIndex(writer, j);
}
writer.Dispose();
dir.ResetMaxUsedSizeInBytes();
@@ -227,7 +229,7 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).SetOpenMode(OpenMode_e.APPEND).SetMaxBufferedDocs(10).SetMergeScheduler(new SerialMergeScheduler()).SetReaderPooling(false).SetMergePolicy(NewLogMergePolicy(10)));
for (int j = 0; j < 1470; j++)
{
- TestIndexWriter.AddDocWithIndex(writer, j);
+ AddDocWithIndex(writer, j);
}
long midDiskUsage = dir.MaxUsedSizeInBytes;
dir.ResetMaxUsedSizeInBytes();
@@ -303,7 +305,7 @@ namespace Lucene.Net.Index
IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMaxBufferedDocs(10).SetMergePolicy(NewLogMergePolicy(10)));
for (int j = 0; j < 17; j++)
{
- TestIndexWriter.AddDocWithIndex(writer, j);
+ AddDocWithIndex(writer, j);
}
writer.Dispose();
@@ -370,7 +372,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_THREADS; i++)
{
int finalI = i;
- threads[i] = new ThreadAnonymousInnerClassHelper(dir, w, failed, endTime, finalI);
+ threads[i] = new ThreadAnonymousInnerClassHelper(dir, w, failed, endTime, finalI, NewStringField);
threads[i].Start();
}
for (int i = 0; i < NUM_THREADS; i++)
@@ -384,14 +386,16 @@ namespace Lucene.Net.Index
private class ThreadAnonymousInnerClassHelper : ThreadClass
{
+ private readonly Func<string, string, Field.Store, Field> NewStringField;
private Directory Dir;
private RandomIndexWriter w;
private AtomicBoolean Failed;
private long EndTime;
private int FinalI;
- public ThreadAnonymousInnerClassHelper(Directory dir, RandomIndexWriter w, AtomicBoolean failed, long endTime, int finalI)
+ public ThreadAnonymousInnerClassHelper(Directory dir, RandomIndexWriter w, AtomicBoolean failed, long endTime, int finalI, Func<string, string, Field.Store, Field> newStringField)
{
+ NewStringField = newStringField;
this.Dir = dir;
this.w = w;
this.Failed = failed;
@@ -449,7 +453,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 23; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
DirectoryReader reader = DirectoryReader.Open(dir);
@@ -463,7 +467,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 17; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
Assert.AreEqual(23, reader2.NumDocs);
reader2.Dispose();
@@ -573,7 +577,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 23; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
DirectoryReader reader = DirectoryReader.Open(dir);
@@ -596,7 +600,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 17; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
Assert.AreEqual(23, reader3.NumDocs);
@@ -634,7 +638,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 23; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
DirectoryReader reader = DirectoryReader.Open(dir);
@@ -657,7 +661,7 @@ namespace Lucene.Net.Index
writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())));
for (int i = 0; i < 17; i++)
{
- TestIndexWriter.AddDoc(writer);
+ AddDoc(writer);
}
reader = DirectoryReader.Open(dir);
@@ -703,7 +707,7 @@ namespace Lucene.Net.Index
IndexWriter w = new IndexWriter(dir, (IndexWriterConfig)NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMaxBufferedDocs(2));
for (int j = 0; j < 17; j++)
{
- TestIndexWriter.AddDoc(w);
+ AddDoc(w);
}
w.Dispose();
@@ -715,7 +719,7 @@ namespace Lucene.Net.Index
w = new IndexWriter(dir, (IndexWriterConfig)NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMaxBufferedDocs(2));
for (int j = 0; j < 17; j++)
{
- TestIndexWriter.AddDoc(w);
+ AddDoc(w);
}
IDictionary<string, string> data = new Dictionary<string, string>();
data["label"] = "test1";
@@ -732,5 +736,21 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+
+ private void AddDoc(IndexWriter writer)
+ {
+ Document doc = new Document();
+ doc.Add(NewTextField("content", "aaa", Field.Store.NO));
+ writer.AddDocument(doc);
+ }
+
+ private void AddDocWithIndex(IndexWriter writer, int index)
+ {
+ Document doc = new Document();
+ doc.Add(NewField("content", "aaa " + index, StoredTextType));
+ doc.Add(NewField("id", "" + index, StoredTextType));
+ writer.AddDocument(doc);
+ }
+
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b9bb484d/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
index debf331..33f1063 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
@@ -34,6 +34,8 @@ namespace Lucene.Net.Index
[TestFixture]
public class TestIndexWriterForceMerge : LuceneTestCase
{
+ private static readonly FieldType StoredTextType = new FieldType(TextField.TYPE_NOT_STORED);
+
[Test]
public virtual void TestPartialMerge()
{
@@ -150,13 +152,13 @@ namespace Lucene.Net.Index
for (int j = 0; j < 500; j++)
{
- TestIndexWriter.AddDocWithIndex(writer, j);
+ AddDocWithIndex(writer, j);
}
int termIndexInterval = writer.Config.TermIndexInterval;
// force one extra segment w/ different doc store so
// we see the doc stores get merged
writer.Commit();
- TestIndexWriter.AddDocWithIndex(writer, 500);
+ AddDocWithIndex(writer, 500);
writer.Dispose();
if (VERBOSE)
@@ -233,5 +235,21 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+
+ private void AddDoc(IndexWriter writer)
+ {
+ Document doc = new Document();
+ doc.Add(NewTextField("content", "aaa", Field.Store.NO));
+ writer.AddDocument(doc);
+ }
+
+ private void AddDocWithIndex(IndexWriter writer, int index)
+ {
+ Document doc = new Document();
+ doc.Add(NewField("content", "aaa " + index, StoredTextType));
+ doc.Add(NewField("id", "" + index, StoredTextType));
+ writer.AddDocument(doc);
+ }
+
}
}
\ No newline at end of file
[34/34] lucenenet git commit: Merge remote-tracking branch
'conniey/notRemovingCtors' into lucenenet-indexablefield-api
Posted by sy...@apache.org.
Merge remote-tracking branch 'conniey/notRemovingCtors' into lucenenet-indexablefield-api
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/69a7ce8e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/69a7ce8e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/69a7ce8e
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 69a7ce8e1b8a7bbebac2c0093af273f693b3586b
Parents: cf2396b 13fadeb
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Fri Aug 12 16:19:22 2016 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Fri Aug 12 16:19:22 2016 +0300
----------------------------------------------------------------------
.../Analysis/BaseTokenStreamTestCase.cs | 51 +++--
.../Codecs/lucene3x/PreFlexRWCodec.cs | 24 ++-
.../Codecs/lucene40/Lucene40RWCodec.cs | 28 ++-
.../lucene40/Lucene40RWDocValuesFormat.cs | 13 +-
.../Codecs/lucene40/Lucene40RWNormsFormat.cs | 13 +-
.../Codecs/lucene40/Lucene40RWPostingsFormat.cs | 13 +-
.../Codecs/lucene41/Lucene41RWCodec.cs | 32 ++-
.../Codecs/lucene42/Lucene42RWCodec.cs | 26 ++-
.../lucene42/Lucene42RWDocValuesFormat.cs | 13 +-
.../Codecs/lucene45/Lucene45RWCodec.cs | 22 +-
.../Index/BaseDocValuesFormatTestCase.cs | 24 +--
.../Index/BaseStoredFieldsFormatTestCase.cs | 6 +-
.../Index/BaseTermVectorsFormatTestCase.cs | 14 +-
.../Index/RandomIndexWriter.cs | 40 +++-
.../ThreadedIndexingAndSearchingTestCase.cs | 6 +-
.../Search/CheckHits.cs | 21 +-
.../Search/QueryUtils.cs | 69 ++++--
.../Search/SearchEquivalenceTestBase.cs | 6 +-
.../Util/LuceneTestCase.cs | 211 ++++++++++++++-----
.../ClassificationTestBase.cs | 2 +-
.../Utils/DataSplitterTest.cs | 2 +-
.../TestDemoExpressions.cs | 2 +-
.../TestExpressionRescorer.cs | 2 +-
.../TestExpressionSorts.cs | 2 +-
.../Range/TestRangeFacetCounts.cs | 22 +-
.../SortedSet/TestSortedSetDocValuesFacets.cs | 12 +-
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 15 +-
.../Taxonomy/TestTaxonomyFacetCounts.cs | 18 +-
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 2 +-
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 8 +-
.../TestDrillDownQuery.cs | 2 +-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 8 +-
.../TestRandomSamplingFacetsCollector.cs | 2 +-
.../Lucene.Net.Tests.Join.csproj | 2 +-
src/Lucene.Net.Tests.Join/TestBlockJoin.cs | 28 +--
.../TestBlockJoinValidation.cs | 8 +-
.../BooleanFilterTest.cs | 2 +-
.../ChainedFilterTest.cs | 4 +-
.../CommonTermsQueryTest.cs | 6 +-
.../Function/FunctionTestSetup.cs | 15 +-
.../Function/TestBoostedQuery.cs | 2 +-
.../Function/TestFieldScoreQuery.cs | 2 +-
.../Function/TestLongNormValueSource.cs | 2 +-
.../Function/TestOrdValues.cs | 4 +-
.../Function/TestValueSources.cs | 4 +-
.../Mlt/TestMoreLikeThis.cs | 6 +-
src/Lucene.Net.Tests.Queries/TermFilterTest.cs | 4 +-
src/Lucene.Net.Tests.Queries/TermsFilterTest.cs | 12 +-
.../TestCustomScoreQuery.cs | 10 +-
.../core/Analysis/TestCachingTokenFilter.cs | 2 +-
.../core/Analysis/TestMockAnalyzer.cs | 2 +-
.../TestCompressingTermVectorsFormat.cs | 2 +-
.../Lucene3x/TestLucene3xPostingsFormat.cs | 6 +-
.../Lucene3x/TestLucene3xStoredFieldsFormat.cs | 9 +-
.../Lucene3x/TestLucene3xTermVectorsFormat.cs | 5 +-
.../core/Codecs/Lucene3x/TestSurrogates.cs | 13 +-
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 16 +-
.../Lucene40/TestLucene40DocValuesFormat.cs | 11 +-
.../Lucene40/TestLucene40PostingsFormat.cs | 11 +-
.../Lucene40/TestLucene40PostingsReader.cs | 6 +-
.../Lucene40/TestLucene40StoredFieldsFormat.cs | 9 +-
.../Lucene40/TestLucene40TermVectorsFormat.cs | 9 +-
.../core/Codecs/Lucene40/TestReuseDocsEnum.cs | 12 +-
.../Lucene41/TestLucene41StoredFieldsFormat.cs | 8 +-
.../Lucene42/TestLucene42DocValuesFormat.cs | 9 +-
.../core/Document/TestBinaryDocument.cs | 4 +-
.../core/Document/TestDocument.cs | 10 +-
.../core/Index/TestAddIndexes.cs | 14 +-
.../core/Index/TestBagOfPostings.cs | 2 +-
.../core/Index/TestBinaryDocValuesUpdates.cs | 48 ++++-
.../core/Index/TestBinaryTerms.cs | 2 +-
.../core/Index/TestCodecHoldsOpenFiles.cs | 4 +-
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 2 +-
.../core/Index/TestCompoundFile.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestCrash.cs | 6 +-
.../core/Index/TestDirectoryReader.cs | 31 ++-
.../core/Index/TestDirectoryReaderReopen.cs | 10 +-
src/Lucene.Net.Tests/core/Index/TestDocCount.cs | 2 +-
.../core/Index/TestDocValuesIndexing.cs | 12 +-
.../core/Index/TestDocValuesWithThreads.cs | 2 +-
.../core/Index/TestDocsAndPositions.cs | 4 +-
.../core/Index/TestFieldsReader.cs | 6 +-
.../core/Index/TestIndexWriter.cs | 44 ++--
.../core/Index/TestIndexWriterCommit.cs | 71 +++++--
.../core/Index/TestIndexWriterDelete.cs | 10 +-
.../core/Index/TestIndexWriterExceptions.cs | 28 +--
.../core/Index/TestIndexWriterForceMerge.cs | 28 ++-
.../core/Index/TestIndexWriterReader.cs | 8 +-
.../core/Index/TestIndexWriterUnicode.cs | 2 +-
.../core/Index/TestIndexWriterWithThreads.cs | 38 +++-
.../core/Index/TestIndexableField.cs | 4 +-
.../core/Index/TestIsCurrent.cs | 2 +-
.../core/Index/TestNeverDelete.cs | 20 +-
.../core/Index/TestNumericDocValuesUpdates.cs | 5 +-
.../core/Index/TestOmitPositions.cs | 4 +-
src/Lucene.Net.Tests/core/Index/TestPayloads.cs | 6 +-
.../core/Index/TestPayloadsOnVectors.cs | 4 +-
.../core/Index/TestPostingsOffsets.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestRollback.cs | 2 +-
.../core/Index/TestRollingUpdates.cs | 12 +-
.../core/Index/TestSameTokenSamePosition.cs | 4 +-
.../core/Index/TestSizeBoundedForceMerge.cs | 2 +-
.../core/Index/TestSnapshotDeletionPolicy.cs | 15 +-
.../core/Index/TestStressAdvance.cs | 2 +-
.../core/Index/TestStressIndexing.cs | 44 +++-
.../core/Index/TestStressIndexing2.cs | 18 +-
.../core/Index/TestStressNRT.cs | 14 +-
.../core/Index/TestSumDocFreq.cs | 2 +-
.../core/Index/TestTermVectorsReader.cs | 2 +-
.../core/Index/TestTermsEnum.cs | 6 +-
.../core/Index/TestThreadedForceMerge.cs | 4 +-
.../core/Index/TestTransactions.cs | 8 +-
.../core/Search/BaseTestRangeFilter.cs | 14 +-
.../core/Search/FuzzyTermOnShortTermsTest.cs | 6 +-
.../core/Search/Payloads/PayloadHelper.cs | 2 +-
.../Search/Payloads/TestPayloadNearQuery.cs | 6 +-
.../Search/Payloads/TestPayloadTermQuery.cs | 8 +-
.../core/Search/Similarities/TestSimilarity2.cs | 14 +-
.../Search/Similarities/TestSimilarityBase.cs | 2 +-
.../core/Search/Spans/TestBasics.cs | 8 +-
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 10 +-
.../core/Search/Spans/TestNearSpansOrdered.cs | 2 +-
.../core/Search/Spans/TestSpanFirstQuery.cs | 2 +-
.../Spans/TestSpanMultiTermQueryWrapper.cs | 2 +-
.../core/Search/Spans/TestSpans.cs | 2 +-
.../core/Search/Spans/TestSpansAdvanced.cs | 7 +-
.../core/Search/TestAutomatonQuery.cs | 2 +-
.../core/Search/TestAutomatonQueryUnicode.cs | 2 +-
.../core/Search/TestBoolean2.cs | 12 +-
.../core/Search/TestBooleanMinShouldMatch.cs | 14 +-
.../core/Search/TestBooleanOr.cs | 4 +-
.../core/Search/TestBooleanQuery.cs | 6 +-
.../core/Search/TestBooleanScorer.cs | 8 +-
.../core/Search/TestCachingWrapperFilter.cs | 22 +-
.../core/Search/TestConstantScoreQuery.cs | 6 +-
.../core/Search/TestCustomSearcherSort.cs | 2 +-
.../core/Search/TestDateFilter.cs | 4 +-
.../core/Search/TestDateSort.cs | 2 +-
.../core/Search/TestDisjunctionMaxQuery.cs | 24 +--
.../core/Search/TestDocIdSet.cs | 4 +-
.../core/Search/TestDocValuesScoring.cs | 18 +-
.../core/Search/TestEarlyTermination.cs | 2 +-
.../core/Search/TestExplanations.cs | 9 +-
.../core/Search/TestFieldCacheTermsFilter.cs | 2 +-
.../core/Search/TestFilteredQuery.cs | 22 +-
.../core/Search/TestFuzzyQuery.cs | 14 +-
.../core/Search/TestIndexSearcher.cs | 4 +-
.../core/Search/TestMinShouldMatch2.cs | 8 +-
.../core/Search/TestMultiPhraseQuery.cs | 18 +-
.../core/Search/TestMultiTermConstantScore.cs | 6 +-
.../core/Search/TestMultiTermQueryRewrites.cs | 12 +-
.../core/Search/TestNGramPhraseQuery.cs | 8 +-
src/Lucene.Net.Tests/core/Search/TestNot.cs | 2 +-
.../core/Search/TestNumericRangeQuery32.cs | 6 +-
.../core/Search/TestNumericRangeQuery64.cs | 6 +-
.../core/Search/TestPhrasePrefixQuery.cs | 2 +-
.../core/Search/TestPhraseQuery.cs | 66 +++---
.../core/Search/TestPositionIncrement.cs | 4 +-
.../Search/TestPositiveScoresOnlyCollector.cs | 2 +-
.../core/Search/TestPrefixFilter.cs | 2 +-
.../core/Search/TestPrefixInBooleanQuery.cs | 8 +-
.../core/Search/TestPrefixQuery.cs | 2 +-
.../core/Search/TestQueryRescorer.cs | 10 +-
.../core/Search/TestQueryWrapperFilter.cs | 6 +-
.../core/Search/TestRegexpQuery.cs | 2 +-
.../core/Search/TestSameScoresWithThreads.cs | 2 +-
.../Search/TestScoreCachingWrappingScorer.cs | 2 +-
.../core/Search/TestSearchAfter.cs | 2 +-
.../core/Search/TestSearchWithThreads.cs | 2 +-
.../core/Search/TestSearcherManager.cs | 6 +-
.../core/Search/TestSloppyPhraseQuery.cs | 10 +-
src/Lucene.Net.Tests/core/Search/TestSort.cs | 98 ++++-----
.../core/Search/TestSortDocValues.cs | 54 ++---
.../core/Search/TestSortRandom.cs | 4 +-
.../core/Search/TestSortRescorer.cs | 4 +-
.../core/Search/TestSubScorerFreqs.cs | 2 +-
.../core/Search/TestTermVectors.cs | 6 +-
.../core/Search/TestTopDocsCollector.cs | 2 +-
.../core/Search/TestTopDocsMerge.cs | 2 +-
.../core/Search/TestTopFieldCollector.cs | 2 +-
.../core/Search/TestTopScoreDocCollector.cs | 2 +-
.../core/Search/TestTotalHitCountCollector.cs | 2 +-
.../core/Search/TestWildcard.cs | 2 +-
.../core/Store/TestLockFactory.cs | 2 +-
.../core/Store/TestRAMDirectory.cs | 2 +-
185 files changed, 1425 insertions(+), 765 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/69a7ce8e/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
[08/34] lucenenet git commit: Fixing build errors from adding extra
params to RandomIndexWriter
Posted by sy...@apache.org.
Fixing build errors from adding extra params to RandomIndexWriter
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6f3e8079
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6f3e8079
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6f3e8079
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 6f3e8079447bd9ac4f38119b1bdaebfa7690214a
Parents: ab57fd1
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 09:31:02 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:23:53 2016 -0700
----------------------------------------------------------------------
.../Index/BaseDocValuesFormatTestCase.cs | 24 ++---
.../Index/BaseStoredFieldsFormatTestCase.cs | 6 +-
.../Index/BaseTermVectorsFormatTestCase.cs | 14 +--
.../ClassificationTestBase.cs | 2 +-
.../TestDemoExpressions.cs | 2 +-
.../TestExpressionRescorer.cs | 2 +-
.../TestExpressionSorts.cs | 2 +-
.../Range/TestRangeFacetCounts.cs | 8 +-
.../SortedSet/TestSortedSetDocValuesFacets.cs | 10 +-
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 8 +-
.../Taxonomy/TestTaxonomyFacetCounts.cs | 16 ++--
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 6 +-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 8 +-
.../TestRandomSamplingFacetsCollector.cs | 2 +-
src/Lucene.Net.Tests.Join/TestBlockJoin.cs | 18 ++--
.../ChainedFilterTest.cs | 4 +-
.../Mlt/TestMoreLikeThis.cs | 2 +-
src/Lucene.Net.Tests.Queries/TermFilterTest.cs | 2 +-
src/Lucene.Net.Tests.Queries/TermsFilterTest.cs | 6 +-
.../core/Analysis/TestCachingTokenFilter.cs | 2 +-
.../TestCompressingTermVectorsFormat.cs | 2 +-
.../core/Document/TestBinaryDocument.cs | 2 +-
.../core/Document/TestDocument.cs | 10 +-
.../core/Index/TestBinaryTerms.cs | 2 +-
.../core/Index/TestCompoundFile.cs | 2 +-
.../core/Index/TestDirectoryReader.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestDocCount.cs | 2 +-
.../core/Index/TestDocsAndPositions.cs | 4 +-
.../core/Index/TestIndexWriter.cs | 4 +-
.../core/Index/TestIndexWriterDelete.cs | 4 +-
.../core/Index/TestIndexWriterExceptions.cs | 4 +-
.../core/Index/TestIndexableField.cs | 2 +-
.../core/Index/TestIsCurrent.cs | 2 +-
.../core/Index/TestOmitPositions.cs | 4 +-
src/Lucene.Net.Tests/core/Index/TestPayloads.cs | 2 +-
.../core/Index/TestPayloadsOnVectors.cs | 4 +-
.../core/Index/TestPostingsOffsets.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestRollback.cs | 2 +-
.../core/Index/TestSameTokenSamePosition.cs | 4 +-
.../core/Index/TestStressAdvance.cs | 2 +-
.../core/Index/TestSumDocFreq.cs | 2 +-
.../core/Index/TestTermVectorsReader.cs | 2 +-
.../core/Index/TestTermsEnum.cs | 2 +-
.../core/Search/Similarities/TestSimilarity2.cs | 14 +--
.../Search/Similarities/TestSimilarityBase.cs | 2 +-
.../Spans/TestSpanMultiTermQueryWrapper.cs | 2 +-
.../core/Search/TestAutomatonQuery.cs | 2 +-
.../core/Search/TestAutomatonQueryUnicode.cs | 2 +-
.../core/Search/TestBooleanOr.cs | 2 +-
.../core/Search/TestBooleanQuery.cs | 4 +-
.../core/Search/TestBooleanScorer.cs | 6 +-
.../core/Search/TestCachingWrapperFilter.cs | 10 +-
.../core/Search/TestConstantScoreQuery.cs | 2 +-
.../core/Search/TestDateSort.cs | 2 +-
.../core/Search/TestDocIdSet.cs | 4 +-
.../core/Search/TestDocValuesScoring.cs | 2 +-
.../core/Search/TestEarlyTermination.cs | 2 +-
.../core/Search/TestFuzzyQuery.cs | 6 +-
.../core/Search/TestIndexSearcher.cs | 4 +-
.../core/Search/TestMinShouldMatch2.cs | 2 +-
.../core/Search/TestMultiPhraseQuery.cs | 2 +-
.../core/Search/TestNGramPhraseQuery.cs | 2 +-
.../core/Search/TestPhraseQuery.cs | 2 +-
.../Search/TestPositiveScoresOnlyCollector.cs | 2 +-
.../core/Search/TestPrefixFilter.cs | 2 +-
.../core/Search/TestPrefixInBooleanQuery.cs | 2 +-
.../core/Search/TestPrefixQuery.cs | 2 +-
.../core/Search/TestQueryRescorer.cs | 10 +-
.../core/Search/TestQueryWrapperFilter.cs | 4 +-
.../core/Search/TestRegexpQuery.cs | 2 +-
.../Search/TestScoreCachingWrappingScorer.cs | 2 +-
.../core/Search/TestSearchAfter.cs | 2 +-
.../core/Search/TestSearchWithThreads.cs | 2 +-
.../core/Search/TestSearcherManager.cs | 2 +-
.../core/Search/TestSloppyPhraseQuery.cs | 6 +-
src/Lucene.Net.Tests/core/Search/TestSort.cs | 98 ++++++++++----------
.../core/Search/TestSortDocValues.cs | 54 +++++------
.../core/Search/TestSortRescorer.cs | 4 +-
.../core/Search/TestTopDocsCollector.cs | 2 +-
.../core/Search/TestTopDocsMerge.cs | 2 +-
.../core/Search/TestTopFieldCollector.cs | 2 +-
.../core/Search/TestTopScoreDocCollector.cs | 2 +-
82 files changed, 244 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
index 9be51c3..2f14fe5 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Index
public void TestOneNumber()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -123,7 +123,7 @@ namespace Lucene.Net.Index
public void TestOneFloat()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -158,7 +158,7 @@ namespace Lucene.Net.Index
public void TestTwoNumbers()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -196,7 +196,7 @@ namespace Lucene.Net.Index
public void TestTwoBinaryValues()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -237,7 +237,7 @@ namespace Lucene.Net.Index
public void TestTwoFieldsMixed()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -277,7 +277,7 @@ namespace Lucene.Net.Index
public void TestThreeFieldsMixed()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -322,7 +322,7 @@ namespace Lucene.Net.Index
public void TestThreeFieldsMixed2()
{
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
string longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
string text = "this is the text to be indexed. " + longTerm;
@@ -1835,7 +1835,7 @@ namespace Lucene.Net.Index
{
AssumeTrue("Codec does not support SORTED_SET", DefaultCodecSupportsSortedSet());
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedSetDocValuesField("field", new BytesRef("hello")));
@@ -1863,7 +1863,7 @@ namespace Lucene.Net.Index
{
AssumeTrue("Codec does not support SORTED_SET", DefaultCodecSupportsSortedSet());
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedSetDocValuesField("field", new BytesRef("hello")));
@@ -1946,7 +1946,7 @@ namespace Lucene.Net.Index
{
AssumeTrue("Codec does not support SORTED_SET", DefaultCodecSupportsSortedSet());
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedSetDocValuesField("field", new BytesRef("hello")));
@@ -1979,7 +1979,7 @@ namespace Lucene.Net.Index
{
AssumeTrue("Codec does not support SORTED_SET", DefaultCodecSupportsSortedSet());
Directory directory = NewDirectory();
- RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter iwriter = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedSetDocValuesField("field", new BytesRef("world")));
@@ -3476,7 +3476,7 @@ namespace Lucene.Net.Index
break;
}
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
BytesRef bytes = new BytesRef();
bytes.Bytes = new byte[1 << i];
bytes.Length = 1 << i;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index db140dd..fe01aab 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -263,7 +263,7 @@ namespace Lucene.Net.Index
public void TestNumericField()
{
Directory dir = NewDirectory();
- var w = new RandomIndexWriter(Random(), dir);
+ var w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
var numDocs = AtLeast(500);
var answers = new object[numDocs];
FieldType.NumericType[] typeAnswers = new FieldType.NumericType[numDocs];
@@ -348,7 +348,7 @@ namespace Lucene.Net.Index
public void TestIndexedBit()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType onlyStored = new FieldType();
onlyStored.Stored = true;
@@ -766,7 +766,7 @@ namespace Lucene.Net.Index
}
w.Commit();
w.Dispose();
- w = new RandomIndexWriter(Random(), dir);
+ w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
w.ForceMerge(TestUtil.NextInt(Random(), 1, 3));
w.Commit();
w.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index d48b6f8..97b9e59 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -675,7 +675,7 @@ namespace Lucene.Net.Index
int docWithVectors = Random().Next(numDocs);
Document emptyDoc = new Document();
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
RandomDocument doc = docFactory.NewDocument(TestUtil.NextInt(Random(), 1, 3), 20, options);
for (int i = 0; i < numDocs; ++i)
{
@@ -722,7 +722,7 @@ namespace Lucene.Net.Index
continue;
}
using (Directory dir = NewDirectory())
- using (RandomIndexWriter writer = new RandomIndexWriter(Random(), dir))
+ using (RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone))
{
RandomDocument doc = docFactory.NewDocument(TestUtil.NextInt(Random(), 1, 2), AtLeast(20000),
options);
@@ -740,7 +740,7 @@ namespace Lucene.Net.Index
foreach (Options options in ValidOptions())
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
RandomDocument doc = docFactory.NewDocument(AtLeast(100), 5, options);
writer.AddDocument(doc.ToDocument());
IndexReader reader = writer.Reader;
@@ -767,7 +767,7 @@ namespace Lucene.Net.Index
}
using (Directory dir = NewDirectory())
{
- using (var writer = new RandomIndexWriter(Random(), dir))
+ using (var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone))
{
RandomDocument doc1 = docFactory.NewDocument(numFields, 20, options1);
RandomDocument doc2 = docFactory.NewDocument(numFields, 20, options2);
@@ -797,7 +797,7 @@ namespace Lucene.Net.Index
docs[i] = docFactory.NewDocument(TestUtil.NextInt(Random(), 1, 3), TestUtil.NextInt(Random(), 10, 50), RandomOptions());
}
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < numDocs; ++i)
{
writer.AddDocument(AddId(docs[i].ToDocument(), "" + i));
@@ -832,7 +832,7 @@ namespace Lucene.Net.Index
docs[i] = docFactory.NewDocument(TestUtil.NextInt(Random(), 1, 3), AtLeast(10), options);
}
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < numDocs; ++i)
{
writer.AddDocument(AddId(docs[i].ToDocument(), "" + i));
@@ -877,7 +877,7 @@ namespace Lucene.Net.Index
docs[i] = docFactory.NewDocument(TestUtil.NextInt(Random(), 1, 3), AtLeast(10), options);
}
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < numDocs; ++i)
{
writer.AddDocument(AddId(docs[i].ToDocument(), "" + i));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
index 269d8c4..4762408 100644
--- a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
+++ b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Classification
{
base.SetUp();
dir = NewDirectory();
- indexWriter = new RandomIndexWriter(Random(), dir);
+ indexWriter = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
textFieldName = "text";
categoryFieldName = "cat";
booleanFieldName = "bool";
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
index 3adc45a..5e99845 100644
--- a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Tests.Expressions
{
base.SetUp();
dir = NewDirectory();
- var iw = new RandomIndexWriter(Random(), dir);
+ var iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
var doc = new Document
{
NewStringField("id", "1", Field.Store.YES),
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
index 301e6f9..9c0d15c 100644
--- a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Tests.Expressions
{
base.SetUp();
dir = NewDirectory();
- var iw = new RandomIndexWriter(Random(), dir);
+ var iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
var doc = new Document
{
NewStringField("id", "1", Field.Store.YES),
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
index d6b0fef..a69a93c 100644
--- a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Tests.Expressions
{
base.SetUp();
dir = NewDirectory();
- var iw = new RandomIndexWriter(Random(), dir);
+ var iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = TestUtil.NextInt(Random(), 2049, 4000);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
index bb09c43..d2a296b 100644
--- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
@@ -386,7 +386,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestRandomLongs()
{
Directory dir = NewDirectory();
- var w = new RandomIndexWriter(Random(), dir);
+ var w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(1000);
if (VERBOSE)
@@ -579,7 +579,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestRandomFloats()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(1000);
float[] values = new float[numDocs];
@@ -784,7 +784,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestRandomDoubles()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(1000);
double[] values = new double[numDocs];
@@ -1006,7 +1006,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestCustomDoublesValueSource()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
index 091a2c8..51c26ec 100644
--- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
+++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Facet.SortedSet
FacetsConfig config = new FacetsConfig();
config.SetMultiValued("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new SortedSetDocValuesFacetField("a", "foo"));
@@ -105,7 +105,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -153,7 +153,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -211,7 +211,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -253,7 +253,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 06057ce..74f66f3 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Facet.Taxonomy
config.SetIndexFieldName("float", "$facets.float");
config.SetMultiValued("float", true);
- var writer = new RandomIndexWriter(Random(), dir);
+ var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// index documents, 50% have only 'b' and all have 'a'
for (int i = 0; i < 110; i++)
@@ -190,7 +190,7 @@ namespace Lucene.Net.Facet.Taxonomy
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new IntAssociationFacetField(14, "a", "x"));
@@ -216,7 +216,7 @@ namespace Lucene.Net.Facet.Taxonomy
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new IntAssociationFacetField(14, "a", "x"));
@@ -241,7 +241,7 @@ namespace Lucene.Net.Facet.Taxonomy
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
config.SetRequireDimCount("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new IntAssociationFacetField(14, "a", "x"));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index 8038313..27aba82 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("Publish Date", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new FacetField("Author", "Bob"));
@@ -152,7 +152,7 @@ namespace Lucene.Net.Facet.Taxonomy
// main index:
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -214,7 +214,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetIndexFieldName("a", "$facets2");
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new FacetField("a", "foo1"));
@@ -318,7 +318,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("a", true);
config.SetMultiValued("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "text", Field.Store.NO));
@@ -364,7 +364,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
FacetsConfig config = new FacetsConfig();
@@ -399,7 +399,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
FacetsConfig config = new FacetsConfig();
@@ -510,7 +510,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- var writer = new RandomIndexWriter(Random(), dir);
+ var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -536,7 +536,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
index d425a1a..3ec1ef6 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Facet.Taxonomy
// main index:
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
// Reused across documents, to add the necessary facet
@@ -144,7 +144,7 @@ namespace Lucene.Net.Facet.Taxonomy
// main index:
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -213,7 +213,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetIndexFieldName("a", "$facets2");
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new IntField("num", 10, Field.Store.NO));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
index 00cb772..e0add44 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Facet
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("Publish Date", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new FacetField("Author", "Bob"));
@@ -252,7 +252,7 @@ namespace Lucene.Net.Facet
{
Directory dir = NewDirectory();
Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// Writes facet ords to a separate directory from the
// main index:
@@ -308,7 +308,7 @@ namespace Lucene.Net.Facet
{
Directory dir = NewDirectory();
Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// Writes facet ords to a separate directory from the
// main index:
@@ -1307,7 +1307,7 @@ namespace Lucene.Net.Facet
// LUCENE-5045: make sure DrillSideways works with an empty index
Directory dir = NewDirectory();
Directory taxoDir = NewDirectory();
- var writer = new RandomIndexWriter(Random(), dir);
+ var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
IndexSearcher searcher = NewSearcher(writer.Reader);
var taxoReader = new DirectoryTaxonomyReader(taxoWriter);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
index afd46e5..69df3c9 100644
--- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
+++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Facet
Directory taxoDir = NewDirectory();
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FacetsConfig config = new FacetsConfig();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
index d43b2df..2359946 100644
--- a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
+++ b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Tests.Join
public void TestSimple()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IList<Document> docs = new List<Document>();
@@ -221,7 +221,7 @@ namespace Lucene.Net.Tests.Join
public void TestBugCausedByRewritingTwice()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IList<Document> docs = new List<Document>();
@@ -278,7 +278,7 @@ namespace Lucene.Net.Tests.Join
public virtual void TestSimpleFilter()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IList<Document> docs = new List<Document>();
docs.Add(MakeJob("java", 2007));
@@ -376,7 +376,7 @@ namespace Lucene.Net.Tests.Join
public void TestBoostBug()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IndexReader r = w.Reader;
w.Dispose();
IndexSearcher s = NewSearcher(r);
@@ -521,7 +521,7 @@ namespace Lucene.Net.Tests.Join
IList<int> toDelete = new List<int>();
// TODO: parallel star join, nested join cases too!
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
RandomIndexWriter joinW = new RandomIndexWriter(Random(), joinDir);
for (int parentDocID = 0; parentDocID < numParentDocs; parentDocID++)
{
@@ -1125,7 +1125,7 @@ namespace Lucene.Net.Tests.Join
public void TestMultiChildTypes()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IList<Document> docs = new List<Document>();
@@ -1212,7 +1212,7 @@ namespace Lucene.Net.Tests.Join
public void TestAdvanceSingleParentSingleChild()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document childDoc = new Document();
childDoc.Add(NewStringField("child", "1", Field.Store.NO));
Document parentDoc = new Document();
@@ -1271,7 +1271,7 @@ namespace Lucene.Net.Tests.Join
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IList<Document> docs = new List<Document>();
docs.Add(MakeJob("ruby", 2005));
@@ -1547,7 +1547,7 @@ namespace Lucene.Net.Tests.Join
public void TestAdvanceSingleDeletedParentNoChild()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// First doc with 1 children
Document parentDoc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs b/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
index 66be39a..9d63a8c 100644
--- a/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Tests.Queries
{
base.SetUp();
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// we use the default Locale/TZ since LuceneTestCase randomizes it
var cal = new DateTime(1970, 1, 1, 0, 0, 0, (int)TestUtil.NextLong(Random(), 0, long.MaxValue), new GregorianCalendar());
@@ -160,7 +160,7 @@ namespace Lucene.Net.Tests.Queries
public virtual void TestWithCachingFilter()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IndexReader reader = writer.Reader;
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
index 49811fe..b528d57 100644
--- a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
+++ b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
{
base.SetUp();
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// Add series of docs with specific information for MoreLikeThis
AddDoc(writer, "lucene");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
index 25c442f..ef19de1 100644
--- a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Tests.Queries
public void TestRandom()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int num = AtLeast(100);
var terms = new List<Term>();
for (int i = 0; i < num; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
index 1798e3c..6fbd43f 100644
--- a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Tests.Queries
public void TestFieldNotPresent()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int num = AtLeast(3);
int skip = Random().Next(num);
var terms = new List<Term>();
@@ -150,7 +150,7 @@ namespace Lucene.Net.Tests.Queries
public void TestSkipField()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int num = AtLeast(10);
var terms = new HashSet<Term>();
for (int i = 0; i < num; i++)
@@ -192,7 +192,7 @@ namespace Lucene.Net.Tests.Queries
public void TestRandom()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int num = AtLeast(100);
bool singleField = Random().NextBoolean();
IList<Term> terms = new List<Term>();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs b/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
index 6cce5bd..004a4ac 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Analysis
public virtual void TestCaching()
{
Directory dir = new RAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
TokenStream stream = new TokenStreamAnonymousInnerClassHelper(this);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
index 322977a..e2ffe7d 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs.Compressing
public virtual void TestNoOrds()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs b/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
index 74d3e93..1e010f8 100644
--- a/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
@@ -98,7 +98,7 @@ namespace Lucene.Net.Document
var doc = new Documents.Document {binaryFldCompressed, stringFldCompressed};
using (Directory dir = NewDirectory())
- using (RandomIndexWriter writer = new RandomIndexWriter(Random(), dir))
+ using (RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone))
{
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index 8d31bfc..cc35b32 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -190,7 +190,7 @@ namespace Lucene.Net.Document
public virtual void TestGetValuesForIndexedDocument()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.AddDocument(MakeDocumentWithFields());
IndexReader reader = writer.Reader;
@@ -223,7 +223,7 @@ namespace Lucene.Net.Document
public virtual void TestPositionIncrementMultiFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.AddDocument(MakeDocumentWithFields());
IndexReader reader = writer.Reader;
@@ -303,7 +303,7 @@ namespace Lucene.Net.Document
doc.Add(new StringField("keyword", "test", Field.Store.YES));
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
writer.AddDocument(doc);
field.StringValue = "id2";
writer.AddDocument(doc);
@@ -366,7 +366,7 @@ namespace Lucene.Net.Document
public virtual void TestTransitionAPI()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Documents.Document doc = new Documents.Document();
doc.Add(new Field("stored", "abc", Field.Store.YES, Field.Index.NO));
@@ -443,7 +443,7 @@ namespace Lucene.Net.Document
Assert.AreEqual(new string[] { "5", "4" }, doc.GetValues("int"));
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
iw.AddDocument(doc);
DirectoryReader ir = iw.Reader;
Documents.Document sdoc = ir.Document(0);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
index b00230f..ef7fa5a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Index
public virtual void TestBinary()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
BytesRef bytes = new BytesRef(2);
BinaryTokenStream tokenStream = new BinaryTokenStream(bytes);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
index 87a36cf..e43aae9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
@@ -850,7 +850,7 @@ namespace Lucene.Net.Index
{
Directory dir = NewDirectory();
// riw should sometimes create docvalues fields, etc
- RandomIndexWriter riw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
// these fields should sometimes get term vectors, etc
Field idField = NewStringField("id", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index a3d0c49..3646aef 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -1206,7 +1206,7 @@ namespace Lucene.Net.Index
public virtual void TestLoadCertainFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("field1", "foobar", Field.Store.YES));
doc.Add(NewStringField("field2", "foobaz", Field.Store.YES));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
index 113088c..11165b2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Index
public virtual void TestSimple()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
index a9873a3..1a11039 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
@@ -377,7 +377,7 @@ namespace Lucene.Net.Index
public virtual void TestDocsEnumStart()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewStringField("foo", "bar", Field.Store.NO));
writer.AddDocument(doc);
@@ -404,7 +404,7 @@ namespace Lucene.Net.Index
public virtual void TestDocsAndPositionsEnumStart()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("foo", "bar", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 48332ac..d1fe9dd 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -1986,7 +1986,7 @@ namespace Lucene.Net.Index
Field contentField = new Field("content", "", customType);
doc.Add(contentField);
- w = new RandomIndexWriter(Random(), dir);
+ w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
contentField.StringValue = "other";
w.AddDocument(doc);
@@ -2854,7 +2854,7 @@ namespace Lucene.Net.Index
dir.DeleteFile(fileName);
}
- w = new RandomIndexWriter(Random(), dir);
+ w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
w.AddDocument(doc);
w.Dispose();
r.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
index 3d321d3..cb85a55 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
@@ -332,7 +332,7 @@ namespace Lucene.Net.Index
public virtual void TestDeleteAllNoDeadLock()
{
Directory dir = NewDirectory();
- RandomIndexWriter modifier = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter modifier = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numThreads = AtLeast(2);
ThreadClass[] threads = new ThreadClass[numThreads];
CountdownEvent latch = new CountdownEvent(1);
@@ -1106,7 +1106,7 @@ namespace Lucene.Net.Index
public virtual void TestDeleteAllSlowly()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int NUM_DOCS = AtLeast(1000);
IList<int?> ids = new List<int?>(NUM_DOCS);
for (int id = 0; id < NUM_DOCS; id++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index 6821109..d732cc5 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -1720,7 +1720,7 @@ namespace Lucene.Net.Index
public virtual void TestAddDocsNonAbortingException()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs1 = Random().Next(25);
for (int docCount = 0; docCount < numDocs1; docCount++)
{
@@ -1786,7 +1786,7 @@ namespace Lucene.Net.Index
public virtual void TestUpdateDocsNonAbortingException()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numDocs1 = Random().Next(25);
for (int docCount = 0; docCount < numDocs1; docCount++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index d4afb52..8059126 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -232,7 +232,7 @@ namespace Lucene.Net.Index
public virtual void TestArbitraryFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int NUM_DOCS = AtLeast(27);
if (VERBOSE)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs b/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
index 78efb07..b8e0a7e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Index
// initialize directory
Directory = NewDirectory();
- Writer = new RandomIndexWriter(Random(), Directory);
+ Writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
// write document
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs b/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
index 527e207..264f811 100644
--- a/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
public virtual void TestBasic()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_AND_FREQS;
@@ -254,7 +254,7 @@ namespace Lucene.Net.Index
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_AND_FREQS;
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 20; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
index ce1168a..ed80cc3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
@@ -696,7 +696,7 @@ namespace Lucene.Net.Index
public virtual void TestMixupMultiValued()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field field = new TextField("field", "", Field.Store.NO);
TokenStream ts = new MockTokenizer(new StringReader("here we go"), MockTokenizer.WHITESPACE, true);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
index b95a5fe..d2f6380 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
@@ -95,7 +95,7 @@ namespace Lucene.Net.Index
public virtual void TestMixupMultiValued()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.StoreTermVectors = true;
@@ -138,7 +138,7 @@ namespace Lucene.Net.Index
public virtual void TestPayloadsWithoutPositions()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
index c1e355a..9aa4dfa 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
@@ -438,7 +438,7 @@ namespace Lucene.Net.Index
public virtual void TestAddFieldTwice()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType customType3 = new FieldType(TextField.TYPE_STORED);
customType3.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestRollback.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestRollback.cs b/src/Lucene.Net.Tests/core/Index/TestRollback.cs
index 42bd03c..d7f0e86 100644
--- a/src/Lucene.Net.Tests/core/Index/TestRollback.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestRollback.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Index
public virtual void TestRollbackIntegrityWithBufferFlush()
{
Directory dir = NewDirectory();
- RandomIndexWriter rw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter rw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 5; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs b/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
index c68abf1..ee7e0a8 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Index
public virtual void Test()
{
Directory dir = NewDirectory();
- RandomIndexWriter riw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(new TextField("eng", new BugReproTokenStream()));
riw.AddDocument(doc);
@@ -54,7 +54,7 @@ namespace Lucene.Net.Index
public virtual void TestMoreDocs()
{
Directory dir = NewDirectory();
- RandomIndexWriter riw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < 100; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
index 9f88a40..4e8cefb 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
Console.WriteLine("\nTEST: iter=" + iter);
}
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
HashSet<int> aDocs = new HashSet<int>();
Documents.Document doc = new Documents.Document();
Field f = NewStringField("field", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs b/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
index eb923a2..73cc3c4 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
int numDocs = AtLeast(500);
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field id = NewStringField("id", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
index 7765c6c..86937a3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
@@ -410,7 +410,7 @@ namespace Lucene.Net.Index
public virtual void TestIllegalIndexableField()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.StoreTermVectors = true;
ft.StoreTermVectorPayloads = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
index d961d64..f175d90 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
@@ -230,7 +230,7 @@ namespace Lucene.Net.Index
public virtual void TestIntersectRandom()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
int numTerms = AtLeast(300);
//final int numTerms = 50;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
index fc6a434..27e58b2 100644
--- a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
+++ b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestEmptyIndex()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
IndexReader ir = iw.Reader;
iw.Dispose();
IndexSearcher @is = NewSearcher(ir);
@@ -104,7 +104,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestEmptyField()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("foo", "bar", Field.Store.NO));
iw.AddDocument(doc);
@@ -130,7 +130,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestEmptyTerm()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("foo", "bar", Field.Store.NO));
iw.AddDocument(doc);
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestNoNorms()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.OmitNorms = true;
@@ -184,7 +184,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestOmitTF()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_ONLY;
@@ -213,7 +213,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestOmitTFAndNorms()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_ONLY;
@@ -247,7 +247,7 @@ namespace Lucene.Net.Search.Similarities
// however with spans, there is only one scorer for the whole hierarchy:
// inner queries are not real queries, their boosts are ignored, etc.
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
doc.Add(NewField("foo", "bar", ft));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
index a04f946..2b2c7ab 100644
--- a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
+++ b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
@@ -106,7 +106,7 @@ namespace Lucene.Net.Search.Similarities
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
for (int i = 0; i < Docs.Length; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
index 87569cc..364b2e7 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Search.Spans
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field field = NewTextField("field", "", Field.Store.NO);
doc.Add(field);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs b/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
index 87db2cd..370bb9f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field titleField = NewTextField("title", "some title", Field.Store.NO);
Field field = NewTextField(FN, "this is document one 2345", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs b/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
index 581016e..56b4df1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field titleField = NewTextField("title", "some title", Field.Store.NO);
Field field = NewTextField(FN, "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
index 778bb1b..ede9299 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
@@ -145,7 +145,7 @@ namespace Lucene.Net.Search
Dir = NewDirectory();
//
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
//
Document d = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6f3e8079/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
index cc42669..f3288c2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search
public virtual void TestNullOrSubScorer()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "a b c d", Field.Store.NO));
w.AddDocument(doc);
@@ -369,7 +369,7 @@ namespace Lucene.Net.Search
public virtual void TestInOrderWithMinShouldMatch()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "some text here", Field.Store.NO));
w.AddDocument(doc);
[30/34] lucenenet git commit: Fixing bug where class rather than
local variable was used
Posted by sy...@apache.org.
Fixing bug where class rather than local variable was used
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1863bb82
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1863bb82
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1863bb82
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 1863bb825d83bca3cfa9e260a571c9681aee594b
Parents: c8e1eae
Author: Connie Yau <co...@microsoft.com>
Authored: Mon Aug 8 11:40:10 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Mon Aug 8 11:40:10 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs | 10 +++++-----
src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1863bb82/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
index 1b2ee3a..29eeac3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
@@ -280,7 +280,7 @@ namespace Lucene.Net.Search
bq.Add(query, BooleanClause.Occur.MUST);
ScoreDoc[] hits = Searcher.Search(bq, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
}
[Test]
@@ -301,7 +301,7 @@ namespace Lucene.Net.Search
bq.Add(query, BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = Searcher.Search(bq, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
}
// Make sure BooleanQuery, which does out-of-order
@@ -323,7 +323,7 @@ namespace Lucene.Net.Search
bq.Add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = Searcher.Search(query, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
}
[Test]
@@ -340,13 +340,13 @@ namespace Lucene.Net.Search
Query query = new FilteredQuery(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "three")))), RandomFilterStrategy(Random(), useRandomAccess)), new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "four")))), RandomFilterStrategy(Random(), useRandomAccess));
ScoreDoc[] hits = Searcher.Search(query, 10).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
// one more:
query = new FilteredQuery(query, new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "five")))), RandomFilterStrategy(Random(), useRandomAccess));
hits = Searcher.Search(query, 10).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1863bb82/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index 812d0ed..972e713 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search
query.Add(new Term("field", "words"));
ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
reader.Dispose();
directory.Dispose();
@@ -380,7 +380,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits[1].Doc);
Assert.AreEqual(0.31, hits[2].Score, 0.01);
Assert.AreEqual(2, hits[2].Doc);
- QueryUtils.Check(Random(), Query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, Searcher, Similarity);
reader.Dispose();
directory.Dispose();
}
[27/34] lucenenet git commit: Passing Similarity and TimeZone into
RandomIndexWriter ctors.
Posted by sy...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
index 7a3e4eb..1b2ee3a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search
ScoreDoc[] hits = Searcher.Search(filteredquery, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
Assert.AreEqual(1, hits[0].Doc);
- QueryUtils.Check(Random(), filteredquery, Searcher);
+ QueryUtils.Check(Random(), filteredquery, Searcher, Similarity);
hits = Searcher.Search(filteredquery, null, 1000, new Sort(new SortField("sorter", SortField.Type_e.STRING))).ScoreDocs;
Assert.AreEqual(1, hits.Length);
@@ -165,23 +165,23 @@ namespace Lucene.Net.Search
filteredquery = new FilteredQuery(new TermQuery(new Term("field", "one")), Filter, RandomFilterStrategy(Random(), useRandomAccess));
hits = Searcher.Search(filteredquery, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), filteredquery, Searcher);
+ QueryUtils.Check(Random(), filteredquery, Searcher, Similarity);
filteredquery = new FilteredQuery(new MatchAllDocsQuery(), Filter, RandomFilterStrategy(Random(), useRandomAccess));
hits = Searcher.Search(filteredquery, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), filteredquery, Searcher);
+ QueryUtils.Check(Random(), filteredquery, Searcher, Similarity);
filteredquery = new FilteredQuery(new TermQuery(new Term("field", "x")), Filter, RandomFilterStrategy(Random(), useRandomAccess));
hits = Searcher.Search(filteredquery, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
Assert.AreEqual(3, hits[0].Doc);
- QueryUtils.Check(Random(), filteredquery, Searcher);
+ QueryUtils.Check(Random(), filteredquery, Searcher, Similarity);
filteredquery = new FilteredQuery(new TermQuery(new Term("field", "y")), Filter, RandomFilterStrategy(Random(), useRandomAccess));
hits = Searcher.Search(filteredquery, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length);
- QueryUtils.Check(Random(), filteredquery, Searcher);
+ QueryUtils.Check(Random(), filteredquery, Searcher, Similarity);
// test boost
Filter f = NewStaticFilterA();
@@ -259,7 +259,7 @@ namespace Lucene.Net.Search
Query filteredquery = new FilteredQuery(rq, Filter, RandomFilterStrategy(Random(), useRandomAccess));
ScoreDoc[] hits = Searcher.Search(filteredquery, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), filteredquery, Searcher);
+ QueryUtils.Check(Random(), filteredquery, Searcher, Similarity);
}
[Test]
@@ -280,7 +280,7 @@ namespace Lucene.Net.Search
bq.Add(query, BooleanClause.Occur.MUST);
ScoreDoc[] hits = Searcher.Search(bq, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length);
- QueryUtils.Check(Random(), query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
[Test]
@@ -301,7 +301,7 @@ namespace Lucene.Net.Search
bq.Add(query, BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = Searcher.Search(bq, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
// Make sure BooleanQuery, which does out-of-order
@@ -323,7 +323,7 @@ namespace Lucene.Net.Search
bq.Add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = Searcher.Search(query, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
[Test]
@@ -340,13 +340,13 @@ namespace Lucene.Net.Search
Query query = new FilteredQuery(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "three")))), RandomFilterStrategy(Random(), useRandomAccess)), new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "four")))), RandomFilterStrategy(Random(), useRandomAccess));
ScoreDoc[] hits = Searcher.Search(query, 10).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// one more:
query = new FilteredQuery(query, new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "five")))), RandomFilterStrategy(Random(), useRandomAccess));
hits = Searcher.Search(query, 10).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
index f6e5977..61e94de 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search
public virtual void TestFuzziness()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
AddDoc("aaaaa", writer);
AddDoc("aaaab", writer);
AddDoc("aaabb", writer);
@@ -200,7 +200,7 @@ namespace Lucene.Net.Search
public virtual void Test2()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, new MockAnalyzer(Random(), MockTokenizer.KEYWORD, false));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, new MockAnalyzer(Random(), MockTokenizer.KEYWORD, false), Similarity, TimeZone);
AddDoc("LANGE", writer);
AddDoc("LUETH", writer);
AddDoc("PIRSING", writer);
@@ -244,14 +244,14 @@ namespace Lucene.Net.Search
public virtual void TestTieBreaker()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
AddDoc("a123456", writer);
AddDoc("c123456", writer);
AddDoc("d123456", writer);
AddDoc("e123456", writer);
Directory directory2 = NewDirectory();
- RandomIndexWriter writer2 = new RandomIndexWriter(Random(), directory2);
+ RandomIndexWriter writer2 = new RandomIndexWriter(Random(), directory2, Similarity, TimeZone);
AddDoc("a123456", writer2);
AddDoc("b123456", writer2);
AddDoc("b123456", writer2);
@@ -282,7 +282,7 @@ namespace Lucene.Net.Search
public virtual void TestBoostOnlyRewrite()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
AddDoc("Lucene", writer);
AddDoc("Lucene", writer);
AddDoc("Lucenne", writer);
@@ -308,7 +308,7 @@ namespace Lucene.Net.Search
{
MockAnalyzer analyzer = new MockAnalyzer(Random());
Directory index = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), index);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), index, Similarity, TimeZone);
AddDoc("Lucene in Action", w);
AddDoc("Lucene for Dummies", w);
@@ -345,7 +345,7 @@ namespace Lucene.Net.Search
public virtual void TestDistanceAsEditsSearching()
{
Directory index = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), index);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), index, Similarity, TimeZone);
AddDoc("foobar", w);
AddDoc("test", w);
AddDoc("working", w);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs b/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
index f16306d..335924e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
for (int i = 0; i < 100; i++)
{
Document doc = new Document();
@@ -117,7 +117,7 @@ namespace Lucene.Net.Search
{
// LUCENE-5128: ensure we get a meaningful message if searchAfter exceeds maxDoc
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
w.AddDocument(new Document());
IndexReader r = w.Reader;
w.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index 312bc2a..33aec6e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -61,10 +61,10 @@ namespace Lucene.Net.Search
internal static readonly string[] RareTerms = new string[] { "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" };
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
int numDocs = AtLeast(300);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
index 82f15e6..6482ace 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
public virtual void TestPhrasePrefix()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("blueberry pie", writer);
Add("blueberry strudel", writer);
Add("blueberry pizza", writer);
@@ -157,7 +157,7 @@ namespace Lucene.Net.Search
public virtual void TestTall()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("blueberry chocolate pie", writer);
Add("blueberry chocolate tart", writer);
IndexReader r = writer.Reader;
@@ -179,7 +179,7 @@ namespace Lucene.Net.Search
public virtual void TestMultiSloppyWithRepeats() //LUCENE-3821 fixes sloppy phrase scoring, except for this known problem
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("a b c d e f g h i k", writer);
IndexReader r = writer.Reader;
writer.Dispose();
@@ -201,7 +201,7 @@ namespace Lucene.Net.Search
public virtual void TestMultiExactWithRepeats()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("a b c d e f g h i k", writer);
IndexReader r = writer.Reader;
writer.Dispose();
@@ -230,7 +230,7 @@ namespace Lucene.Net.Search
// and all terms required.
// The contained PhraseMultiQuery must contain exactly one term array.
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("blueberry pie", writer);
Add("blueberry chewing gum", writer);
Add("blue raspberry pie", writer);
@@ -262,7 +262,7 @@ namespace Lucene.Net.Search
public virtual void TestPhrasePrefixWithBooleanQuery()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("this is a test", "object", writer);
Add("a note", "note", writer);
@@ -290,7 +290,7 @@ namespace Lucene.Net.Search
public virtual void TestNoDocs()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("a note", "note", writer);
IndexReader reader = writer.Reader;
@@ -359,7 +359,7 @@ namespace Lucene.Net.Search
public virtual void TestCustomIDF()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Add("this is a test", "object", writer);
Add("a note", "note", writer);
@@ -408,7 +408,7 @@ namespace Lucene.Net.Search
tokens[2].Append("c");
tokens[2].PositionIncrement = 0;
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("field", new CannedTokenStream(tokens)));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
index 1fc0a89..0705a83 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -51,9 +51,9 @@ namespace Lucene.Net.Search
Dir = NewDirectory();
Sdir1 = NewDirectory();
Sdir2 = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir, new MockAnalyzer(Random()));
- RandomIndexWriter swriter1 = new RandomIndexWriter(Random(), Sdir1, new MockAnalyzer(Random()));
- RandomIndexWriter swriter2 = new RandomIndexWriter(Random(), Sdir2, new MockAnalyzer(Random()));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir, new MockAnalyzer(Random()), Similarity, TimeZone);
+ RandomIndexWriter swriter1 = new RandomIndexWriter(Random(), Sdir1, new MockAnalyzer(Random()), Similarity, TimeZone);
+ RandomIndexWriter swriter2 = new RandomIndexWriter(Random(), Sdir2, new MockAnalyzer(Random()), Similarity, TimeZone);
for (int i = 0; i < 10; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index c7f05e5..3db7193 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -33,10 +33,10 @@ namespace Lucene.Net.Search
private static Directory Directory;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
writer.Dispose();
Reader = DirectoryReader.Open(Directory);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestNot.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNot.cs b/src/Lucene.Net.Tests/core/Search/TestNot.cs
index 6eb82a3..041a79e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNot.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNot.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
public virtual void TestNot_Mem()
{
Directory store = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), store);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), store, Similarity, TimeZone);
Document d1 = new Document();
d1.Add(NewTextField("field", "a b", Field.Store.YES));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
index 4975180..8c26b24 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
private static IndexSearcher Searcher = null;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
NoDocs = AtLeast(4096);
Distance = (1 << 30) / NoDocs;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
index 4d0ce31..d55bd45 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
private static IndexSearcher Searcher = null;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
NoDocs = AtLeast(4096);
Distance = (1L << 60) / NoDocs;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
index 4281469..462e6d8 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
public virtual void TestPhrasePrefix()
{
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
Document doc1 = new Document();
Document doc2 = new Document();
Document doc3 = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index ec8cd62..812d0ed 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Search
{
Directory = NewDirectory();
Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, analyzer);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, analyzer, Similarity, TimeZone);
Documents.Document doc = new Documents.Document();
doc.Add(NewTextField("field", "one two three four five", Field.Store.YES));
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "five"));
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
[Test]
@@ -137,7 +137,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "five"));
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
/// <summary>
@@ -151,14 +151,14 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "five"));
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length, "exact match");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
Query = new PhraseQuery();
Query.Add(new Term("field", "two"));
Query.Add(new Term("field", "one"));
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "reverse not exact");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
[Test]
@@ -170,7 +170,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "two"));
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length, "in order");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// Ensures slop of 1 does not work for phrases out of order;
// must be at least 2.
@@ -180,7 +180,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "one"));
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "reversed, slop not 2 or more");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
/// <summary>
@@ -194,7 +194,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "one"));
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length, "just sloppy enough");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
Query = new PhraseQuery();
Query.Slop = 2;
@@ -202,7 +202,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "one"));
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "not sloppy enough");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
/// <summary>
@@ -218,7 +218,7 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "five"));
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length, "two total moves");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
Query = new PhraseQuery();
Query.Slop = 5; // it takes six moves to match this phrase
@@ -227,12 +227,12 @@ namespace Lucene.Net.Search
Query.Add(new Term("field", "one"));
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "slop of 5 not close enough");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
Query.Slop = 6;
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length, "slop of 6 just right");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
[Test]
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search
query.Add(new Term("field", "words"));
ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), query, searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
reader.Dispose();
directory.Dispose();
@@ -265,7 +265,7 @@ namespace Lucene.Net.Search
public virtual void TestPhraseQueryInConjunctionScorer()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
Documents.Document doc = new Documents.Document();
doc.Add(NewTextField("source", "marketing info", Field.Store.YES));
@@ -286,7 +286,7 @@ namespace Lucene.Net.Search
phraseQuery.Add(new Term("source", "info"));
ScoreDoc[] hits = searcher.Search(phraseQuery, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), phraseQuery, searcher);
+ QueryUtils.Check(Random(), phraseQuery, searcher, Similarity);
TermQuery termQuery = new TermQuery(new Term("contents", "foobar"));
BooleanQuery booleanQuery = new BooleanQuery();
@@ -294,7 +294,7 @@ namespace Lucene.Net.Search
booleanQuery.Add(phraseQuery, BooleanClause.Occur.MUST);
hits = searcher.Search(booleanQuery, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), termQuery, searcher);
+ QueryUtils.Check(Random(), termQuery, searcher, Similarity);
reader.Dispose();
@@ -337,7 +337,7 @@ namespace Lucene.Net.Search
booleanQuery.Add(termQuery, BooleanClause.Occur.MUST);
hits = searcher.Search(booleanQuery, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length);
- QueryUtils.Check(Random(), booleanQuery, searcher);
+ QueryUtils.Check(Random(), booleanQuery, searcher, Similarity);
reader.Dispose();
directory.Dispose();
@@ -380,7 +380,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits[1].Doc);
Assert.AreEqual(0.31, hits[2].Score, 0.01);
Assert.AreEqual(2, hits[2].Doc);
- QueryUtils.Check(Random(), query, searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
reader.Dispose();
directory.Dispose();
}
@@ -408,13 +408,13 @@ namespace Lucene.Net.Search
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length, "slop of 100 just right");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
Query.Slop = 99;
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "slop of 99 not enough");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
// work on two docs like this: "phrase exist notexist exist found"
@@ -429,7 +429,7 @@ namespace Lucene.Net.Search
ScoreDoc[] hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length, "phrase without repetitions exists in 2 docs");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// phrase with repetitions that exists in 2 docs
Query = new PhraseQuery();
@@ -440,7 +440,7 @@ namespace Lucene.Net.Search
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(2, hits.Length, "phrase with repetitions exists in two docs");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// phrase I with repetitions that does not exist in any doc
Query = new PhraseQuery();
@@ -451,7 +451,7 @@ namespace Lucene.Net.Search
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "nonexisting phrase with repetitions does not exist in any doc");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// phrase II with repetitions that does not exist in any doc
Query = new PhraseQuery();
@@ -463,7 +463,7 @@ namespace Lucene.Net.Search
hits = Searcher.Search(Query, null, 1000).ScoreDocs;
Assert.AreEqual(0, hits.Length, "nonexisting phrase with repetitions does not exist in any doc");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
}
/// <summary>
@@ -486,7 +486,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits.Length, "phrase found with exact phrase scorer");
float score0 = hits[0].Score;
//System.out.println("(exact) field: two three: "+score0);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// search on non palyndrome, find phrase with slop 2, though no slop required here.
Query.Slop = 2; // to use sloppy scorer
@@ -495,7 +495,7 @@ namespace Lucene.Net.Search
float score1 = hits[0].Score;
//System.out.println("(sloppy) field: two three: "+score1);
Assert.AreEqual(score0, score1, SCORE_COMP_THRESH, "exact scorer and sloppy scorer score the same when slop does not matter");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// search ordered in palyndrome, find it twice
Query = new PhraseQuery();
@@ -506,7 +506,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits.Length, "just sloppy enough");
//float score2 = hits[0].Score;
//System.out.println("palindrome: two three: "+score2);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//Assert.IsTrue("ordered scores higher in palindrome",score1+SCORE_COMP_THRESH<score2);
@@ -520,7 +520,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits.Length, "just sloppy enough");
//float score3 = hits[0].Score;
//System.out.println("palindrome: three two: "+score3);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//Assert.IsTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
@@ -548,7 +548,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits.Length, "phrase found with exact phrase scorer");
float score0 = hits[0].Score;
//System.out.println("(exact) field: one two three: "+score0);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// just make sure no exc:
Searcher.Explain(Query, 0);
@@ -560,7 +560,7 @@ namespace Lucene.Net.Search
float score1 = hits[0].Score;
//System.out.println("(sloppy) field: one two three: "+score1);
Assert.AreEqual(score0, score1, SCORE_COMP_THRESH, "exact scorer and sloppy scorer score the same when slop does not matter");
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
// search ordered in palyndrome, find it twice
Query = new PhraseQuery();
@@ -576,7 +576,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits.Length, "just sloppy enough");
//float score2 = hits[0].Score;
//System.out.println("palindrome: one two three: "+score2);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//Assert.IsTrue("ordered scores higher in palindrome",score1+SCORE_COMP_THRESH<score2);
@@ -591,7 +591,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits.Length, "just sloppy enough");
//float score3 = hits[0].Score;
//System.out.println("palindrome: three two one: "+score3);
- QueryUtils.Check(Random(), Query, Searcher);
+ QueryUtils.Check(Random(), Query, Searcher, Similarity);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//Assert.IsTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPositionIncrement.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPositionIncrement.cs b/src/Lucene.Net.Tests/core/Search/TestPositionIncrement.cs
index a953b6a..3f133b7 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPositionIncrement.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPositionIncrement.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Search
{
Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper(this);
Directory store = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), store, analyzer);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), store, analyzer, Similarity, TimeZone);
Document d = new Document();
d.Add(NewTextField("field", "bogus", Field.Store.YES));
writer.AddDocument(d);
@@ -230,7 +230,7 @@ namespace Lucene.Net.Search
public virtual void TestPayloadsPos0()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, new MockPayloadAnalyzer());
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, new MockPayloadAnalyzer(), Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("content", new StringReader("a a b c d e a f g h i j a b k k")));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs b/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
index f3461ea..5d65126 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPositiveScoresOnlyCollector.cs
@@ -90,7 +90,7 @@ namespace Lucene.Net.Search
}
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
writer.Commit();
IndexReader ir = writer.Reader;
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
index 6e33a0b..4e812e6 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixFilter.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Search
Directory directory = NewDirectory();
string[] categories = new string[] { "/Computers/Linux", "/Computers/Mac/One", "/Computers/Mac/Two", "/Computers/Windows" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
for (int i = 0; i < categories.Length; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index f0a291b..99b40e6 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
public void BeforeClass()
{
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
Document doc = new Document();
Field field = NewStringField(FIELD, "meaninglessnames", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
index fd5b85a..5f4719a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixQuery.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Search
Directory directory = NewDirectory();
string[] categories = new string[] { "/Computers", "/Computers/Mac", "/Computers/Windows" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
for (int i = 0; i < categories.Length; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
index b9ab94b..f7dfd3e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search
public virtual void TestBasic()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
public virtual void TestCustomCombine()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search
public virtual void TestExplain()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -277,7 +277,7 @@ namespace Lucene.Net.Search
public virtual void TestMissingSecondPassScore()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "0", Field.Store.YES));
@@ -335,7 +335,7 @@ namespace Lucene.Net.Search
{
Directory dir = NewDirectory();
int numDocs = AtLeast(1000);
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int[] idToNum = new int[numDocs];
int maxValue = TestUtil.NextInt(Random(), 10, 1000000);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs b/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
index 1de5e61..c61e090 100644
--- a/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestQueryWrapperFilter.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Search
public virtual void TestBasic()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "value", Field.Store.NO));
writer.AddDocument(doc);
@@ -92,7 +92,7 @@ namespace Lucene.Net.Search
public virtual void TestRandom()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
w.w.Config.SetMaxBufferedDocs(17);
int numDocs = AtLeast(100);
HashSet<string> aDocs = new HashSet<string>();
@@ -139,7 +139,7 @@ namespace Lucene.Net.Search
public virtual void TestThousandDocuments()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
for (int i = 0; i < 1000; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs b/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
index fc7ebcc..cea926a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestRegexpQuery.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField(FN, "the quick brown fox jumps over the lazy ??? dog 493432 49344", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs b/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
index 616ca1d..68dc1ef 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
Directory dir = NewDirectory();
MockAnalyzer analyzer = new MockAnalyzer(Random());
analyzer.MaxTokenLength = TestUtil.NextInt(Random(), 1, IndexWriter.MAX_TERM_LENGTH);
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer, Similarity, TimeZone);
LineFileDocs docs = new LineFileDocs(Random(), DefaultCodecSupportsDocValues());
int charsToIndex = AtLeast(100000);
int charsIndexed = 0;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs b/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
index 42cef6e..caa5b2a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestScoreCachingWrappingScorer.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Search
public virtual void TestGetScores()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
writer.Commit();
IndexReader ir = writer.Reader;
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
index e76a79d..93d3414 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search
}
Dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
int numDocs = AtLeast(200);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs b/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
index ed6f1df..6557fc7 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearchWithThreads.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Search
public virtual void Test()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
long startTime = Environment.TickCount;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
index 97c862c..240f310 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
@@ -529,7 +529,7 @@ namespace Lucene.Net.Search
{
Random random = Random();
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, dir);
+ RandomIndexWriter w = new RandomIndexWriter(random, dir, Similarity, TimeZone);
w.Commit();
IndexReader other = DirectoryReader.Open(dir);
@@ -571,7 +571,7 @@ namespace Lucene.Net.Search
public override IndexSearcher NewSearcher(IndexReader ignored)
{
- return LuceneTestCase.NewSearcher(Other);
+ return OuterInstance.NewSearcher(Other);
}
}
@@ -581,7 +581,7 @@ namespace Lucene.Net.Search
// make sure that maybeRefreshBlocking releases the lock, otherwise other
// threads cannot obtain it.
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
w.Dispose();
SearcherManager sm = new SearcherManager(dir, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
index 5cf923c..17d04bc 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSloppyPhraseQuery.cs
@@ -164,7 +164,7 @@ namespace Lucene.Net.Search
query.Slop = slop;
Directory ramDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), ramDir, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, false));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), ramDir, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, false), Similarity, TimeZone);
writer.AddDocument(doc);
IndexReader reader = writer.Reader;
@@ -243,7 +243,7 @@ namespace Lucene.Net.Search
private void AssertSaneScoring(PhraseQuery pq, IndexSearcher searcher)
{
searcher.Search(pq, new CollectorAnonymousInnerClassHelper(this));
- QueryUtils.Check(Random(), pq, searcher);
+ QueryUtils.Check(Random(), pq, searcher, Similarity);
}
private class CollectorAnonymousInnerClassHelper : Collector
@@ -290,7 +290,7 @@ namespace Lucene.Net.Search
public virtual void TestSlopWithHoles()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.OmitNorms = true;
Field f = new Field("lyrics", "", customType);
@@ -329,7 +329,7 @@ namespace Lucene.Net.Search
string document = "drug druggy drug drug drug";
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
iw.AddDocument(doc);
@@ -355,7 +355,7 @@ namespace Lucene.Net.Search
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
iw.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSort.cs b/src/Lucene.Net.Tests/core/Search/TestSort.cs
index 29991d1..01c9d97 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSort.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Search
public virtual void TestString()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search
public virtual void TestStringMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -130,7 +130,7 @@ namespace Lucene.Net.Search
public virtual void TestStringReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "bar", Field.Store.YES));
writer.AddDocument(doc);
@@ -159,7 +159,7 @@ namespace Lucene.Net.Search
public virtual void TestStringVal()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -188,7 +188,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search
public virtual void TestStringMissingSortedFirst()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -257,7 +257,7 @@ namespace Lucene.Net.Search
public virtual void TestStringMissingSortedFirstReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -292,7 +292,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValMissingSortedLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -328,7 +328,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValMissingSortedLastReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -362,7 +362,7 @@ namespace Lucene.Net.Search
public virtual void TestStringValReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "bar", Field.Store.YES));
writer.AddDocument(doc);
@@ -391,7 +391,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldDoc()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.NO));
writer.AddDocument(doc);
@@ -420,7 +420,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldDocReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.NO));
writer.AddDocument(doc);
@@ -449,7 +449,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldScore()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("value", "foo bar bar bar bar", Field.Store.NO));
writer.AddDocument(doc);
@@ -483,7 +483,7 @@ namespace Lucene.Net.Search
public virtual void TestFieldScoreReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("value", "foo bar bar bar bar", Field.Store.NO));
writer.AddDocument(doc);
@@ -515,7 +515,7 @@ namespace Lucene.Net.Search
public virtual void TestByte()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "23", Field.Store.YES));
writer.AddDocument(doc);
@@ -548,7 +548,7 @@ namespace Lucene.Net.Search
public virtual void TestByteMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -580,7 +580,7 @@ namespace Lucene.Net.Search
public virtual void TestByteMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -614,7 +614,7 @@ namespace Lucene.Net.Search
public virtual void TestByteReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "23", Field.Store.YES));
writer.AddDocument(doc);
@@ -647,7 +647,7 @@ namespace Lucene.Net.Search
public virtual void TestShort()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300", Field.Store.YES));
writer.AddDocument(doc);
@@ -680,7 +680,7 @@ namespace Lucene.Net.Search
public virtual void TestShortMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -712,7 +712,7 @@ namespace Lucene.Net.Search
public virtual void TestShortMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -746,7 +746,7 @@ namespace Lucene.Net.Search
public virtual void TestShortReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300", Field.Store.YES));
writer.AddDocument(doc);
@@ -779,7 +779,7 @@ namespace Lucene.Net.Search
public virtual void TestInt()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300000", Field.Store.YES));
writer.AddDocument(doc);
@@ -812,7 +812,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -844,7 +844,7 @@ namespace Lucene.Net.Search
public virtual void TestIntMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -878,7 +878,7 @@ namespace Lucene.Net.Search
public virtual void TestIntReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "300000", Field.Store.YES));
writer.AddDocument(doc);
@@ -911,7 +911,7 @@ namespace Lucene.Net.Search
public virtual void TestLong()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
writer.AddDocument(doc);
@@ -944,7 +944,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -976,7 +976,7 @@ namespace Lucene.Net.Search
public virtual void TestLongMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1010,7 +1010,7 @@ namespace Lucene.Net.Search
public virtual void TestLongReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "3000000000", Field.Store.YES));
writer.AddDocument(doc);
@@ -1043,7 +1043,7 @@ namespace Lucene.Net.Search
public virtual void TestFloat()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1076,7 +1076,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1108,7 +1108,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1142,7 +1142,7 @@ namespace Lucene.Net.Search
public virtual void TestFloatReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1175,7 +1175,7 @@ namespace Lucene.Net.Search
public virtual void TestDouble()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1212,7 +1212,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleSignedZero()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "+0", Field.Store.YES));
writer.AddDocument(doc);
@@ -1242,7 +1242,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissing()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1278,7 +1278,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleMissingLast()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
doc = new Document();
@@ -1316,7 +1316,7 @@ namespace Lucene.Net.Search
public virtual void TestDoubleReverse()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "30.1", Field.Store.YES));
writer.AddDocument(doc);
@@ -1480,7 +1480,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1537,7 +1537,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1595,7 +1595,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1652,7 +1652,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1709,7 +1709,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1767,7 +1767,7 @@ namespace Lucene.Net.Search
letters = (List<string>)CollectionsHelper.Shuffle(letters);
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
foreach (string letter in letters)
{
Document doc = new Document();
@@ -1821,7 +1821,7 @@ namespace Lucene.Net.Search
public virtual void TestSortOneDocument()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -1845,7 +1845,7 @@ namespace Lucene.Net.Search
public virtual void TestSortOneDocumentWithScores()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "foo", Field.Store.YES));
writer.AddDocument(doc);
@@ -1872,7 +1872,7 @@ namespace Lucene.Net.Search
public virtual void TestSortTwoFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("tievalue", "tied", Field.Store.NO));
doc.Add(NewStringField("value", "foo", Field.Store.YES));
@@ -1902,7 +1902,7 @@ namespace Lucene.Net.Search
public virtual void TestScore()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("value", "bar", Field.Store.NO));
writer.AddDocument(doc);
[28/34] lucenenet git commit: Passing Similarity and TimeZone into
RandomIndexWriter ctors.
Posted by sy...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
index 0a50535..8aeddf0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Index
public virtual void TestAddIndexes()
{
Directory d1 = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d1);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d1, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("id", "1", Field.Store.YES));
doc.Add(new NumericDocValuesField("dv", 1));
@@ -66,7 +66,7 @@ namespace Lucene.Net.Index
w.Dispose();
Directory d2 = NewDirectory();
- w = new RandomIndexWriter(Random(), d2);
+ w = new RandomIndexWriter(Random(), d2, Similarity, TimeZone);
doc = new Document();
doc.Add(NewStringField("id", "2", Field.Store.YES));
doc.Add(new NumericDocValuesField("dv", 2));
@@ -75,7 +75,7 @@ namespace Lucene.Net.Index
w.Dispose();
Directory d3 = NewDirectory();
- w = new RandomIndexWriter(Random(), d3);
+ w = new RandomIndexWriter(Random(), d3, Similarity, TimeZone);
w.AddIndexes(SlowCompositeReaderWrapper.Wrap(r1), SlowCompositeReaderWrapper.Wrap(r2));
r1.Dispose();
d1.Dispose();
@@ -97,7 +97,7 @@ namespace Lucene.Net.Index
public virtual void TestMultiValuedDocValuesField()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
Field f = new NumericDocValuesField("field", 17);
// Index doc values are single-valued so we should not
@@ -129,7 +129,7 @@ namespace Lucene.Net.Index
public virtual void TestDifferentTypedDocValuesField()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
// Index doc values are single-valued so we should not
// be able to add same field more than once:
@@ -161,7 +161,7 @@ namespace Lucene.Net.Index
public virtual void TestDifferentTypedDocValuesField2()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
// Index doc values are single-valued so we should not
// be able to add same field more than once:
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs b/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
index 5d29a06..3ba618a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
@@ -181,7 +181,7 @@ namespace Lucene.Net.Index
Random random = Random();
int NUM_DOCS = AtLeast(100);
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir, Similarity, TimeZone);
bool allowDups = random.NextBoolean();
HashSet<string> seen = new HashSet<string>();
if (VERBOSE)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
index 1a11039..c86d82a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
@@ -377,7 +377,7 @@ namespace Lucene.Net.Index
public virtual void TestDocsEnumStart()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("foo", "bar", Field.Store.NO));
writer.AddDocument(doc);
@@ -404,7 +404,7 @@ namespace Lucene.Net.Index
public virtual void TestDocsAndPositionsEnumStart()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("foo", "bar", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
index 5e5825d..0ec38fe 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Index
private static FieldInfos.Builder FieldInfos = null;
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
TestDoc = new Document();
FieldInfos = new FieldInfos.Builder();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index b1c9888..45f0640 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -2278,7 +2278,7 @@ namespace Lucene.Net.Index
{
Directory dir = NewDirectory();
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this);
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, a);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, a, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("body", "just a", Field.Store.NO));
doc.Add(new TextField("body", "test of gaps", Field.Store.NO));
@@ -2320,7 +2320,7 @@ namespace Lucene.Net.Index
Directory dir = NewDirectory();
Automaton secondSet = BasicAutomata.MakeString("foobar");
Analyzer a = new AnalyzerAnonymousInnerClassHelper3(this, secondSet);
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, a);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, a, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("body", "just a foobar", Field.Store.NO));
doc.Add(new TextField("body", "test of gaps", Field.Store.NO));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
index 60df181..4d640f3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
@@ -332,7 +332,7 @@ namespace Lucene.Net.Index
public virtual void TestDeleteAllNoDeadLock()
{
Directory dir = NewDirectory();
- RandomIndexWriter modifier = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter modifier = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numThreads = AtLeast(2);
ThreadClass[] threads = new ThreadClass[numThreads];
CountdownEvent latch = new CountdownEvent(1);
@@ -1106,7 +1106,7 @@ namespace Lucene.Net.Index
public virtual void TestDeleteAllSlowly()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int NUM_DOCS = AtLeast(1000);
IList<int?> ids = new List<int?>(NUM_DOCS);
for (int id = 0; id < NUM_DOCS; id++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index 2a927d9..0498329 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -1720,7 +1720,7 @@ namespace Lucene.Net.Index
public virtual void TestAddDocsNonAbortingException()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs1 = Random().Next(25);
for (int docCount = 0; docCount < numDocs1; docCount++)
{
@@ -1786,7 +1786,7 @@ namespace Lucene.Net.Index
public virtual void TestUpdateDocsNonAbortingException()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs1 = Random().Next(25);
for (int docCount = 0; docCount < numDocs1; docCount++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
index 051fd98..cd560cc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
@@ -488,7 +488,7 @@ namespace Lucene.Net.Index
this.NumDirs = numDirs;
this.MainWriter = mainWriter;
AddDir = NewDirectory();
- IndexWriter writer = new IndexWriter(AddDir, (IndexWriterConfig)NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMaxBufferedDocs(2));
+ IndexWriter writer = new IndexWriter(AddDir, OuterInstance.NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMaxBufferedDocs(2));
TestUtil.ReduceOpenFiles(writer);
for (int i = 0; i < NUM_INIT_DOCS; i++)
{
@@ -704,9 +704,9 @@ namespace Lucene.Net.Index
* //} //writer.DeleteDocuments(term); td.Dispose(); return doc; }
*/
- public static void CreateIndex(Random random, Directory dir1, string indexName, bool multiSegment)
+ public void CreateIndex(Random random, Directory dir1, string indexName, bool multiSegment)
{
- IndexWriter w = new IndexWriter(dir1, LuceneTestCase.NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(new LogDocMergePolicy()));
+ IndexWriter w = new IndexWriter(dir1, NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++)
{
w.AddDocument(DocHelper.CreateDocument(i, indexName, 4));
@@ -1186,7 +1186,7 @@ namespace Lucene.Net.Index
public override void Warm(AtomicReader r)
{
- IndexSearcher s = NewSearcher(r);
+ IndexSearcher s = OuterInstance.NewSearcher(r);
TopDocs hits = s.Search(new TermQuery(new Term("foo", "bar")), 10);
Assert.AreEqual(20, hits.TotalHits);
DidWarm.Set(true);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
index a296efa..9e301f7 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
@@ -317,7 +317,7 @@ namespace Lucene.Net.Index
{
Random rnd = Random();
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(rnd, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(rnd, dir, Similarity, TimeZone);
Document d = new Document();
// Single segment
Field f = NewStringField("f", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index cce7ca3..d353dfa 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -232,7 +232,7 @@ namespace Lucene.Net.Index
public virtual void TestArbitraryFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int NUM_DOCS = AtLeast(27);
if (VERBOSE)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs b/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
index b8e0a7e..6cb1f03 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIsCurrent.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Index
// initialize directory
Directory = NewDirectory();
- Writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ Writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
// write document
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs b/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
index 264f811..db15cdd 100644
--- a/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestOmitPositions.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
public virtual void TestBasic()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_AND_FREQS;
@@ -254,7 +254,7 @@ namespace Lucene.Net.Index
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_AND_FREQS;
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
for (int i = 0; i < 20; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
index ed80cc3..2e9427f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
@@ -636,13 +636,13 @@ namespace Lucene.Net.Index
public virtual void TestAcrossFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, true));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, true), Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("hasMaybepayload", "here we go", Field.Store.YES));
writer.AddDocument(doc);
writer.Dispose();
- writer = new RandomIndexWriter(Random(), dir, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, true));
+ writer = new RandomIndexWriter(Random(), dir, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, true), Similarity, TimeZone);
doc = new Document();
doc.Add(new TextField("hasMaybepayload2", "here we go", Field.Store.YES));
writer.AddDocument(doc);
@@ -696,7 +696,7 @@ namespace Lucene.Net.Index
public virtual void TestMixupMultiValued()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
Field field = new TextField("field", "", Field.Store.NO);
TokenStream ts = new MockTokenizer(new StringReader("here we go"), MockTokenizer.WHITESPACE, true);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
index d2f6380..b785164 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
@@ -95,7 +95,7 @@ namespace Lucene.Net.Index
public virtual void TestMixupMultiValued()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.StoreTermVectors = true;
@@ -138,7 +138,7 @@ namespace Lucene.Net.Index
public virtual void TestPayloadsWithoutPositions()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
index 9aa4dfa..8b0e0ba 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
@@ -438,7 +438,7 @@ namespace Lucene.Net.Index
public virtual void TestAddFieldTwice()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType customType3 = new FieldType(TextField.TYPE_STORED);
customType3.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestRollback.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestRollback.cs b/src/Lucene.Net.Tests/core/Index/TestRollback.cs
index d7f0e86..c55f16d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestRollback.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestRollback.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Index
public virtual void TestRollbackIntegrityWithBufferFlush()
{
Directory dir = NewDirectory();
- RandomIndexWriter rw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter rw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
for (int i = 0; i < 5; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs b/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
index ee7e0a8..5f832b0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSameTokenSamePosition.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Index
public virtual void Test()
{
Directory dir = NewDirectory();
- RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("eng", new BugReproTokenStream()));
riw.AddDocument(doc);
@@ -54,7 +54,7 @@ namespace Lucene.Net.Index
public virtual void TestMoreDocs()
{
Directory dir = NewDirectory();
- RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
for (int i = 0; i < 100; i++)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestSizeBoundedForceMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSizeBoundedForceMerge.cs b/src/Lucene.Net.Tests/core/Index/TestSizeBoundedForceMerge.cs
index c9080e0..7d0e0ab 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSizeBoundedForceMerge.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSizeBoundedForceMerge.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Index
writer.Commit();
}
- private static IndexWriterConfig NewWriterConfig()
+ private IndexWriterConfig NewWriterConfig()
{
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, null);
conf.SetMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
index 4e8cefb..ecd8643 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
Console.WriteLine("\nTEST: iter=" + iter);
}
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
HashSet<int> aDocs = new HashSet<int>();
Documents.Document doc = new Documents.Document();
Field f = NewStringField("field", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
index f594fdc..48dbbff 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
@@ -130,10 +130,12 @@ namespace Lucene.Net.Index
private class SearcherThread : TimedThread
{
internal Directory Directory;
+ private readonly LuceneTestCase OuterInstance;
- public SearcherThread(Directory directory, TimedThread[] threads)
+ public SearcherThread(Directory directory, TimedThread[] threads, LuceneTestCase outerInstance)
: base(threads)
{
+ OuterInstance = outerInstance;
this.Directory = directory;
}
@@ -142,7 +144,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 100; i++)
{
IndexReader ir = DirectoryReader.Open(Directory);
- IndexSearcher @is = NewSearcher(ir);
+ IndexSearcher @is = OuterInstance.NewSearcher(ir);
ir.Dispose();
}
Count += 100;
@@ -174,11 +176,11 @@ namespace Lucene.Net.Index
// Two searchers that constantly just re-instantiate the
// searcher:
- SearcherThread searcherThread1 = new SearcherThread(directory, threads);
+ SearcherThread searcherThread1 = new SearcherThread(directory, threads, this);
threads[numThread++] = searcherThread1;
searcherThread1.Start();
- SearcherThread searcherThread2 = new SearcherThread(directory, threads);
+ SearcherThread searcherThread2 = new SearcherThread(directory, threads, this);
threads[numThread++] = searcherThread2;
searcherThread2.Start();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index f335a90..2275402 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -272,9 +272,9 @@ namespace Lucene.Net.Index
return docs;
}
- public static void IndexSerial(Random random, IDictionary<string, Document> docs, Directory dir)
+ public void IndexSerial(Random random, IDictionary<string, Document> docs, Directory dir)
{
- IndexWriter w = new IndexWriter(dir, LuceneTestCase.NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(NewLogMergePolicy()));
+ IndexWriter w = new IndexWriter(dir, NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(NewLogMergePolicy()));
// index all docs in a single thread
IEnumerator<Document> iter = docs.Values.GetEnumerator();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs b/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
index af8649a..7a61009 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
@@ -465,7 +465,7 @@ namespace Lucene.Net.Index
}
else
{
- searcher = NewSearcher(r);
+ searcher = OuterInstance.NewSearcher(r);
lastReader = r;
lastSearcher = searcher;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs b/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
index 73cc3c4..27ab03a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
int numDocs = AtLeast(500);
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
Field id = NewStringField("id", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
index 86937a3..c2620c9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
@@ -410,7 +410,7 @@ namespace Lucene.Net.Index
public virtual void TestIllegalIndexableField()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.StoreTermVectors = true;
ft.StoreTermVectorPayloads = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
index f175d90..39c404c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Index
Directory d = NewDirectory();
MockAnalyzer analyzer = new MockAnalyzer(Random());
analyzer.MaxTokenLength = TestUtil.NextInt(Random(), 1, IndexWriter.MAX_TERM_LENGTH);
- RandomIndexWriter w = new RandomIndexWriter(Random(), d, analyzer);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, analyzer, Similarity, TimeZone);
int numDocs = AtLeast(10);
for (int docCount = 0; docCount < numDocs; docCount++)
{
@@ -230,7 +230,7 @@ namespace Lucene.Net.Index
public virtual void TestIntersectRandom()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numTerms = AtLeast(300);
//final int numTerms = 50;
@@ -583,7 +583,7 @@ namespace Lucene.Net.Index
public virtual void TestZeroTerms()
{
var d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "one two three", Field.Store.NO));
doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTransactions.cs b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
index a6d4635..24f539f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Index
public override void DoWork()
{
- var config = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))
+ var config = OuterInstance.NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))
.SetMaxBufferedDocs(3)
.SetMergeScheduler(_scheduler1)
.SetMergePolicy(NewLogMergePolicy(2));
@@ -143,7 +143,7 @@ namespace Lucene.Net.Index
// Intentionally use different params so flush/merge
// happen @ different times
- var config2 = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))
+ var config2 = OuterInstance.NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))
.SetMaxBufferedDocs(2)
.SetMergeScheduler(_scheduler2)
.SetMergePolicy(NewLogMergePolicy(3));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Payloads/PayloadHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/PayloadHelper.cs b/src/Lucene.Net.Tests/core/Search/Payloads/PayloadHelper.cs
index b9d3543..1a33ec7 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/PayloadHelper.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/PayloadHelper.cs
@@ -144,7 +144,7 @@ namespace Lucene.Net.Search.Payloads
Reader = DirectoryReader.Open(writer, true);
writer.Dispose();
- IndexSearcher searcher = LuceneTestCase.NewSearcher(Reader);
+ IndexSearcher searcher = LuceneTestCase.NewSearcher(Reader, similarity);
searcher.Similarity = similarity;
return searcher;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
index 7e5038c..7a1e1cd 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -305,7 +305,7 @@ namespace Lucene.Net.Search.Payloads
Assert.IsTrue(hits.TotalHits == 1, "hits Size: " + hits.TotalHits + " is not: " + 1);
int[] results = new int[1];
results[0] = 0; //hits.ScoreDocs[0].Doc;
- CheckHits.CheckHitCollector(Random(), query, PayloadHelper.NO_PAYLOAD_FIELD, Searcher, results);
+ CheckHits.CheckHitCollector(Random(), query, PayloadHelper.NO_PAYLOAD_FIELD, Searcher, results, Similarity);
}
internal class BoostingSimilarity : DefaultSimilarity
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
index 27e58b2..c2d3fab 100644
--- a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
+++ b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarity2.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestEmptyIndex()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IndexReader ir = iw.Reader;
iw.Dispose();
IndexSearcher @is = NewSearcher(ir);
@@ -104,7 +104,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestEmptyField()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("foo", "bar", Field.Store.NO));
iw.AddDocument(doc);
@@ -130,7 +130,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestEmptyTerm()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("foo", "bar", Field.Store.NO));
iw.AddDocument(doc);
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestNoNorms()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.OmitNorms = true;
@@ -184,7 +184,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestOmitTF()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_ONLY;
@@ -213,7 +213,7 @@ namespace Lucene.Net.Search.Similarities
public virtual void TestOmitTFAndNorms()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.IndexOptions = FieldInfo.IndexOptions.DOCS_ONLY;
@@ -247,7 +247,7 @@ namespace Lucene.Net.Search.Similarities
// however with spans, there is only one scorer for the whole hierarchy:
// inner queries are not real queries, their boosts are ignored, etc.
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
doc.Add(NewField("foo", "bar", ft));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
index 2b2c7ab..5d744c2 100644
--- a/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
+++ b/src/Lucene.Net.Tests/core/Search/Similarities/TestSimilarityBase.cs
@@ -106,7 +106,7 @@ namespace Lucene.Net.Search.Similarities
base.SetUp();
Dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
for (int i = 0; i < Docs.Length; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
index 968becb..bbe41ed 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -606,7 +606,7 @@ namespace Lucene.Net.Search.Spans
private void CheckHits(Query query, int[] results)
{
- Search.CheckHits.DoCheckHits(Random(), query, "field", Searcher, results);
+ Search.CheckHits.DoCheckHits(Random(), query, "field", Searcher, results, Similarity);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index 3d3bf4a..bb71d97 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search.Spans
protected internal virtual void Check(SpanQuery q, int[] docs)
{
- CheckHits.CheckHitCollector(Random(), q, null, Searcher, docs);
+ CheckHits.CheckHitCollector(Random(), q, null, Searcher, docs, Similarity);
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestNearSpansOrdered.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestNearSpansOrdered.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestNearSpansOrdered.cs
index 47d17f0..03a64ea 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestNearSpansOrdered.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestNearSpansOrdered.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search.Spans
public virtual void TestSpanNearQuery()
{
SpanNearQuery q = MakeQuery();
- CheckHits.DoCheckHits(Random(), q, FIELD, Searcher, new int[] { 0, 1 });
+ CheckHits.DoCheckHits(Random(), q, FIELD, Searcher, new int[] { 0, 1 }, Similarity);
}
public virtual string s(Spans span)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestSpanFirstQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanFirstQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanFirstQuery.cs
index 4d53ab9..2266bf7 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanFirstQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanFirstQuery.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search.Spans
CharacterRunAutomaton stopSet = new CharacterRunAutomaton((new RegExp("the|a|of")).ToAutomaton());
Analyzer analyzer = new MockAnalyzer(Random(), MockTokenizer.SIMPLE, true, stopSet);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, analyzer);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, analyzer, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "the quick brown fox", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
index 364b2e7..1f0d524 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanMultiTermQueryWrapper.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Search.Spans
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
Document doc = new Document();
Field field = NewTextField("field", "", Field.Store.NO);
doc.Add(field);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestSpans.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpans.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpans.cs
index e4e7277..0244808 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpans.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpans.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search.Spans
private void CheckHits(Query query, int[] results)
{
- Search.CheckHits.DoCheckHits(Random(), query, field, Searcher, results);
+ Search.CheckHits.DoCheckHits(Random(), query, field, Searcher, results, Similarity);
}
private void OrderedSlopTest3SQ(SpanQuery q1, SpanQuery q2, SpanQuery q3, int slop, int[] expectedDocs)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
index 857ced7..859ca20 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
@@ -128,9 +128,9 @@ namespace Lucene.Net.Search.Spans
/// <param name="description"> the description of the search </param>
/// <param name="expectedIds"> the expected document ids of the hits </param>
/// <param name="expectedScores"> the expected scores of the hits </param>
- protected internal static void AssertHits(IndexSearcher s, Query query, string description, string[] expectedIds, float[] expectedScores)
+ protected internal void AssertHits(IndexSearcher s, Query query, string description, string[] expectedIds, float[] expectedScores)
{
- QueryUtils.Check(Random(), query, s);
+ QueryUtils.Check(Random(), query, s, Similarity);
const float tolerance = 1e-5f;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs b/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
index 370bb9f..4cd8d3c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestAutomatonQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
Document doc = new Document();
Field titleField = NewTextField("title", "some title", Field.Store.NO);
Field field = NewTextField(FN, "this is document one 2345", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs b/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
index 56b4df1..60a38db 100644
--- a/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestAutomatonQueryUnicode.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
Document doc = new Document();
Field titleField = NewTextField("title", "some title", Field.Store.NO);
Field field = NewTextField(FN, "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index cb2ce62..7ba20e3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -91,7 +91,7 @@ namespace Lucene.Net.Search
Console.WriteLine("\nTEST: cycle...");
}
Directory copy = new MockDirectoryWrapper(Random(), new RAMDirectory(Dir2, IOContext.DEFAULT));
- RandomIndexWriter w = new RandomIndexWriter(Random(), Dir2);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), Dir2, Similarity, TimeZone);
w.AddIndexes(copy);
docCount = w.MaxDoc();
w.Dispose();
@@ -302,12 +302,12 @@ namespace Lucene.Net.Search
// match up.
Sort sort = Sort.INDEXORDER;
- QueryUtils.Check(Random(), q1, Searcher); // baseline sim
+ QueryUtils.Check(Random(), q1, Searcher, Similarity); // baseline sim
try
{
// a little hackish, QueryUtils.check is too costly to do on bigSearcher in this loop.
Searcher.Similarity = BigSearcher.Similarity; // random sim
- QueryUtils.Check(Random(), q1, Searcher);
+ QueryUtils.Check(Random(), q1, Searcher, Similarity);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index 450cd73..fca1ddd 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
string[] data = new string[] { "A 1 2 3 4 5 6", "Z 4 5 6", null, "B 2 4 5 6", "Y 3 5 6", null, "C 3 6", "X 4 5 6" };
Index = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), Index);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), Index, Similarity, TimeZone);
for (int i = 0; i < data.Length; i++)
{
@@ -100,7 +100,7 @@ namespace Lucene.Net.Search
}
Assert.AreEqual(expected, h2.Length, "result count (bs2)");
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
}
[Test]
@@ -352,8 +352,8 @@ namespace Lucene.Net.Search
TopDocs top2 = s.Search(q2, null, 100);
if (i < 100)
{
- QueryUtils.Check(Random(), q1, s);
- QueryUtils.Check(Random(), q2, s);
+ QueryUtils.Check(Random(), q1, s, Similarity);
+ QueryUtils.Check(Random(), q2, s, Similarity);
}
AssertSubsetOfSameScores(q2, top1, top2);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
index ede9299..1743a2f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanOr.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
private int Search(Query q)
{
- QueryUtils.Check(Random(), q, Searcher);
+ QueryUtils.Check(Random(), q, Searcher, Similarity);
return Searcher.Search(q, null, 1000).TotalHits;
}
@@ -145,7 +145,7 @@ namespace Lucene.Net.Search
Dir = NewDirectory();
//
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
//
Document d = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
index f3288c2..2e3272f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search
public virtual void TestNullOrSubScorer()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "a b c d", Field.Store.NO));
w.AddDocument(doc);
@@ -200,7 +200,7 @@ namespace Lucene.Net.Search
public virtual void TestBS2DisjunctionNextVsAdvance()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
int numDocs = AtLeast(300);
for (int docUpto = 0; docUpto < numDocs; docUpto++)
{
@@ -369,7 +369,7 @@ namespace Lucene.Net.Search
public virtual void TestInOrderWithMinShouldMatch()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "some text here", Field.Store.NO));
w.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
index 0e6915a..8af050b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanScorer.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search
string[] values = new string[] { "1", "2", "3", "4" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
for (int i = 0; i < values.Length; i++)
{
Document doc = new Document();
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search
// changes, we have a test to back it up.
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
writer.Commit();
IndexReader ir = writer.Reader;
writer.Dispose();
@@ -166,7 +166,7 @@ namespace Lucene.Net.Search
public virtual void TestMoreThan32ProhibitedClauses()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new TextField("field", "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33", Field.Store.NO));
w.AddDocument(doc);
@@ -321,7 +321,7 @@ namespace Lucene.Net.Search
public virtual void TestEmbeddedBooleanScorer()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "doctors are people who prescribe medicines of which they know little, to cure diseases of which they know less, in human beings of whom they know nothing", Field.Store.NO));
w.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
index 180d890..45a0894 100644
--- a/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestCachingWrapperFilter.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- Iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ Iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
Document doc = new Document();
Field idField = new StringField("id", "", Field.Store.NO);
doc.Add(idField);
@@ -173,7 +173,7 @@ namespace Lucene.Net.Search
public virtual void TestCachingWorks()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.Dispose();
IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -201,7 +201,7 @@ namespace Lucene.Net.Search
public virtual void TestNullDocIdSet()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.Dispose();
IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -240,7 +240,7 @@ namespace Lucene.Net.Search
public virtual void TestNullDocIdSetIterator()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.Dispose();
IndexReader reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
@@ -324,7 +324,7 @@ namespace Lucene.Net.Search
public virtual void TestIsCacheAble()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.AddDocument(new Document());
writer.Dispose();
@@ -371,7 +371,7 @@ namespace Lucene.Net.Search
// (must) get an NRT reader:
DirectoryReader reader = DirectoryReader.Open(writer.w, true);
// same reason we don't wrap?
- IndexSearcher searcher = NewSearcher(reader, false);
+ IndexSearcher searcher = NewSearcher(reader, false, Similarity);
// add a doc, refresh the reader, and check that it's there
Document doc = new Document();
@@ -379,7 +379,7 @@ namespace Lucene.Net.Search
writer.AddDocument(doc);
reader = RefreshReader(reader);
- searcher = NewSearcher(reader, false);
+ searcher = NewSearcher(reader, false, Similarity);
TopDocs docs = searcher.Search(new MatchAllDocsQuery(), 1);
Assert.AreEqual(1, docs.TotalHits, "Should find a hit...");
@@ -422,7 +422,7 @@ namespace Lucene.Net.Search
oldReader = reader;
reader = RefreshReader(reader);
- searcher = NewSearcher(reader, false);
+ searcher = NewSearcher(reader, false, Similarity);
missCount = filter.MissCount;
docs = searcher.Search(new MatchAllDocsQuery(), filter, 1);
@@ -437,7 +437,7 @@ namespace Lucene.Net.Search
filter = new CachingWrapperFilter(startFilter);
writer.AddDocument(doc);
reader = RefreshReader(reader);
- searcher = NewSearcher(reader, false);
+ searcher = NewSearcher(reader, false, Similarity);
docs = searcher.Search(new MatchAllDocsQuery(), filter, 1);
Assert.AreEqual(1, docs.TotalHits, "[query + filter] Should find a hit...");
@@ -456,7 +456,7 @@ namespace Lucene.Net.Search
oldReader = reader;
reader = RefreshReader(reader);
- searcher = NewSearcher(reader, false);
+ searcher = NewSearcher(reader, false, Similarity);
docs = searcher.Search(new MatchAllDocsQuery(), filter, 1);
Assert.AreEqual(2, docs.TotalHits, "[query + filter] Should find 2 hits...");
@@ -472,7 +472,7 @@ namespace Lucene.Net.Search
writer.DeleteDocuments(new Term("id", "1"));
reader = RefreshReader(reader);
- searcher = NewSearcher(reader, false);
+ searcher = NewSearcher(reader, false, Similarity);
docs = searcher.Search(new MatchAllDocsQuery(), filter, 1);
Assert.AreEqual(0, docs.TotalHits, "[query + filter] Should *not* find a hit...");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs b/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
index 5097f22..e1a4ac5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestConstantScoreQuery.cs
@@ -125,7 +125,7 @@ namespace Lucene.Net.Search
try
{
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("field", "term", Field.Store.NO));
@@ -191,7 +191,7 @@ namespace Lucene.Net.Search
public virtual void TestConstantScoreQueryAndFilter()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("field", "a", Field.Store.NO));
w.AddDocument(doc);
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search
public virtual void TestQueryWrapperFilter()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("field", "a", Field.Store.NO));
w.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestCustomSearcherSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestCustomSearcherSort.cs b/src/Lucene.Net.Tests/core/Search/TestCustomSearcherSort.cs
index dfa1d3c..4d374a0 100644
--- a/src/Lucene.Net.Tests/core/Search/TestCustomSearcherSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestCustomSearcherSort.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search
base.SetUp();
INDEX_SIZE = AtLeast(2000);
Index = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Index);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Index, Similarity, TimeZone);
RandomGen random = new RandomGen(this, Random());
for (int i = 0; i < INDEX_SIZE; ++i) // don't decrease; if to low the
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
index 33a6831..01c41ed 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
{
// create an index
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
long now = DateTime.UtcNow.Ticks / TimeSpan.TicksPerMillisecond;
@@ -109,7 +109,7 @@ namespace Lucene.Net.Search
{
// create an index
Directory indexStore = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), indexStore, Similarity, TimeZone);
long now = DateTime.UtcNow.Ticks / TimeSpan.TicksPerMillisecond;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDateSort.cs b/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
index 122c9f1..0416740 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateSort.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
base.SetUp();
// Create an index writer.
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone);
// oldest doc:
// Add the first document. text = "Document 1" dateTime = Oct 10 03:25:22 EDT 2007
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestDisjunctionMaxQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDisjunctionMaxQuery.cs b/src/Lucene.Net.Tests/core/Search/TestDisjunctionMaxQuery.cs
index 9225131..ee10095 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDisjunctionMaxQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDisjunctionMaxQuery.cs
@@ -185,7 +185,7 @@ namespace Lucene.Net.Search
dq.Add(Tq("id", "d1"));
dq.Add(Tq("dek", "DOES_NOT_EXIST"));
- QueryUtils.Check(Random(), dq, s);
+ QueryUtils.Check(Random(), dq, s, Similarity);
Assert.IsTrue(s.TopReaderContext is AtomicReaderContext);
Weight dw = s.CreateNormalizedWeight(dq);
AtomicReaderContext context = (AtomicReaderContext)s.TopReaderContext;
@@ -204,7 +204,7 @@ namespace Lucene.Net.Search
dq.Add(Tq("dek", "albino"));
dq.Add(Tq("dek", "DOES_NOT_EXIST"));
Assert.IsTrue(s.TopReaderContext is AtomicReaderContext);
- QueryUtils.Check(Random(), dq, s);
+ QueryUtils.Check(Random(), dq, s, Similarity);
Weight dw = s.CreateNormalizedWeight(dq);
AtomicReaderContext context = (AtomicReaderContext)s.TopReaderContext;
Scorer ds = dw.Scorer(context, (context.AtomicReader).LiveDocs);
@@ -218,7 +218,7 @@ namespace Lucene.Net.Search
DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.0f);
q.Add(Tq("hed", "albino"));
q.Add(Tq("hed", "elephant"));
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -245,7 +245,7 @@ namespace Lucene.Net.Search
DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.0f);
q.Add(Tq("dek", "albino"));
q.Add(Tq("dek", "elephant"));
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -273,7 +273,7 @@ namespace Lucene.Net.Search
q.Add(Tq("hed", "elephant"));
q.Add(Tq("dek", "albino"));
q.Add(Tq("dek", "elephant"));
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -299,7 +299,7 @@ namespace Lucene.Net.Search
DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.01f);
q.Add(Tq("dek", "albino"));
q.Add(Tq("dek", "elephant"));
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -329,17 +329,17 @@ namespace Lucene.Net.Search
q1.Add(Tq("hed", "albino"));
q1.Add(Tq("dek", "albino"));
q.Add(q1, BooleanClause.Occur.MUST); // true,false);
- QueryUtils.Check(Random(), q1, s);
+ QueryUtils.Check(Random(), q1, s, Similarity);
}
{
DisjunctionMaxQuery q2 = new DisjunctionMaxQuery(0.0f);
q2.Add(Tq("hed", "elephant"));
q2.Add(Tq("dek", "elephant"));
q.Add(q2, BooleanClause.Occur.MUST); // true,false);
- QueryUtils.Check(Random(), q2, s);
+ QueryUtils.Check(Random(), q2, s, Similarity);
}
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -375,7 +375,7 @@ namespace Lucene.Net.Search
q2.Add(Tq("dek", "elephant"));
q.Add(q2, BooleanClause.Occur.SHOULD); // false,false);
}
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -414,7 +414,7 @@ namespace Lucene.Net.Search
q2.Add(Tq("dek", "elephant"));
q.Add(q2, BooleanClause.Occur.SHOULD); // false,false);
}
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
@@ -464,7 +464,7 @@ namespace Lucene.Net.Search
q2.Add(Tq("dek", "elephant"));
q.Add(q2, BooleanClause.Occur.SHOULD); // false,false);
}
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs b/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
index a4a1569..e322c18 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search
// Tests that if a Filter produces a null DocIdSet, which is given to
// IndexSearcher, everything works fine. this came up in LUCENE-1754.
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("c", "val", Field.Store.NO));
writer.AddDocument(doc);
@@ -185,7 +185,7 @@ namespace Lucene.Net.Search
public virtual void TestNullIteratorFilteredDocIdSet()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("c", "val", Field.Store.NO));
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs b/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
index b7708c3..ba42db2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDocValuesScoring.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
public virtual void TestSimple()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
Field field = NewTextField("foo", "", Field.Store.NO);
doc.Add(field);
@@ -72,16 +72,16 @@ namespace Lucene.Net.Search
iw.Dispose();
// no boosting
- IndexSearcher searcher1 = NewSearcher(ir, false);
+ IndexSearcher searcher1 = NewSearcher(ir, false, Similarity);
Similarity @base = searcher1.Similarity;
// boosting
- IndexSearcher searcher2 = NewSearcher(ir, false);
+ IndexSearcher searcher2 = NewSearcher(ir, false, Similarity);
searcher2.Similarity = new PerFieldSimilarityWrapperAnonymousInnerClassHelper(this, field, @base);
// in this case, we searched on field "foo". first document should have 2x the score.
TermQuery tq = new TermQuery(new Term("foo", "quick"));
- QueryUtils.Check(Random(), tq, searcher1);
- QueryUtils.Check(Random(), tq, searcher2);
+ QueryUtils.Check(Random(), tq, searcher1, Similarity);
+ QueryUtils.Check(Random(), tq, searcher2, Similarity);
TopDocs noboost = searcher1.Search(tq, 10);
TopDocs boost = searcher2.Search(tq, 10);
@@ -93,8 +93,8 @@ namespace Lucene.Net.Search
// this query matches only the second document, which should have 4x the score.
tq = new TermQuery(new Term("foo", "jumps"));
- QueryUtils.Check(Random(), tq, searcher1);
- QueryUtils.Check(Random(), tq, searcher2);
+ QueryUtils.Check(Random(), tq, searcher1, Similarity);
+ QueryUtils.Check(Random(), tq, searcher2, Similarity);
noboost = searcher1.Search(tq, 10);
boost = searcher2.Search(tq, 10);
@@ -106,8 +106,8 @@ namespace Lucene.Net.Search
// search on on field bar just for kicks, nothing should happen, since we setup
// our sim provider to only use foo_boost for field foo.
tq = new TermQuery(new Term("bar", "quick"));
- QueryUtils.Check(Random(), tq, searcher1);
- QueryUtils.Check(Random(), tq, searcher2);
+ QueryUtils.Check(Random(), tq, searcher1, Similarity);
+ QueryUtils.Check(Random(), tq, searcher2, Similarity);
noboost = searcher1.Search(tq, 10);
boost = searcher2.Search(tq, 10);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs b/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
index e59f004..7bf327b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestEarlyTermination.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Search
{
base.SetUp();
Dir = NewDirectory();
- Writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ Writer = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index 4cd748d..50e6e70 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search
/// check the expDocNrs first, then check the query (and the explanations) </summary>
public virtual void Qtest(Query q, int[] expDocNrs)
{
- CheckHits.CheckHitCollector(Random(), q, FIELD, Searcher, expDocNrs);
+ CheckHits.CheckHitCollector(Random(), q, FIELD, Searcher, expDocNrs, Similarity);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Search/TestFieldCacheTermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCacheTermsFilter.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCacheTermsFilter.cs
index c6a10b6..a7d231f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCacheTermsFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCacheTermsFilter.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
{
string fieldName = "field1";
Directory rd = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), rd);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), rd, Similarity, TimeZone);
for (int i = 0; i < 100; i++)
{
Document doc = new Document();
[02/34] lucenenet git commit: Changing
OLD_FORMAT_IMPERSONATION_IS_ACTIVE to non-static property
Posted by sy...@apache.org.
Changing OLD_FORMAT_IMPERSONATION_IS_ACTIVE to non-static property
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/655fa1a0
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/655fa1a0
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/655fa1a0
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 655fa1a02f325551936c7b0388963b05204d296a
Parents: 93acfd9
Author: Connie Yau <co...@microsoft.com>
Authored: Tue Jul 12 05:26:26 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 15 09:28:41 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/655fa1a0/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 69de2b0..edc06d7 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -196,8 +196,8 @@ namespace Lucene.Net.Util
public LuceneTestCase()
{
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
String directory = Paths.TempDirectory;
-
TEMP_DIR = new System.IO.FileInfo(directory);
}
@@ -423,7 +423,7 @@ namespace Lucene.Net.Util
///
/// @lucene.internal
/// </summary>
- public static bool OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
+ public bool OLD_FORMAT_IMPERSONATION_IS_ACTIVE { get; protected set; }
// -----------------------------------------------------------------
// Class level (suite) rules.
[03/34] lucenenet git commit: Changing ClassEnvRule to non-static
Posted by sy...@apache.org.
Changing ClassEnvRule to non-static
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ae41663f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ae41663f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ae41663f
Branch: refs/heads/lucenenet-indexablefield-api
Commit: ae41663fd508e45deac3682104f1c8dabf3d6973
Parents: 655fa1a
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 12:17:21 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:17:21 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ae41663f/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index edc06d7..6065280 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -364,8 +364,6 @@ namespace Lucene.Net.Util
static LuceneTestCase()
{
- ClassEnvRule = new TestRuleSetupAndRestoreClassEnv();
-
bool defaultValue = false;
foreach (string property in Arrays.AsList("tests.leaveTemporary", "tests.leavetemporary", "tests.leavetmpdir", "solr.test.leavetmpdir")) // Solr's legacy - default - lowercase - ANT tasks's (junit4) flag.
{
@@ -437,7 +435,7 @@ namespace Lucene.Net.Util
/// <summary>
/// Class environment setup rule.
/// </summary>
- private static TestRuleSetupAndRestoreClassEnv ClassEnvRule;
+ internal TestRuleSetupAndRestoreClassEnv ClassEnvRule { get; private set; }
// LUCENENET TODO
/// <summary>
[33/34] lucenenet git commit: Adding LUCENENET specific comments to
APIs that changed
Posted by sy...@apache.org.
Adding LUCENENET specific comments to APIs that changed
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/13fadeb7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/13fadeb7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/13fadeb7
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 13fadeb78cad47c66b8b045bbc1e6405f0cf5c8e
Parents: 22caeb0
Author: Connie Yau <co...@microsoft.com>
Authored: Mon Aug 8 14:04:01 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Mon Aug 8 14:04:01 2016 -0700
----------------------------------------------------------------------
.../Analysis/BaseTokenStreamTestCase.cs | 28 ++++-
.../Codecs/lucene3x/PreFlexRWCodec.cs | 6 ++
.../Codecs/lucene40/Lucene40RWCodec.cs | 10 +-
.../lucene40/Lucene40RWDocValuesFormat.cs | 4 +
.../Codecs/lucene40/Lucene40RWNormsFormat.cs | 4 +
.../Codecs/lucene40/Lucene40RWPostingsFormat.cs | 4 +
.../Codecs/lucene41/Lucene41RWCodec.cs | 8 ++
.../Codecs/lucene42/Lucene42RWCodec.cs | 8 ++
.../lucene42/Lucene42RWDocValuesFormat.cs | 4 +
.../Codecs/lucene45/Lucene45RWCodec.cs | 8 ++
.../Index/RandomIndexWriter.cs | 27 +++--
.../Search/CheckHits.cs | 10 +-
.../Search/QueryUtils.cs | 22 +++-
.../Search/SearchEquivalenceTestBase.cs | 4 +
.../Util/LuceneTestCase.cs | 102 +++++++++++++++----
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 5 +-
.../Function/FunctionTestSetup.cs | 11 +-
.../Lucene3x/TestLucene3xStoredFieldsFormat.cs | 4 +
.../core/Codecs/Lucene3x/TestSurrogates.cs | 6 +-
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 6 +-
.../Lucene40/TestLucene40DocValuesFormat.cs | 4 +
.../Lucene40/TestLucene40PostingsFormat.cs | 4 +
.../Lucene40/TestLucene40PostingsReader.cs | 4 +
.../Lucene40/TestLucene40StoredFieldsFormat.cs | 4 +
.../Lucene40/TestLucene40TermVectorsFormat.cs | 4 +
.../core/Codecs/Lucene40/TestReuseDocsEnum.cs | 4 +
.../Lucene41/TestLucene41StoredFieldsFormat.cs | 4 +
.../Lucene42/TestLucene42DocValuesFormat.cs | 4 +
.../core/Index/TestBinaryDocValuesUpdates.cs | 5 +
.../core/Index/TestDirectoryReader.cs | 19 ++++
.../core/Index/TestDirectoryReaderReopen.cs | 4 +
.../core/Index/TestFieldsReader.cs | 4 +
.../core/Index/TestIndexWriter.cs | 2 -
.../core/Index/TestIndexWriterCommit.cs | 7 +-
.../core/Index/TestIndexWriterWithThreads.cs | 10 ++
.../core/Index/TestNeverDelete.cs | 10 ++
.../core/Index/TestRollingUpdates.cs | 5 +
.../core/Index/TestSnapshotDeletionPolicy.cs | 5 +
.../core/Index/TestStressIndexing.cs | 15 +++
.../core/Index/TestStressIndexing2.cs | 4 +
.../core/Search/BaseTestRangeFilter.cs | 10 ++
.../core/Search/FuzzyTermOnShortTermsTest.cs | 4 +
.../Search/Payloads/TestPayloadNearQuery.cs | 4 +
.../Search/Payloads/TestPayloadTermQuery.cs | 4 +
.../core/Search/Spans/TestBasics.cs | 4 +
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 4 +
.../core/Search/Spans/TestSpansAdvanced.cs | 3 +
.../core/Search/TestBoolean2.cs | 4 +
.../core/Search/TestBooleanMinShouldMatch.cs | 4 +
.../core/Search/TestExplanations.cs | 5 +
.../core/Search/TestMinShouldMatch2.cs | 4 +
.../core/Search/TestMultiTermConstantScore.cs | 4 +
.../core/Search/TestMultiTermQueryRewrites.cs | 4 +
.../core/Search/TestNGramPhraseQuery.cs | 4 +
.../core/Search/TestNumericRangeQuery32.cs | 4 +
.../core/Search/TestNumericRangeQuery64.cs | 4 +
.../core/Search/TestPhraseQuery.cs | 2 +-
.../core/Search/TestPrefixInBooleanQuery.cs | 4 +
.../core/Search/TestTermVectors.cs | 4 +
59 files changed, 440 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index 9253f7e..84ebc64 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -528,22 +528,37 @@ namespace Lucene.Net.Analysis
}
/// <summary>
- /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
+ /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy
+ ///
+ /// LUCENENET specific
+ /// Non-static to reduce the inter-class dependencies due to use of
+ /// static variables
+ /// </summary>
public void CheckRandomData(Random random, Analyzer a, int iterations)
{
CheckRandomData(random, a, iterations, 20, false, true);
}
/// <summary>
- /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
+ /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy
+ ///
+ /// LUCENENET specific
+ /// Non-static to reduce the inter-class dependencies due to use of
+ /// static variables
+ /// </summary>
public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength)
{
CheckRandomData(random, a, iterations, maxWordLength, false, true);
}
/// <summary>
- /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
- /// <param name="simple"> true if only ascii strings will be used (try to avoid) </param>
+ /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy
+ ///
+ /// LUCENENET specific
+ /// Non-static to reduce the inter-class dependencies due to use of
+ /// static variables
+ /// </summary>
+ /// <param name="simple"> true if only ascii strings will be used (try to avoid)</param>
public void CheckRandomData(Random random, Analyzer a, int iterations, bool simple)
{
CheckRandomData(random, a, iterations, 20, simple, true);
@@ -567,6 +582,11 @@ namespace Lucene.Net.Analysis
// interact)... so this is just "best effort":
public bool Failed;
+ /// <summary>
+ /// <param name="outerInstance">
+ /// LUCENENET specific
+ /// Added to remove a call to the then-static BaseTokenStreamTestCase methods</param>
+ /// </summary>
internal AnalysisThread(long seed, /*CountdownEvent latch,*/ Analyzer a, int iterations, int maxWordLength,
bool useCharFilter, bool simple, bool offsetsAreCorrect, RandomIndexWriter iw, BaseTokenStreamTestCase outerInstance)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
index a925737..51d1ef3 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
@@ -33,6 +33,12 @@ namespace Lucene.Net.Codecs.Lucene3x
private readonly StoredFieldsFormat StoredFields = new PreFlexRWStoredFieldsFormat();
private readonly bool _oldFormatImpersonationIsActive;
+ /// <summary>
+ /// </summary>
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public PreFlexRWCodec(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
index 2e54359..bc39321 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
@@ -24,7 +24,11 @@ namespace Lucene.Net.Codecs.Lucene40
public sealed class Lucene40RWCodec : Lucene40Codec
{
private readonly FieldInfosFormat fieldInfos;
-
+
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWCodec(bool oldFormatImpersonationIsActive) : base()
{
fieldInfos = new Lucene40FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
@@ -36,6 +40,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
index 2d47058..bbc2594 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
@@ -27,6 +27,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWDocValuesFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
index 5aaf248..3bce3b0 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
@@ -27,6 +27,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWNormsFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
index c6e6676..2a41c73 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
@@ -27,6 +27,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWPostingsFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
index ab5b775..1ab99be 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
@@ -34,6 +34,10 @@ namespace Lucene.Net.Codecs.Lucene41
private readonly NormsFormat Norms;
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene41RWCodec(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
@@ -47,6 +51,10 @@ namespace Lucene.Net.Codecs.Lucene41
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
index 93b192d..6263eb2 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene42
private readonly NormsFormat Norms = new Lucene42NormsFormat();
private readonly FieldInfosFormat fieldInfosFormat;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42RWCodec(bool oldFormatImpersonationIsActive) : base()
{
Dv = new Lucene42RWDocValuesFormat(oldFormatImpersonationIsActive);
@@ -38,6 +42,10 @@ namespace Lucene.Net.Codecs.Lucene42
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
index 5c00c98..de60523 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene42
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42RWDocValuesFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
index 25c6571..f6c4722 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene45
{
private readonly FieldInfosFormat fieldInfosFormat;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene45RWCodec(bool oldFormatImpersonationIsActive) : base()
{
fieldInfosFormat = new Lucene42FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
@@ -37,6 +41,10 @@ namespace Lucene.Net.Codecs.Lucene45
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index b0d6b69..d1c1976 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -85,14 +85,28 @@ namespace Lucene.Net.Index
}
/// <summary>
- /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT and MockAnalyzer </summary>
+ /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT and MockAnalyzer
+ ///
+ /// LUCENENET specific
+ /// Similarity and TimeZone parameters allow a RandomIndexWriter to be
+ /// created without adding a dependency on
+ /// <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
+ /// <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
+ /// </summary>
public RandomIndexWriter(Random r, Directory dir, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(r), similarity, timezone))
{
}
/// <summary>
- /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT </summary>
+ /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT
+ ///
+ /// LUCENENET specific
+ /// Similarity and TimeZone parameters allow a RandomIndexWriter to be
+ /// created without adding a dependency on
+ /// <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
+ /// <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
+ /// </summary>
public RandomIndexWriter(Random r, Directory dir, Analyzer a, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, a, similarity, timezone))
{
@@ -100,11 +114,12 @@ namespace Lucene.Net.Index
/// <summary>
/// Creates a RandomIndexWriter with a random config
- ///
+ ///
/// LUCENENET specific
- /// This override allows a RandomIndexWriter to be created without
- /// adding a dependency on the LuceneTestCase.ClassEnv.Similarity and
- /// LuceneTestCase.ClassEnv.TimeZone property
+ /// Similarity and TimeZone parameters allow a RandomIndexWriter to be
+ /// created without adding a dependency on
+ /// <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
+ /// <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
/// </summary>
public RandomIndexWriter(Random r, Directory dir, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, v, a, similarity, timezone))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Search/CheckHits.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/CheckHits.cs b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
index f7c77aa..f58e6be 100644
--- a/src/Lucene.Net.TestFramework/Search/CheckHits.cs
+++ b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
@@ -91,7 +91,11 @@ namespace Lucene.Net.Search
/// <param name="searcher"> the searcher to test the query against </param>
/// <param name="defaultFieldName"> used for displaying the query in assertion messages </param>
/// <param name="results"> a list of documentIds that must match the query </param>
- /// <seealso cref= #checkHits </seealso>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
+ /// <seealso cref=#checkHits </seealso>
public static void CheckHitCollector(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results, Similarity similarity)
{
QueryUtils.Check(random, query, searcher, similarity);
@@ -170,6 +174,10 @@ namespace Lucene.Net.Search
/// <param name="searcher"> the searcher to test the query against </param>
/// <param name="defaultFieldName"> used for displaing the query in assertion messages </param>
/// <param name="results"> a list of documentIds that must match the query </param>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
/// <seealso cref= #checkHitCollector </seealso>
public static void DoCheckHits(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results, Similarity similarity)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
index 88ff11d..cc83440 100644
--- a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
+++ b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
@@ -118,6 +118,10 @@ namespace Lucene.Net.Search
/// Various query sanity checks on a searcher, some checks are only done for
/// instanceof IndexSearcher.
/// </summary>
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
/// <seealso cref= #check(Query) </seealso>
/// <seealso cref= #checkFirstSkipTo </seealso>
/// <seealso cref= #checkSkipTo </seealso>
@@ -128,6 +132,10 @@ namespace Lucene.Net.Search
Check(random, q1, s, true, similarity);
}
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static void Check(Random random, Query q1, IndexSearcher s, bool wrap, Similarity similarity)
{
try
@@ -200,6 +208,10 @@ namespace Lucene.Net.Search
/// behave exactly the same as the original IndexSearcher. </summary>
/// <param name="s"> the searcher to wrap </param>
/// <param name="edge"> if negative, s will be the first sub; if 0, s will be in the middle, if positive s will be the last sub </param>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher WrapUnderlyingReader(Random random, IndexSearcher s, int edge, Similarity similarity)
{
IndexReader r = s.IndexReader;
@@ -251,6 +263,10 @@ namespace Lucene.Net.Search
/// alternate scorer skipTo(),skipTo(),next(),next(),skipTo(),skipTo(), etc
/// and ensure a hitcollector receives same docs and scores
/// </summary>
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static void CheckSkipTo(Query q, IndexSearcher s, Similarity similarity)
{
//System.out.println("Checking "+q);
@@ -412,7 +428,11 @@ namespace Lucene.Net.Search
}
/// <summary>
- /// check that first skip on just created scorers always goes to the right doc </summary>
+ /// check that first skip on just created scorers always goes to the right doc</summary>
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static void CheckFirstSkipTo(Query q, IndexSearcher s, Similarity similarity)
{
//System.out.println("checkFirstSkipTo: "+q);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
index 19a182c..ba5f663 100644
--- a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
@@ -57,6 +57,10 @@ namespace Lucene.Net.Search
protected internal static Analyzer Analyzer;
protected internal static string Stopword; // we always pick a character as a stopword
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because ClassEnvRule is no longer static.
+ /// </summary>
[SetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index ac143ba..9f95259 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -423,6 +423,9 @@ namespace Lucene.Net.Util
/// specific tests on demand.
///
/// @lucene.internal
+ ///
+ /// LUCENENET specific
+ /// Is non-static to remove inter-class dependencies on this variable
/// </summary>
public bool OLD_FORMAT_IMPERSONATION_IS_ACTIVE { get; protected set; }
@@ -437,16 +440,27 @@ namespace Lucene.Net.Util
/// <summary>
/// Class environment setup rule.
+ ///
+ /// LUCENENET specific
+ /// Is non-static to remove inter-class dependencies on this variable
/// </summary>
internal TestRuleSetupAndRestoreClassEnv ClassEnvRule { get; private set; }
/// <summary>
/// Gets the Similarity from the Class Environment setup rule
+ ///
+ /// LUCENENET specific
+ /// Exposed because <see cref="TestRuleSetupAndRestoreClassEnv"/> is
+ /// internal and this field is needed by other classes.
/// </summary>
public Similarity Similarity { get { return ClassEnvRule.Similarity; } }
/// <summary>
/// Gets the Timezone from the Class Environment setup rule
+ ///
+ /// LUCENENET specific
+ /// Exposed because <see cref="TestRuleSetupAndRestoreClassEnv"/> is
+ /// internal and this field is needed by other classes.
/// </summary>
public TimeZone TimeZone { get { return ClassEnvRule.TimeZone; } }
@@ -851,19 +865,32 @@ namespace Lucene.Net.Util
}
/// <summary>
- /// create a new index writer config with random defaults </summary>
+ /// create a new index writer config with random defaults
+ ///
+ /// LUCENENET specific
+ /// Non-static so that we do not depend on any hidden static dependencies
+ /// </summary>
public IndexWriterConfig NewIndexWriterConfig(LuceneVersion v, Analyzer a)
{
return NewIndexWriterConfig(Random(), v, a);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Non-static so that we do not depend on any hidden static dependencies
+ /// </summary>
public IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a)
{
return NewIndexWriterConfig(r, v, a, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
}
/// <summary>
- /// create a new index writer config with random defaults using the specified random </summary>
+ /// create a new index writer config with random defaults using the specified random
+ ///
+ /// LUCENENET specific
+ /// This is the only static ctor for IndexWriterConfig because it removes the dependency
+ /// on ClassEnvRule by using parameters Similarity and TimeZone.
+ /// </summary>
public static IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
{
IndexWriterConfig c = new IndexWriterConfig(v, a);
@@ -963,24 +990,10 @@ namespace Lucene.Net.Util
return c;
}
- /// <summary>
- /// Gets an IndexWriterConfig using the current TEST_LUCENE_VERSION and a MockAnalyzer
- /// </summary>
- public IndexWriterConfig NewIndexWriterConfig()
- {
- var random = Random();
-
- return NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random));
- }
-
- /// <summary>
- /// Gets an IndexWriterConfig using the current TEST_LUCENE_VERSION and the given analyzer
- /// </summary>
- public IndexWriterConfig NewIndexWriterConfig(Analyzer a)
- {
- return NewIndexWriterConfig(Random(), TEST_VERSION_CURRENT, a);
- }
-
+ /// <param name="timezone">
+ /// LUCENENET specific
+ /// Timezone added to remove dependency on the then-static <see cref="ClassEnvRule"/>
+ /// </param>
public static MergePolicy NewMergePolicy(Random r, TimeZone timezone)
{
if (Rarely(r))
@@ -998,6 +1011,10 @@ namespace Lucene.Net.Util
return NewLogMergePolicy(r);
}
+ /// <param name="timezone">
+ /// LUCENENET specific
+ /// Timezone added to remove dependency on the then-static <see cref="ClassEnvRule"/>
+ /// </param>
public static MergePolicy NewMergePolicy(TimeZone timezone)
{
return NewMergePolicy(Random(), timezone);
@@ -1277,31 +1294,61 @@ namespace Lucene.Net.Util
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewStringField(string name, string value, Field.Store stored)
{
return NewField(Random(), name, value, stored == Field.Store.YES ? StringField.TYPE_STORED : StringField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewTextField(string name, string value, Field.Store stored)
{
return NewField(Random(), name, value, stored == Field.Store.YES ? TextField.TYPE_STORED : TextField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewStringField(Random random, string name, string value, Field.Store stored)
{
return NewField(random, name, value, stored == Field.Store.YES ? StringField.TYPE_STORED : StringField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is also non-static to reduce hidden dependencies on this variable.
+ /// </summary>
public Field NewTextField(Random random, string name, string value, Field.Store stored)
{
return NewField(random, name, value, stored == Field.Store.YES ? TextField.TYPE_STORED : TextField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewField(string name, string value, FieldType type)
{
return NewField(Random(), name, value, type);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewField(Random random, string name, string value, FieldType type)
{
name = new string(name.ToCharArray());
@@ -1577,12 +1624,19 @@ namespace Lucene.Net.Util
/// <summary>
/// Create a new searcher over the reader. this searcher might randomly use
/// threads.
+ ///
+ /// LUCENENET specific
+ /// Is non-static because <see cref="ClassEnvRule"/> is now non-static.
/// </summary>
public IndexSearcher NewSearcher(IndexReader r)
{
return NewSearcher(r, ClassEnvRule.Similarity);
}
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher NewSearcher(IndexReader r, Similarity similarity)
{
return NewSearcher(r, true, similarity);
@@ -1592,6 +1646,10 @@ namespace Lucene.Net.Util
/// Create a new searcher over the reader. this searcher might randomly use
/// threads.
/// </summary>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, Similarity similarity)
{
return NewSearcher(r, maybeWrap, true, similarity);
@@ -1609,6 +1667,10 @@ namespace Lucene.Net.Util
/// <code>wrapWithAssertions</code> is true, this searcher might be an
/// <seealso cref="AssertingIndexSearcher"/> instance.
/// </summary>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions, Similarity similarity)
{
Random random = Random();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 2df9d52..b4bc17b 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -45,7 +45,10 @@ namespace Lucene.Net.Facet.Taxonomy
private static FacetsConfig config;
-
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
index a94231c..896a504 100644
--- a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
@@ -65,7 +65,10 @@ namespace Lucene.Net.Tests.Queries.Function
anlzr = null;
}
-
+ /// <summary>
+ /// LUCENENET specific
+ /// Non-static because NewIndexWriterConfig is now non-static
+ /// </summary>
protected internal void CreateIndex(bool doMultiSegment)
{
if (VERBOSE)
@@ -110,7 +113,11 @@ namespace Lucene.Net.Tests.Queries.Function
Console.WriteLine("TEST: setUp done close");
}
}
-
+
+ /// <summary>
+ /// LUCENENET specific
+ /// Non-static because NewField is now non-static
+ /// </summary>
private void AddDoc(RandomIndexWriter iw, int i)
{
Document d = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
index f323e3a..b28f86a 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -25,6 +25,10 @@ namespace Lucene.Net.Codecs.Lucene3x
[TestFixture]
public class TestLucene3xStoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
index ad96e0d..256eae2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -33,7 +33,11 @@ namespace Lucene.Net.Codecs.Lucene3x
public class TestSurrogates : LuceneTestCase
{
/// <summary>
- /// we will manually instantiate preflex-rw here </summary>
+ /// we will manually instantiate preflex-rw here
+ ///
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index 3927927..227e22b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -64,7 +64,11 @@ namespace Lucene.Net.Codecs.Lucene3x
private static IList<Term> SampleTerms;
/// <summary>
- /// we will manually instantiate preflex-rw here </summary>
+ /// we will manually instantiate preflex-rw here
+ ///
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
index 86a0bde..813c638 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -26,6 +26,10 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class TestLucene40DocValuesFormat : BaseDocValuesFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
index b418edf..c7f7f07 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -26,6 +26,10 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class TestLucene40PostingsFormat : BasePostingsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
index 793fc3a..73852cd 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -53,6 +53,10 @@ namespace Lucene.Net.Codecs.Lucene40
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
index ee4e582..4e57234 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -23,6 +23,10 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40StoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
index a512f67..342d7ce 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -23,6 +23,10 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40TermVectorsFormat : BaseTermVectorsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
index 29efae2..c335b8c 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -46,6 +46,10 @@ namespace Lucene.Net.Codecs.Lucene40
[TestFixture]
public class TestReuseDocsEnum : LuceneTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index 4f55ac2..4259478 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -23,6 +23,10 @@ namespace Lucene.Net.Codecs.Lucene41
public class TestLucene41StoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index 417b29b..4cf9c73 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene42
{
private Codec Codec_Renamed;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
index eadd065..9c89305 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
@@ -1131,6 +1131,11 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Split from <see cref="TestUpdateOldSegments"/> because OLD_FORMAT_IMPERSONATION_IS_ACTIVE
+ /// is no longer static and the existing codecs have to be remade.
+ /// </summary>
[Test]
public virtual void TestUpdateOldSegments_OldFormatNotActive()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 2de7c4d..f5bc803 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -497,6 +497,11 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewStringField, NewTextField, NewField methods
+ /// are no longer static.
+ /// </summary>
internal void AddDocumentWithFields(IndexWriter writer)
{
Document doc = new Document();
@@ -510,6 +515,11 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewStringField, NewTextField, NewField methods
+ /// are no longer static.
+ /// </summary>
internal void AddDocumentWithDifferentFields(IndexWriter writer)
{
Document doc = new Document();
@@ -523,6 +533,11 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewTextField, NewField methods are no longer
+ /// static.
+ /// </summary>
internal void AddDocumentWithTermVectorFields(IndexWriter writer)
{
Document doc = new Document();
@@ -547,6 +562,10 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewTextField is no longer static.
+ /// </summary>
internal void AddDoc(IndexWriter writer, string value)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
index 95dcfa9..bb47a09 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
@@ -559,6 +559,10 @@ namespace Lucene.Net.Index
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
public void CreateIndex(Random random, Directory dir, bool multiSegment)
{
IndexWriter.Unlock(dir);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
index 0ec38fe..49933a7 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -45,6 +45,10 @@ namespace Lucene.Net.Index
private static Document TestDoc;
private static FieldInfos.Builder FieldInfos = null;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 02317d0..fd030d1 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -147,7 +147,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Changed from internal static method to private to remove
/// inter-dependencies between TestIndexWriter*.cs, TestAddIndexes.cs
/// and TestDeletionPolicy.cs tests
@@ -161,7 +160,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Changed from internal static method to private to remove
/// inter-dependencies between TestIndexWriter*.cs, TestAddIndexes.cs
/// and TestDeletionPolicy.cs tests
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
index b2b6eda..af25a0a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
@@ -393,6 +393,11 @@ namespace Lucene.Net.Index
private long EndTime;
private int FinalI;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// This is passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
public ThreadAnonymousInnerClassHelper(Directory dir, RandomIndexWriter w, AtomicBoolean failed, long endTime, int finalI, Func<string, string, Field.Store, Field> newStringField)
{
NewStringField = newStringField;
@@ -739,7 +744,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Copied from <see cref="TestIndexWriter.AddDoc(IndexWriter)"/>
/// to remove inter-class dependency on <see cref="TestIndexWriter"/>
/// </summary>
@@ -752,7 +756,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Copied from <seealso cref="TestIndexWriter.AddDocWithIndex(IndexWriter, int)"/>
/// to remove inter-class dependency on <see cref="TestIndexWriter"/>.
/// </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
index d983d88..e80286e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
@@ -65,6 +65,11 @@ namespace Lucene.Net.Index
internal bool NoErrors;
internal volatile int AddCount;
+ /// <param name="newField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewField(string, string, FieldType)"/>
+ /// is no longer static.
+ /// </param>
public IndexerThread(IndexWriter writer, bool noErrors, Func<string, string, FieldType, Field> newField)
{
this.Writer = writer;
@@ -602,6 +607,11 @@ namespace Lucene.Net.Index
internal CountdownEvent IwConstructed;
private readonly LuceneTestCase OuterInstance;
+ /// <param name="outerInstance">
+ /// LUCENENET specific
+ /// Passed in because this class acceses non-static methods,
+ /// NewTextField and NewIndexWriterConfig
+ /// </param>
public DelayedIndexAndCloseRunnable(Directory dir, CountdownEvent iwConstructed, LuceneTestCase outerInstance)
{
this.Dir = dir;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs b/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
index 74db3bb..572182c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
@@ -110,6 +110,16 @@ namespace Lucene.Net.Index
private RandomIndexWriter w;
private long StopTime;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static
+ /// </param>
+ /// <param name="newTextField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewTextField(string, string, Field.Store)"/>
+ /// is no longer static
+ /// </param>
public ThreadAnonymousInnerClassHelper(RandomIndexWriter w, long stopTime,
Func<string, string, Field.Store, Field> newStringField, Func<string, string, Field.Store, Field> newTextField)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
index 804822c..c3764da 100644
--- a/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
@@ -231,6 +231,11 @@ namespace Lucene.Net.Index
private readonly Func<string, string, Field.Store, Field> NewStringField;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
public IndexingThread(LineFileDocs docs, IndexWriter writer, int num, Func<string, string, Field.Store, Field> newStringField)
: base()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
index 682e1cc..bc071b2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
@@ -185,6 +185,11 @@ namespace Lucene.Net.Index
private IndexWriter Writer;
private readonly Func<string, string, FieldType, Field> _newFieldFunc;
+ /// <param name="newFieldFunc">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewField(string, string, FieldType)"/>
+ /// is no longer static.
+ /// </param>
public ThreadAnonymousInnerClassHelper(long stopTime, IndexWriter writer, Func<string, string, FieldType, Field> newFieldFunc)
{
this.StopTime = stopTime;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
index 48dbbff..d97ee79 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
@@ -95,6 +95,16 @@ namespace Lucene.Net.Index
internal IndexWriter Writer;
internal int NextID;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
+ /// <param name="newTextField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewTextField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
public IndexerThread(IndexWriter writer, TimedThread[] threads,
Func<string, string, Field.Store, Field> newStringField,
Func<string, string, Field.Store, Field> newTextField)
@@ -132,6 +142,11 @@ namespace Lucene.Net.Index
internal Directory Directory;
private readonly LuceneTestCase OuterInstance;
+ /// <param name="outerInstance">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewSearcher(IndexReader)"/>
+ /// is no longer static.
+ /// </param>
public SearcherThread(Directory directory, TimedThread[] threads, LuceneTestCase outerInstance)
: base(threads)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index 2275402..d35cdd9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -272,6 +272,10 @@ namespace Lucene.Net.Index
return docs;
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
public void IndexSerial(Random random, IDictionary<string, Document> docs, Directory dir)
{
IndexWriter w = new IndexWriter(dir, NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
index 29ef55e..96ec2f4 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -95,6 +95,11 @@ namespace Lucene.Net.Search
return b.ToString();
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="Build(Random, TestIndex)"/> is no
+ /// longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClassBaseTestRangeFilter()
{
@@ -118,6 +123,11 @@ namespace Lucene.Net.Search
UnsignedIndexDir = null;
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Passed in because NewStringField and NewIndexWriterConfig are no
+ /// longer static.
+ /// </summary>
private IndexReader Build(Random random, TestIndex index)
{
/* build an index */
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
index a6678f6..19c91b4 100644
--- a/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
+++ b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
@@ -96,6 +96,10 @@ namespace Lucene.Net.Search
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
public Directory GetDirectory(Analyzer analyzer, string[] vals)
{
Directory directory = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
index 7b756ce..9da6e81 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -110,6 +110,10 @@ namespace Lucene.Net.Search.Payloads
return new PayloadNearQuery(clauses, 0, inOrder, function);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
index 7a1e1cd..b44ffd4 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -115,6 +115,10 @@ namespace Lucene.Net.Search.Payloads
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
index bbe41ed..34529d8 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -93,6 +93,10 @@ namespace Lucene.Net.Search.Spans
internal static Analyzer SimplePayloadAnalyzer;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index bb71d97..e8ab517 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -54,6 +54,10 @@ namespace Lucene.Net.Search.Spans
protected internal static Directory Directory;
protected internal static IndexReader Reader;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
index 859ca20..cfdca01 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
@@ -123,6 +123,9 @@ namespace Lucene.Net.Search.Spans
/// <summary>
/// Checks to see if the hits are what we expected.
+ ///
+ /// LUCENENET specific
+ /// Is non-static because it depends on the non-static variable, <see cref="LuceneTestCase.Similarity"/>
/// </summary>
/// <param name="query"> the query to execute </param>
/// <param name="description"> the description of the search </param>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index 7ba20e3..bf571a5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -57,6 +57,10 @@ namespace Lucene.Net.Search
private static Directory Dir2;
private static int MulFactor;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index fca1ddd..882b740 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -44,6 +44,10 @@ namespace Lucene.Net.Search
private static IndexReader r;
private static IndexSearcher s;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewStringField is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index 50e6e70..a528615 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -73,6 +73,11 @@ namespace Lucene.Net.Search
Directory = null;
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig, NewTextField and
+ /// NewStringField are no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClassTestExplanations()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index 33aec6e..eab721a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -60,6 +60,10 @@ namespace Lucene.Net.Search
internal static readonly string[] MediumTerms = new string[] { "e", "f", "g" };
internal static readonly string[] RareTerms = new string[] { "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" };
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
index 60105a1..5ae1761 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -50,6 +50,10 @@ namespace Lucene.Net.Search
Assert.AreEqual(e, a, m);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
index 0705a83..2449b89 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -45,6 +45,10 @@ namespace Lucene.Net.Search
internal static IndexReader Reader, MultiReader, MultiReaderDupls;
internal static IndexSearcher Searcher, MultiSearcher, MultiSearcherDupls;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index 3db7193..f6756c2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -32,6 +32,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader;
private static Directory Directory;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
index 8c26b24..c62d041 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -61,6 +61,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader = null;
private static IndexSearcher Searcher = null;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
index d55bd45..de7b10f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -61,6 +61,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader = null;
private static IndexSearcher Searcher = null;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index 1f7a96c..9c037e8 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search
query.Add(new Term("field", "words"));
ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, searcher, Similarity);
reader.Dispose();
directory.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index 99b40e6..22be01c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -46,6 +46,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader;
private static IndexSearcher Searcher;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index bdb76fd..d2a5126 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -47,6 +47,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader;
private static Directory Directory;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
[32/34] lucenenet git commit: Fixing bug where incorrect searcher
variable was used
Posted by sy...@apache.org.
Fixing bug where incorrect searcher variable was used
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/22caeb07
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/22caeb07
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/22caeb07
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 22caeb07679f12baa8eee4311c4ffc44a4970880
Parents: be84fe2
Author: Connie Yau <co...@microsoft.com>
Authored: Mon Aug 8 11:45:25 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Mon Aug 8 11:45:25 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/22caeb07/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index 972e713..1f7a96c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -380,7 +380,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(1, hits[1].Doc);
Assert.AreEqual(0.31, hits[2].Score, 0.01);
Assert.AreEqual(2, hits[2].Doc);
- QueryUtils.Check(Random(), query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, searcher, Similarity);
reader.Dispose();
directory.Dispose();
}
[17/34] lucenenet git commit: Changed IndexableField.Name() to
IndexableField.Name (method into a property) for API consistency.
Posted by sy...@apache.org.
Changed IndexableField.Name() to IndexableField.Name (method into a property) for API consistency.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3c2c4f47
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3c2c4f47
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3c2c4f47
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 3c2c4f470ee8db976c03757e79be9303bc78b4d9
Parents: 1d8582f
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Jul 29 00:28:02 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Jul 29 00:28:02 2016 +0700
----------------------------------------------------------------------
.../Utils/DatasetSplitter.cs | 8 ++++----
.../SimpleText/SimpleTextStoredFieldsWriter.cs | 4 ++--
.../Compressing/CompressingStoredFieldsWriter.cs | 2 +-
.../Codecs/Lucene40/Lucene40StoredFieldsWriter.cs | 2 +-
src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs | 2 +-
src/Lucene.Net.Core/Document/Document.cs | 16 ++++++++--------
src/Lucene.Net.Core/Document/Field.cs | 8 ++++----
src/Lucene.Net.Core/Index/DocFieldProcessor.cs | 2 +-
src/Lucene.Net.Core/Index/DocInverterPerField.cs | 12 ++++++------
src/Lucene.Net.Core/Index/IndexableField.cs | 2 +-
.../Index/TermVectorsConsumerPerField.cs | 16 ++++++++--------
.../Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs | 2 +-
.../Index/BaseStoredFieldsFormatTestCase.cs | 8 ++++----
src/Lucene.Net.TestFramework/Index/DocHelper.cs | 2 +-
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 6 +++---
src/Lucene.Net.TestFramework/Util/TestUtil.cs | 16 ++++++++--------
.../Codecs/Lucene41/TestBlockPostingsFormat2.cs | 8 ++++----
.../core/Index/TestDirectoryReader.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs | 4 ++--
.../core/Index/TestIndexWriterExceptions.cs | 4 ++--
.../core/Index/TestIndexableField.cs | 6 +++---
.../core/Index/TestSegmentReader.cs | 10 +++++-----
.../core/Index/TestStressIndexing2.cs | 2 +-
24 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs b/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
index ba4385f..3b91dc4 100644
--- a/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
+++ b/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
@@ -97,19 +97,19 @@ namespace Lucene.Net.Classification.Utils
{
if (storableField.ReaderValue != null)
{
- doc.Add(new Field(storableField.Name(), storableField.ReaderValue, ft));
+ doc.Add(new Field(storableField.Name, storableField.ReaderValue, ft));
}
else if (storableField.BinaryValue() != null)
{
- doc.Add(new Field(storableField.Name(), storableField.BinaryValue(), ft));
+ doc.Add(new Field(storableField.Name, storableField.BinaryValue(), ft));
}
else if (storableField.StringValue != null)
{
- doc.Add(new Field(storableField.Name(), storableField.StringValue, ft));
+ doc.Add(new Field(storableField.Name, storableField.StringValue, ft));
}
else if (storableField.NumericValue != null)
{
- doc.Add(new Field(storableField.Name(), storableField.NumericValue.ToString(), ft));
+ doc.Add(new Field(storableField.Name, storableField.NumericValue.ToString(), ft));
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
index 80a55c2..c298ccc 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
@@ -102,7 +102,7 @@ namespace Lucene.Net.Codecs.SimpleText
NewLine();
Write(NAME);
- Write(field.Name());
+ Write(field.Name);
NewLine();
Write(TYPE);
@@ -166,7 +166,7 @@ namespace Lucene.Net.Codecs.SimpleText
}
else if (field.StringValue == null)
{
- throw new ArgumentException("field " + field.Name() +
+ throw new ArgumentException("field " + field.Name +
" is stored but does not have binaryValue, stringValue nor numericValue");
}
else
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
index c556d59..c234dbb 100644
--- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
@@ -328,7 +328,7 @@ namespace Lucene.Net.Codecs.Compressing
@string = field.StringValue;
if (@string == null)
{
- throw new System.ArgumentException("field " + field.Name() + " is stored but does not have binaryValue, stringValue nor numericValue");
+ throw new System.ArgumentException("field " + field.Name + " is stored but does not have binaryValue, stringValue nor numericValue");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
index 0a548d7..45eede8 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
@@ -199,7 +199,7 @@ namespace Lucene.Net.Codecs.Lucene40
@string = field.StringValue;
if (@string == null)
{
- throw new System.ArgumentException("field " + field.Name() + " is stored but does not have binaryValue, stringValue nor numericValue");
+ throw new System.ArgumentException("field " + field.Name + " is stored but does not have binaryValue, stringValue nor numericValue");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
index 02a52b7..9a60977 100644
--- a/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
@@ -145,7 +145,7 @@ namespace Lucene.Net.Codecs
{
if (field.FieldType().Stored)
{
- WriteField(fieldInfos.FieldInfo(field.Name()), field);
+ WriteField(fieldInfos.FieldInfo(field.Name), field);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Document/Document.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Document.cs b/src/Lucene.Net.Core/Document/Document.cs
index 637b886..a8e8348 100644
--- a/src/Lucene.Net.Core/Document/Document.cs
+++ b/src/Lucene.Net.Core/Document/Document.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Documents
{
IndexableField field = fields[i];
- if (field.Name().Equals(name))
+ if (field.Name.Equals(name))
{
fields.RemoveAt(i);
return;
@@ -111,7 +111,7 @@ namespace Lucene.Net.Documents
{
IndexableField field = fields[i];
- if (field.Name().Equals(name))
+ if (field.Name.Equals(name))
{
fields.RemoveAt(i);
}
@@ -132,7 +132,7 @@ namespace Lucene.Net.Documents
foreach (IndexableField field in fields)
{
- if (field.Name().Equals(name))
+ if (field.Name.Equals(name))
{
BytesRef bytes = field.BinaryValue();
@@ -158,7 +158,7 @@ namespace Lucene.Net.Documents
{
foreach (IndexableField field in fields)
{
- if (field.Name().Equals(name))
+ if (field.Name.Equals(name))
{
BytesRef bytes = field.BinaryValue();
if (bytes != null)
@@ -179,7 +179,7 @@ namespace Lucene.Net.Documents
{
foreach (IndexableField field in fields)
{
- if (field.Name().Equals(name))
+ if (field.Name.Equals(name))
{
return field;
}
@@ -199,7 +199,7 @@ namespace Lucene.Net.Documents
var result = new List<IndexableField>();
foreach (IndexableField field in fields)
{
- if (field.Name().Equals(name))
+ if (field.Name.Equals(name))
{
result.Add(field);
}
@@ -239,7 +239,7 @@ namespace Lucene.Net.Documents
var result = new List<string>();
foreach (IndexableField field in fields)
{
- if (field.Name().Equals(name) && field.StringValue != null)
+ if (field.Name.Equals(name) && field.StringValue != null)
{
result.Add(field.StringValue);
}
@@ -266,7 +266,7 @@ namespace Lucene.Net.Documents
{
foreach (IndexableField field in fields)
{
- if (field.Name().Equals(name) && field.StringValue != null)
+ if (field.Name.Equals(name) && field.StringValue != null)
{
return field.StringValue;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Field.cs b/src/Lucene.Net.Core/Document/Field.cs
index 8dd42b8..d29f8e7 100644
--- a/src/Lucene.Net.Core/Document/Field.cs
+++ b/src/Lucene.Net.Core/Document/Field.cs
@@ -480,9 +480,9 @@ namespace Lucene.Net.Documents
}
}
- public string Name()
+ public string Name
{
- return Name_Renamed;
+ get { return Name_Renamed; }
}
/// <summary>
@@ -640,12 +640,12 @@ namespace Lucene.Net.Documents
}
else if (ReaderValue != null)
{
- return analyzer.TokenStream(Name(), ReaderValue);
+ return analyzer.TokenStream(Name, ReaderValue);
}
else if (StringValue != null)
{
TextReader sr = new StringReader(StringValue);
- return analyzer.TokenStream(Name(), sr);
+ return analyzer.TokenStream(Name, sr);
}
throw new System.ArgumentException("Field must have either TokenStream, String, Reader or Number value; got " + this);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocFieldProcessor.cs b/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
index 8eeceb4..301277f 100644
--- a/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
+++ b/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
@@ -208,7 +208,7 @@ namespace Lucene.Net.Index
foreach (IndexableField field in DocState.Doc)
{
- string fieldName = field.Name();
+ string fieldName = field.Name;
// Make sure we have a PerField allocated
int hashPos = fieldName.GetHashCode() & HashMask;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Index/DocInverterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocInverterPerField.cs b/src/Lucene.Net.Core/Index/DocInverterPerField.cs
index 18f0ff6..808dbda 100644
--- a/src/Lucene.Net.Core/Index/DocInverterPerField.cs
+++ b/src/Lucene.Net.Core/Index/DocInverterPerField.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Index
// if the field omits norms, the boost cannot be indexed.
if (fieldType.OmitNorms && field.GetBoost() != 1.0f)
{
- throw new System.NotSupportedException("You cannot set an index-time boost: norms are omitted for field '" + field.Name() + "'");
+ throw new System.NotSupportedException("You cannot set an index-time boost: norms are omitted for field '" + field.Name + "'");
}
// only bother checking offsets if something will consume them.
@@ -131,11 +131,11 @@ namespace Lucene.Net.Index
int posIncr = posIncrAttribute.PositionIncrement;
if (posIncr < 0)
{
- throw new System.ArgumentException("position increment must be >=0 (got " + posIncr + ") for field '" + field.Name() + "'");
+ throw new System.ArgumentException("position increment must be >=0 (got " + posIncr + ") for field '" + field.Name + "'");
}
if (FieldState.Position_Renamed == 0 && posIncr == 0)
{
- throw new System.ArgumentException("first position increment must be > 0 (got 0) for field '" + field.Name() + "'");
+ throw new System.ArgumentException("first position increment must be > 0 (got 0) for field '" + field.Name + "'");
}
int position = FieldState.Position_Renamed + posIncr;
if (position > 0)
@@ -146,7 +146,7 @@ namespace Lucene.Net.Index
}
else if (position < 0)
{
- throw new System.ArgumentException("position overflow for field '" + field.Name() + "'");
+ throw new System.ArgumentException("position overflow for field '" + field.Name + "'");
}
// position is legal, we can safely place it in fieldState now.
@@ -164,11 +164,11 @@ namespace Lucene.Net.Index
int endOffset = FieldState.Offset_Renamed + offsetAttribute.EndOffset();
if (startOffset < 0 || endOffset < startOffset)
{
- throw new System.ArgumentException("startOffset must be non-negative, and endOffset must be >= startOffset, " + "startOffset=" + startOffset + ",endOffset=" + endOffset + " for field '" + field.Name() + "'");
+ throw new System.ArgumentException("startOffset must be non-negative, and endOffset must be >= startOffset, " + "startOffset=" + startOffset + ",endOffset=" + endOffset + " for field '" + field.Name + "'");
}
if (startOffset < lastStartOffset)
{
- throw new System.ArgumentException("offsets must not go backwards startOffset=" + startOffset + " is < lastStartOffset=" + lastStartOffset + " for field '" + field.Name() + "'");
+ throw new System.ArgumentException("offsets must not go backwards startOffset=" + startOffset + " is < lastStartOffset=" + lastStartOffset + " for field '" + field.Name + "'");
}
lastStartOffset = startOffset;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Index/IndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexableField.cs b/src/Lucene.Net.Core/Index/IndexableField.cs
index d26c639..d28f80a 100644
--- a/src/Lucene.Net.Core/Index/IndexableField.cs
+++ b/src/Lucene.Net.Core/Index/IndexableField.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Index
{
/// <summary>
/// Field name </summary>
- string Name();
+ string Name { get; }
/// <summary>
/// <seealso cref="IndexableFieldType"/> describing the properties
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs b/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
index 2c50ae7..fd1b1d3 100644
--- a/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
+++ b/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
@@ -89,22 +89,22 @@ namespace Lucene.Net.Index
else if (field.FieldType().StoreTermVectorPayloads)
{
// TODO: move this check somewhere else, and impl the other missing ones
- throw new System.ArgumentException("cannot index term vector payloads without term vector positions (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector payloads without term vector positions (field=\"" + field.Name + "\")");
}
}
else
{
if (field.FieldType().StoreTermVectorOffsets)
{
- throw new System.ArgumentException("cannot index term vector offsets when term vectors are not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector offsets when term vectors are not indexed (field=\"" + field.Name + "\")");
}
if (field.FieldType().StoreTermVectorPositions)
{
- throw new System.ArgumentException("cannot index term vector positions when term vectors are not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector positions when term vectors are not indexed (field=\"" + field.Name + "\")");
}
if (field.FieldType().StoreTermVectorPayloads)
{
- throw new System.ArgumentException("cannot index term vector payloads when term vectors are not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector payloads when term vectors are not indexed (field=\"" + field.Name + "\")");
}
}
}
@@ -112,19 +112,19 @@ namespace Lucene.Net.Index
{
if (field.FieldType().StoreTermVectors)
{
- throw new System.ArgumentException("cannot index term vectors when field is not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vectors when field is not indexed (field=\"" + field.Name + "\")");
}
if (field.FieldType().StoreTermVectorOffsets)
{
- throw new System.ArgumentException("cannot index term vector offsets when field is not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector offsets when field is not indexed (field=\"" + field.Name + "\")");
}
if (field.FieldType().StoreTermVectorPositions)
{
- throw new System.ArgumentException("cannot index term vector positions when field is not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector positions when field is not indexed (field=\"" + field.Name + "\")");
}
if (field.FieldType().StoreTermVectorPayloads)
{
- throw new System.ArgumentException("cannot index term vector payloads when field is not indexed (field=\"" + field.Name() + "\")");
+ throw new System.ArgumentException("cannot index term vector payloads when field is not indexed (field=\"" + field.Name + "\")");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
index 9084363..6e36184 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
@@ -153,7 +153,7 @@ namespace Lucene.Net.Codecs.Lucene3x
@string = field.StringValue;
if (@string == null)
{
- throw new System.ArgumentException("field " + field.Name() + " is stored but does not have binaryValue, stringValue nor numericValue");
+ throw new System.ArgumentException("field " + field.Name + " is stored but does not have binaryValue, stringValue nor numericValue");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index db140dd..38ad4e1 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -208,17 +208,17 @@ namespace Lucene.Net.Index
IEnumerator<IndexableField> it = doc2.Fields.GetEnumerator();
Assert.IsTrue(it.MoveNext());
Field f = (Field)it.Current;
- Assert.AreEqual(f.Name(), "zzz");
+ Assert.AreEqual(f.Name, "zzz");
Assert.AreEqual(f.StringValue, "a b c");
Assert.IsTrue(it.MoveNext());
f = (Field)it.Current;
- Assert.AreEqual(f.Name(), "aaa");
+ Assert.AreEqual(f.Name, "aaa");
Assert.AreEqual(f.StringValue, "a b c");
Assert.IsTrue(it.MoveNext());
f = (Field)it.Current;
- Assert.AreEqual(f.Name(), "zzz");
+ Assert.AreEqual(f.Name, "zzz");
Assert.AreEqual(f.StringValue, "1 2 3");
Assert.IsFalse(it.MoveNext());
r.Dispose();
@@ -400,7 +400,7 @@ namespace Lucene.Net.Index
int docID = Random().Next(100);
foreach (Field fld in fields)
{
- string fldName = fld.Name();
+ string fldName = fld.Name;
Document sDoc = reader.Document(docID, Collections.Singleton(fldName));
IndexableField sField = sDoc.GetField(fldName);
if (typeof(Field) == fld.GetType())
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.TestFramework/Index/DocHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/DocHelper.cs b/src/Lucene.Net.TestFramework/Index/DocHelper.cs
index 986de18..e2afbe0 100644
--- a/src/Lucene.Net.TestFramework/Index/DocHelper.cs
+++ b/src/Lucene.Net.TestFramework/Index/DocHelper.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Index
private static void Add(IDictionary<string, IndexableField> map, IndexableField field)
{
- map[field.Name()] = field;
+ map[field.Name] = field;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 147c4a7..63100f0 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -2206,7 +2206,7 @@ namespace Lucene.Net.Util
// in whatever way it wants (e.g. maybe it packs related fields together or something)
// To fix this, we sort the fields in both documents by name, but
// we still assume that all instances with same name are in order:
- Comparison<IndexableField> comp = (a, b) => String.Compare(a.Name(), b.Name(), StringComparison.Ordinal);
+ Comparison<IndexableField> comp = (a, b) => String.Compare(a.Name, b.Name, StringComparison.Ordinal);
leftDoc.Fields.Sort(comp);
rightDoc.Fields.Sort(comp);
@@ -2226,7 +2226,7 @@ namespace Lucene.Net.Util
/// </summary>
public void AssertStoredFieldEquals(string info, IndexableField leftField, IndexableField rightField)
{
- Assert.AreEqual(leftField.Name(), rightField.Name(), info);
+ Assert.AreEqual(leftField.Name, rightField.Name, info);
Assert.AreEqual(leftField.BinaryValue(), rightField.BinaryValue(), info);
Assert.AreEqual(leftField.StringValue, rightField.StringValue, info);
Assert.AreEqual(leftField.NumericValue, rightField.NumericValue, info);
@@ -2726,7 +2726,7 @@ namespace Lucene.Net.Util
public virtual int Compare(object arg0, object arg1)
{
- return System.String.Compare(((IndexableField)arg0).Name(), ((IndexableField)arg1).Name(), System.StringComparison.Ordinal);
+ return System.String.Compare(((IndexableField)arg0).Name, ((IndexableField)arg1).Name, System.StringComparison.Ordinal);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.TestFramework/Util/TestUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
index c0db864..a0c46ac 100644
--- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
@@ -1000,15 +1000,15 @@ namespace Lucene.Net.Util
switch (dvType)
{
case DocValuesType_e.NUMERIC:
- field2 = new NumericDocValuesField(field1.Name(), (long)field1.NumericValue);
+ field2 = new NumericDocValuesField(field1.Name, (long)field1.NumericValue);
break;
case DocValuesType_e.BINARY:
- field2 = new BinaryDocValuesField(field1.Name(), field1.BinaryValue());
+ field2 = new BinaryDocValuesField(field1.Name, field1.BinaryValue());
break;
case DocValuesType_e.SORTED:
- field2 = new SortedDocValuesField(field1.Name(), field1.BinaryValue());
+ field2 = new SortedDocValuesField(field1.Name, field1.BinaryValue());
break;
default:
@@ -1020,19 +1020,19 @@ namespace Lucene.Net.Util
switch (numType)
{
case NumericType.INT:
- field2 = new IntField(field1.Name(), (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new IntField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
break;
case NumericType.FLOAT:
- field2 = new FloatField(field1.Name(), (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new FloatField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
break;
case NumericType.LONG:
- field2 = new LongField(field1.Name(), (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new LongField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
break;
case NumericType.DOUBLE:
- field2 = new DoubleField(field1.Name(), (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new DoubleField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
break;
default:
@@ -1041,7 +1041,7 @@ namespace Lucene.Net.Util
}
else
{
- field2 = new Field(field1.Name(), field1.StringValue, (FieldType)field1.FieldType());
+ field2 = new Field(field1.Name, field1.StringValue, (FieldType)field1.FieldType());
}
doc2.Add(field2);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat2.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat2.cs
index 3e07c69..13ff926 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat2.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat2.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
foreach (IndexableField f in doc.Fields)
{
- ((Field)f).StringValue = f.Name() + " " + f.Name() + "_2";
+ ((Field)f).StringValue = f.Name + " " + f.Name + "_2";
}
Iw.AddDocument(doc);
}
@@ -116,7 +116,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
foreach (IndexableField f in doc.Fields)
{
- ((Field)f).StringValue = f.Name() + " " + f.Name() + "_2";
+ ((Field)f).StringValue = f.Name + " " + f.Name + "_2";
}
Iw.AddDocument(doc);
}
@@ -132,7 +132,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
foreach (IndexableField f in doc.Fields)
{
- ((Field)f).StringValue = f.Name() + " " + f.Name() + " " + f.Name() + "_2 " + f.Name() + "_2";
+ ((Field)f).StringValue = f.Name + " " + f.Name + " " + f.Name + "_2 " + f.Name + "_2";
}
Iw.AddDocument(doc);
}
@@ -148,7 +148,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
foreach (IndexableField f in doc.Fields)
{
- string proto = (f.Name() + " " + f.Name() + " " + f.Name() + " " + f.Name() + " " + f.Name() + "_2 " + f.Name() + "_2 " + f.Name() + "_2 " + f.Name() + "_2");
+ string proto = (f.Name + " " + f.Name + " " + f.Name + " " + f.Name + " " + f.Name + "_2 " + f.Name + "_2 " + f.Name + "_2 " + f.Name + "_2");
StringBuilder val = new StringBuilder();
for (int j = 0; j < 16; j++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index a3d0c49..925995e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -620,7 +620,7 @@ namespace Lucene.Net.Index
Field curField1 = (Field)itField1.Current;
itField2.MoveNext();
Field curField2 = (Field)itField2.Current;
- Assert.AreEqual(curField1.Name(), curField2.Name(), "Different fields names for doc " + i + ".");
+ Assert.AreEqual(curField1.Name, curField2.Name, "Different fields names for doc " + i + ".");
Assert.AreEqual(curField1.StringValue, curField2.StringValue, "Different field values for doc " + i + ".");
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs b/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
index 9a1ab86..59973e2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Index
FieldInfos.Builder builder = new FieldInfos.Builder();
foreach (IndexableField field in TestDoc)
{
- builder.AddOrUpdate(field.Name(), field.FieldType());
+ builder.AddOrUpdate(field.Name, field.FieldType());
}
FieldInfos fieldInfos = builder.Finish();
//Since the complement is stored as well in the fields map
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
index 5e5825d..fcaac0d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Index
DocHelper.SetupDoc(TestDoc);
foreach (IndexableField field in TestDoc)
{
- FieldInfos.AddOrUpdate(field.Name(), field.FieldType());
+ FieldInfos.AddOrUpdate(field.Name, field.FieldType());
}
Dir = NewDirectory();
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy());
@@ -106,7 +106,7 @@ namespace Lucene.Net.Index
reader.Document(0, visitor);
IList<IndexableField> fields = visitor.Document.Fields;
Assert.AreEqual(1, fields.Count);
- Assert.AreEqual(DocHelper.TEXT_FIELD_3_KEY, fields[0].Name());
+ Assert.AreEqual(DocHelper.TEXT_FIELD_3_KEY, fields[0].Name);
reader.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index 6821109..8e322d0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -2004,9 +2004,9 @@ namespace Lucene.Net.Index
this.OuterInstance = outerInstance;
}
- public string Name()
+ public string Name
{
- return "foo";
+ get { return "foo"; }
}
public IndexableFieldType FieldType()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index d4afb52..cdb111b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -152,9 +152,9 @@ namespace Lucene.Net.Index
this.Counter = counter;
}
- public string Name()
+ public string Name
{
- return "f" + Counter;
+ get { return "f" + Counter; }
}
public float GetBoost()
@@ -222,7 +222,7 @@ namespace Lucene.Net.Index
public TokenStream GetTokenStream(Analyzer analyzer)
{
- return ReaderValue != null ? analyzer.TokenStream(Name(), ReaderValue) : analyzer.TokenStream(Name(), new StringReader(StringValue));
+ return ReaderValue != null ? analyzer.TokenStream(Name, ReaderValue) : analyzer.TokenStream(Name, new StringReader(StringValue));
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
index 8805748..2f6d8fb 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
foreach (IndexableField field in fields)
{
Assert.IsTrue(field != null);
- Assert.IsTrue(DocHelper.NameValues.ContainsKey(field.Name()));
+ Assert.IsTrue(DocHelper.NameValues.ContainsKey(field.Name));
}
}
@@ -193,12 +193,12 @@ namespace Lucene.Net.Index
IndexableField f = DocHelper.Fields[i];
if (f.FieldType().Indexed)
{
- Assert.AreEqual(reader.GetNormValues(f.Name()) != null, !f.FieldType().OmitNorms);
- Assert.AreEqual(reader.GetNormValues(f.Name()) != null, !DocHelper.NoNorms.ContainsKey(f.Name()));
- if (reader.GetNormValues(f.Name()) == null)
+ Assert.AreEqual(reader.GetNormValues(f.Name) != null, !f.FieldType().OmitNorms);
+ Assert.AreEqual(reader.GetNormValues(f.Name) != null, !DocHelper.NoNorms.ContainsKey(f.Name));
+ if (reader.GetNormValues(f.Name) == null)
{
// test for norms of null
- NumericDocValues norms = MultiDocValues.GetNormValues(reader, f.Name());
+ NumericDocValues norms = MultiDocValues.GetNormValues(reader, f.Name);
Assert.IsNull(norms);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c2c4f47/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index cc9fc39..2720c7f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -158,7 +158,7 @@ namespace Lucene.Net.Index
public virtual int Compare(IndexableField o1, IndexableField o2)
{
- return o1.Name().CompareTo(o2.Name());
+ return o1.Name.CompareTo(o2.Name);
}
}
[04/34] lucenenet git commit: Fixing test errors with teardown/setup
Posted by sy...@apache.org.
Fixing test errors with teardown/setup
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/4b52ddfd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/4b52ddfd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/4b52ddfd
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 4b52ddfdefed3c7cf91c6d9c7b5aad18014732dd
Parents: ae41663
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 15 09:20:45 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:17:30 2016 -0700
----------------------------------------------------------------------
.../Util/LuceneTestCase.cs | 2 +-
.../Lucene41/TestLucene41StoredFieldsFormat.cs | 2 +-
.../Lucene42/TestLucene42DocValuesFormat.cs | 2 +-
.../core/Index/TestBinaryDocValuesUpdates.cs | 44 ++++++++++++++++----
.../core/Index/TestNumericDocValuesUpdates.cs | 5 ++-
.../core/Index/TestStressIndexing.cs | 6 ++-
6 files changed, 48 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4b52ddfd/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 6065280..0b63bd8 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -197,6 +197,7 @@ namespace Lucene.Net.Util
public LuceneTestCase()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
+ ClassEnvRule = new TestRuleSetupAndRestoreClassEnv();
String directory = Paths.TempDirectory;
TEMP_DIR = new System.IO.FileInfo(directory);
}
@@ -564,7 +565,6 @@ namespace Lucene.Net.Util
{
// LUCENENET TODO: Not sure how to convert these
//ParentChainCallRule.SetupCalled = true;
- ClassEnvRule = new TestRuleSetupAndRestoreClassEnv();
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4b52ddfd/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index d48f83c..0111163 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Codecs.Lucene41
public class TestLucene41StoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4b52ddfd/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index 2cb0e4b..19416f2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Codecs.Lucene42
private readonly Codec Codec_Renamed = new Lucene42RWCodec();
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4b52ddfd/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
index 23324b5..2caa695 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
- using System.Threading;
+using System.Threading;
using Lucene.Net.Attributes;
using Lucene.Net.Documents;
@@ -1109,25 +1109,55 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestUpdateOldSegments()
{
- Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec(), new Lucene45RWCodec() };
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+ Codec[] oldCodecs = new Codec[] {
+ new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
+ new Lucene41RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
+ new Lucene42RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
+ new Lucene45RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ };
Directory dir = NewDirectory();
- bool oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
// create a segment with an old Codec
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
conf.SetCodec(oldCodecs[Random().Next(oldCodecs.Length)]);
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
IndexWriter writer = new IndexWriter(dir, conf);
Document doc = new Document();
doc.Add(new StringField("id", "doc", Store.NO));
doc.Add(new BinaryDocValuesField("f", ToBytes(5L)));
writer.AddDocument(doc);
writer.Dispose();
+ dir.Dispose();
+
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
+ }
+
+ [Test]
+ public virtual void TestUpdateOldSegments_OldFormatNotActive()
+ {
+ bool oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
- conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
- writer = new IndexWriter(dir, conf);
- writer.UpdateBinaryDocValue(new Term("id", "doc"), "f", ToBytes(4L));
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
+
+ Codec[] oldCodecs = new Codec[] {
+ new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
+ new Lucene41RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
+ new Lucene42RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
+ new Lucene45RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ };
+
+ Directory dir = NewDirectory();
+ Document doc = new Document();
+ doc.Add(new StringField("id", "doc", Store.NO));
+ doc.Add(new BinaryDocValuesField("f", ToBytes(5L)));
+
+ var conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
+ conf.SetCodec(oldCodecs[Random().Next(oldCodecs.Length)]);
+
+ var writer = new IndexWriter(dir, conf);
+ writer.AddDocument(doc);
+ writer.UpdateBinaryDocValue(new Term("id", "doc"), "f", ToBytes(4L));
+
try
{
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4b52ddfd/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
index b9d592d..add43b4 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
@@ -1062,14 +1062,15 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestUpdateOldSegments()
{
- Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec(), new Lucene45RWCodec() };
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+
+ Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE), new Lucene41RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE), new Lucene42RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE), new Lucene45RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE) };
Directory dir = NewDirectory();
bool oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
// create a segment with an old Codec
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()));
conf.SetCodec(oldCodecs[Random().Next(oldCodecs.Length)]);
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
IndexWriter writer = new IndexWriter(dir, conf);
Document doc = new Document();
doc.Add(new StringField("id", "doc", Store.NO));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4b52ddfd/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
index 59a9baf..8f271f3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
@@ -92,10 +92,14 @@ namespace Lucene.Net.Index
internal IndexWriter Writer;
internal int NextID;
- public IndexerThread(IndexWriter writer, TimedThread[] threads)
+ public IndexerThread(IndexWriter writer, TimedThread[] threads,
+ Func<string, string, Field.Store, Field> newStringField,
+ Func<string, string, Field.Store, Field> newTextField)
: base(threads)
{
this.Writer = writer;
+ NewStringField = newStringField;
+ NewTextField = newTextField;
}
public override void DoWork()
[16/34] lucenenet git commit: Fixing RandomIndexWriter ctor error in
SearchEquivalentTestBase
Posted by sy...@apache.org.
Fixing RandomIndexWriter ctor error in SearchEquivalentTestBase
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/659d9522
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/659d9522
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/659d9522
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 659d95221eb57e05d47f1292efa47ef2266b6bf3
Parents: 9067582
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 15:08:20 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 15:08:20 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/659d9522/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
index c5e6d7d..19a182c 100644
--- a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
Stopword = "" + RandomChar();
CharacterRunAutomaton stopset = new CharacterRunAutomaton(BasicAutomata.MakeString(Stopword));
Analyzer = new MockAnalyzer(random, MockTokenizer.WHITESPACE, false, stopset);
- RandomIndexWriter iw = new RandomIndexWriter(random, Directory, Analyzer);
+ RandomIndexWriter iw = new RandomIndexWriter(random, Directory, Analyzer, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
Document doc = new Document();
Field id = new StringField("id", "", Field.Store.NO);
Field field = new TextField("field", "", Field.Store.NO);
[10/34] lucenenet git commit: Adding parameters to static NewSearcher
Posted by sy...@apache.org.
Adding parameters to static NewSearcher
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/8be2a543
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/8be2a543
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/8be2a543
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 8be2a5433039c6daa114a1632ae2056bd8de148e
Parents: 6614015
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 12:30:36 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:30:36 2016 -0700
----------------------------------------------------------------------
.../Util/LuceneTestCase.cs | 21 ++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8be2a543/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 0910ed8..f729954 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -1003,7 +1003,7 @@ namespace Lucene.Net.Util
return NewTieredMergePolicy(Random());
}
- public static AlcoholicMergePolicy NewAlcoholicMergePolicy()
+ public AlcoholicMergePolicy NewAlcoholicMergePolicy()
{
return NewAlcoholicMergePolicy(Random(), ClassEnvRule.TimeZone);
}
@@ -1568,18 +1568,23 @@ namespace Lucene.Net.Util
/// Create a new searcher over the reader. this searcher might randomly use
/// threads.
/// </summary>
- public static IndexSearcher NewSearcher(IndexReader r)
+ public IndexSearcher NewSearcher(IndexReader r)
{
- return NewSearcher(r, true);
+ return NewSearcher(r, true, ClassEnvRule.Similarity);
}
/// <summary>
/// Create a new searcher over the reader. this searcher might randomly use
/// threads.
/// </summary>
- public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap)
+ public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, Similarity similarity)
{
- return NewSearcher(r, maybeWrap, true);
+ return NewSearcher(r, maybeWrap, true, similarity);
+ }
+
+ public IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions)
+ {
+ return NewSearcher(r, maybeWrap, wrapWithAssertions, ClassEnvRule.Similarity);
}
/// <summary>
@@ -1589,7 +1594,7 @@ namespace Lucene.Net.Util
/// <code>wrapWithAssertions</code> is true, this searcher might be an
/// <seealso cref="AssertingIndexSearcher"/> instance.
/// </summary>
- public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions)
+ public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions, Similarity similarity)
{
Random random = Random();
if (Usually())
@@ -1615,7 +1620,7 @@ namespace Lucene.Net.Util
{
ret = random.NextBoolean() ? new IndexSearcher(r) : new IndexSearcher(r.Context);
}
- ret.Similarity = ClassEnvRule.Similarity;
+ ret.Similarity = similarity;
return ret;
}
else
@@ -1650,7 +1655,7 @@ namespace Lucene.Net.Util
{
ret = random.NextBoolean() ? new IndexSearcher(r, ex) : new IndexSearcher(r.Context, ex);
}
- ret.Similarity = ClassEnvRule.Similarity;
+ ret.Similarity = similarity;
return ret;
}
}
[06/34] lucenenet git commit: Modifying RandomIndexWriter ctors to
take Similarity and Timezone
Posted by sy...@apache.org.
Modifying RandomIndexWriter ctors to take Similarity and Timezone
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ab57fd17
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ab57fd17
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ab57fd17
Branch: refs/heads/lucenenet-indexablefield-api
Commit: ab57fd17da92fdb5469c9495fb6654a9db1dff4c
Parents: d7e15dc
Author: Connie Yau <co...@microsoft.com>
Authored: Wed Jul 20 12:14:19 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:23:50 2016 -0700
----------------------------------------------------------------------
.../Index/RandomIndexWriter.cs | 43 ++++++++++----------
1 file changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ab57fd17/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index a2f7751..b19794e 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -8,21 +8,21 @@ using Lucene.Net.Util;
namespace Lucene.Net.Index
{
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
using Analyzer = Lucene.Net.Analysis.Analyzer;
using BytesRef = Lucene.Net.Util.BytesRef;
@@ -33,6 +33,7 @@ namespace Lucene.Net.Index
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using NullInfoStream = Lucene.Net.Util.NullInfoStream;
using Query = Lucene.Net.Search.Query;
+ using Similarity = Search.Similarities.Similarity;
using TestUtil = Lucene.Net.Util.TestUtil;
/// <summary>
@@ -85,22 +86,22 @@ namespace Lucene.Net.Index
/// <summary>
/// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT and MockAnalyzer </summary>
- public RandomIndexWriter(Random r, Directory dir)
- : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(r)))
+ public RandomIndexWriter(Random r, Directory dir, Similarity similarity, TimeZone timezone)
+ : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(r), similarity, timezone))
{
}
/// <summary>
/// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT </summary>
- public RandomIndexWriter(Random r, Directory dir, Analyzer a)
- : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, a))
+ public RandomIndexWriter(Random r, Directory dir, Analyzer a, Similarity similarity, TimeZone timezone)
+ : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, a, similarity, timezone))
{
}
/// <summary>
/// create a RandomIndexWriter with a random config </summary>
- public RandomIndexWriter(Random r, Directory dir, LuceneVersion v, Analyzer a)
- : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, v, a))
+ public RandomIndexWriter(Random r, Directory dir, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
+ : this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, v, a, similarity, timezone))
{
}
[31/34] lucenenet git commit: Adding LUCENENET specific documentation
Posted by sy...@apache.org.
Adding LUCENENET specific documentation
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/be84fe26
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/be84fe26
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/be84fe26
Branch: refs/heads/lucenenet-indexablefield-api
Commit: be84fe26e92a2c11613978d73f01d6eb662ca922
Parents: 1863bb8
Author: Connie Yau <co...@microsoft.com>
Authored: Mon Aug 8 11:40:25 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Mon Aug 8 11:40:25 2016 -0700
----------------------------------------------------------------------
.../Index/RandomIndexWriter.cs | 38 +++++++++++---------
.../core/Index/TestIndexWriter.cs | 14 ++++++++
.../core/Index/TestIndexWriterCommit.cs | 12 +++++++
.../core/Index/TestIndexWriterForceMerge.cs | 6 ++++
4 files changed, 54 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/be84fe26/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index b19794e..b0d6b69 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -8,21 +8,21 @@ using Lucene.Net.Util;
namespace Lucene.Net.Index
{
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
using Analyzer = Lucene.Net.Analysis.Analyzer;
using BytesRef = Lucene.Net.Util.BytesRef;
@@ -99,7 +99,13 @@ namespace Lucene.Net.Index
}
/// <summary>
- /// create a RandomIndexWriter with a random config </summary>
+ /// Creates a RandomIndexWriter with a random config
+ ///
+ /// LUCENENET specific
+ /// This override allows a RandomIndexWriter to be created without
+ /// adding a dependency on the LuceneTestCase.ClassEnv.Similarity and
+ /// LuceneTestCase.ClassEnv.TimeZone property
+ /// </summary>
public RandomIndexWriter(Random r, Directory dir, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, v, a, similarity, timezone))
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/be84fe26/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 45f0640..02317d0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -145,6 +145,13 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ ///
+ /// Changed from internal static method to private to remove
+ /// inter-dependencies between TestIndexWriter*.cs, TestAddIndexes.cs
+ /// and TestDeletionPolicy.cs tests
+ /// </summary>
private void AddDoc(IndexWriter writer)
{
Document doc = new Document();
@@ -152,6 +159,13 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ ///
+ /// Changed from internal static method to private to remove
+ /// inter-dependencies between TestIndexWriter*.cs, TestAddIndexes.cs
+ /// and TestDeletionPolicy.cs tests
+ /// </summary>
private void AddDocWithIndex(IndexWriter writer, int index)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/be84fe26/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
index 3f06879..b2b6eda 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
@@ -737,6 +737,12 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ ///
+ /// Copied from <see cref="TestIndexWriter.AddDoc(IndexWriter)"/>
+ /// to remove inter-class dependency on <see cref="TestIndexWriter"/>
+ /// </summary>
private void AddDoc(IndexWriter writer)
{
Document doc = new Document();
@@ -744,6 +750,12 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ ///
+ /// Copied from <seealso cref="TestIndexWriter.AddDocWithIndex(IndexWriter, int)"/>
+ /// to remove inter-class dependency on <see cref="TestIndexWriter"/>.
+ /// </summary>
private void AddDocWithIndex(IndexWriter writer, int index)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/be84fe26/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
index 33f1063..9cd2192 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterForceMerge.cs
@@ -236,6 +236,12 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ ///
+ /// Copied from <seealso cref="TestIndexWriter.AddDoc(IndexWriter)"/>
+ /// to remove inter-class dependency on TestIndexWriter.
+ /// </summary>
private void AddDoc(IndexWriter writer)
{
Document doc = new Document();
[09/34] lucenenet git commit: Making one
LuceneTestCase.NewIndexWriterConfig non-static
Posted by sy...@apache.org.
Making one LuceneTestCase.NewIndexWriterConfig non-static
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6614015b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6614015b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6614015b
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 6614015b207044b13d3a46a77f17c5d89010aedf
Parents: 6f3e807
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 12:29:50 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:29:50 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6614015b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 8367c6d..0910ed8 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -842,7 +842,7 @@ namespace Lucene.Net.Util
/// <summary>
/// create a new index writer config with random defaults </summary>
- public static IndexWriterConfig NewIndexWriterConfig(LuceneVersion v, Analyzer a)
+ public IndexWriterConfig NewIndexWriterConfig(LuceneVersion v, Analyzer a)
{
return NewIndexWriterConfig(Random(), v, a);
}
[13/34] lucenenet git commit: Fixing RandomIndexWriter build errors
in BaseTokenStreamTestCase
Posted by sy...@apache.org.
Fixing RandomIndexWriter build errors in BaseTokenStreamTestCase
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9591b70d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9591b70d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9591b70d
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 9591b70d96a9ee08d23421e70c41c6363967b37a
Parents: ef7f1dd
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 15:06:31 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 15:06:31 2016 -0700
----------------------------------------------------------------------
.../Analysis/BaseTokenStreamTestCase.cs | 23 +++++++++++---------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9591b70d/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index bb1098c..9253f7e 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -529,14 +529,14 @@ namespace Lucene.Net.Analysis
/// <summary>
/// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
- public static void CheckRandomData(Random random, Analyzer a, int iterations)
+ public void CheckRandomData(Random random, Analyzer a, int iterations)
{
CheckRandomData(random, a, iterations, 20, false, true);
}
/// <summary>
/// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
- public static void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength)
+ public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength)
{
CheckRandomData(random, a, iterations, maxWordLength, false, true);
}
@@ -544,13 +544,14 @@ namespace Lucene.Net.Analysis
/// <summary>
/// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
/// <param name="simple"> true if only ascii strings will be used (try to avoid) </param>
- public static void CheckRandomData(Random random, Analyzer a, int iterations, bool simple)
+ public void CheckRandomData(Random random, Analyzer a, int iterations, bool simple)
{
CheckRandomData(random, a, iterations, 20, simple, true);
}
internal class AnalysisThread : ThreadClass
{
+ private readonly BaseTokenStreamTestCase OuterInstance;
internal readonly int Iterations;
internal readonly int MaxWordLength;
internal readonly long Seed;
@@ -566,7 +567,8 @@ namespace Lucene.Net.Analysis
// interact)... so this is just "best effort":
public bool Failed;
- internal AnalysisThread(long seed, /*CountdownEvent latch,*/ Analyzer a, int iterations, int maxWordLength, bool useCharFilter, bool simple, bool offsetsAreCorrect, RandomIndexWriter iw)
+ internal AnalysisThread(long seed, /*CountdownEvent latch,*/ Analyzer a, int iterations, int maxWordLength,
+ bool useCharFilter, bool simple, bool offsetsAreCorrect, RandomIndexWriter iw, BaseTokenStreamTestCase outerInstance)
{
this.Seed = seed;
this.a = a;
@@ -577,6 +579,7 @@ namespace Lucene.Net.Analysis
this.OffsetsAreCorrect = offsetsAreCorrect;
this.Iw = iw;
this._latch = null;
+ this.OuterInstance = outerInstance;
}
public override void Run()
@@ -587,7 +590,7 @@ namespace Lucene.Net.Analysis
if (_latch != null) _latch.Wait();
// see the part in checkRandomData where it replays the same text again
// to verify reproducability/reuse: hopefully this would catch thread hazards.
- CheckRandomData(new Random((int)Seed), a, Iterations, MaxWordLength, UseCharFilter, Simple, OffsetsAreCorrect, Iw);
+ OuterInstance.CheckRandomData(new Random((int)Seed), a, Iterations, MaxWordLength, UseCharFilter, Simple, OffsetsAreCorrect, Iw);
success = true;
}
catch (Exception e)
@@ -602,12 +605,12 @@ namespace Lucene.Net.Analysis
}
}
- public static void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple)
+ public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple)
{
CheckRandomData(random, a, iterations, maxWordLength, simple, true);
}
- public static void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple, bool offsetsAreCorrect)
+ public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool simple, bool offsetsAreCorrect)
{
CheckResetException(a, "best effort");
long seed = random.Next();
@@ -620,7 +623,7 @@ namespace Lucene.Net.Analysis
if (Rarely(random) && codecOk)
{
dir = NewFSDirectory(CreateTempDir("bttc"));
- iw = new RandomIndexWriter(new Random((int)seed), dir, a);
+ iw = new RandomIndexWriter(new Random((int)seed), dir, a, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
}
bool success = false;
@@ -634,7 +637,7 @@ namespace Lucene.Net.Analysis
var threads = new AnalysisThread[numThreads];
for (int i = 0; i < threads.Length; i++)
{
- threads[i] = new AnalysisThread(seed, /*startingGun,*/ a, iterations, maxWordLength, useCharFilter, simple, offsetsAreCorrect, iw);
+ threads[i] = new AnalysisThread(seed, /*startingGun,*/ a, iterations, maxWordLength, useCharFilter, simple, offsetsAreCorrect, iw, this);
}
Array.ForEach(threads, thread => thread.Start());
@@ -671,7 +674,7 @@ namespace Lucene.Net.Analysis
}
}
- private static void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool useCharFilter, bool simple, bool offsetsAreCorrect, RandomIndexWriter iw)
+ private void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength, bool useCharFilter, bool simple, bool offsetsAreCorrect, RandomIndexWriter iw)
{
LineFileDocs docs = new LineFileDocs(random);
Document doc = null;
[05/34] lucenenet git commit: Adding a static
LuceneTestCase.NewIndexWriterConfig method
Posted by sy...@apache.org.
Adding a static LuceneTestCase.NewIndexWriterConfig method
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d7e15dc8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d7e15dc8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d7e15dc8
Branch: refs/heads/lucenenet-indexablefield-api
Commit: d7e15dc8adcf33f59133243f4b6022ebf6d8d46f
Parents: 4b52ddf
Author: Connie Yau <co...@microsoft.com>
Authored: Wed Jul 20 12:14:08 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:23:44 2016 -0700
----------------------------------------------------------------------
.../Util/LuceneTestCase.cs | 39 ++++++++++++++++----
1 file changed, 32 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d7e15dc8/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 0b63bd8..8367c6d 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -101,6 +101,8 @@ namespace Lucene.Net.Util
using TermsEnum = Lucene.Net.Index.TermsEnum;
using TextField = TextField;
using TieredMergePolicy = Lucene.Net.Index.TieredMergePolicy;
+ using Analysis;
+ using Search.Similarities;
/*using After = org.junit.After;
using AfterClass = org.junit.AfterClass;
@@ -845,12 +847,17 @@ namespace Lucene.Net.Util
return NewIndexWriterConfig(Random(), v, a);
}
+ public IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a)
+ {
+ return NewIndexWriterConfig(r, v, a, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ }
+
/// <summary>
/// create a new index writer config with random defaults using the specified random </summary>
- public static IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a)
+ public static IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
{
IndexWriterConfig c = new IndexWriterConfig(v, a);
- c.SetSimilarity(ClassEnvRule.Similarity);
+ c.SetSimilarity(similarity);
if (VERBOSE)
{
// Even though TestRuleSetupAndRestoreClassEnv calls
@@ -933,7 +940,7 @@ namespace Lucene.Net.Util
}
}
- c.SetMergePolicy(NewMergePolicy(r));
+ c.SetMergePolicy(NewMergePolicy(r, timezone));
if (Rarely(r))
{
@@ -946,7 +953,25 @@ namespace Lucene.Net.Util
return c;
}
- public static MergePolicy NewMergePolicy(Random r)
+ /// <summary>
+ /// Gets an IndexWriterConfig using the current TEST_LUCENE_VERSION and a MockAnalyzer
+ /// </summary>
+ public IndexWriterConfig NewIndexWriterConfig()
+ {
+ var random = Random();
+
+ return NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ }
+
+ /// <summary>
+ /// Gets an IndexWriterConfig using the current TEST_LUCENE_VERSION and the given analyzer
+ /// </summary>
+ public IndexWriterConfig NewIndexWriterConfig(Analyzer a)
+ {
+ return NewIndexWriterConfig(Random(), TEST_VERSION_CURRENT, a);
+ }
+
+ public static MergePolicy NewMergePolicy(Random r, TimeZone timezone)
{
if (Rarely(r))
{
@@ -958,14 +983,14 @@ namespace Lucene.Net.Util
}
else if (r.Next(5) == 0)
{
- return NewAlcoholicMergePolicy(r, ClassEnvRule.TimeZone);
+ return NewAlcoholicMergePolicy(r, timezone);
}
return NewLogMergePolicy(r);
}
- public static MergePolicy NewMergePolicy()
+ public static MergePolicy NewMergePolicy(TimeZone timezone)
{
- return NewMergePolicy(Random());
+ return NewMergePolicy(Random(), timezone);
}
public static LogMergePolicy NewLogMergePolicy()
[29/34] lucenenet git commit: Passing Similarity and TimeZone into
RandomIndexWriter ctors.
Posted by sy...@apache.org.
Passing Similarity and TimeZone into RandomIndexWriter ctors.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c8e1eae6
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c8e1eae6
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c8e1eae6
Branch: refs/heads/lucenenet-indexablefield-api
Commit: c8e1eae628e07b06ae2f31512c9955d66d4b81ca
Parents: f772f19
Author: Connie Yau <co...@microsoft.com>
Authored: Sun Jul 31 23:30:36 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Sun Jul 31 23:30:36 2016 -0700
----------------------------------------------------------------------
.../Search/CheckHits.cs | 11 ++-
.../Search/QueryUtils.cs | 4 +-
.../ClassificationTestBase.cs | 2 +-
.../Utils/DataSplitterTest.cs | 2 +-
.../TestDemoExpressions.cs | 2 +-
.../TestExpressionRescorer.cs | 2 +-
.../TestExpressionSorts.cs | 2 +-
.../Range/TestRangeFacetCounts.cs | 22 ++---
.../SortedSet/TestSortedSetDocValuesFacets.cs | 12 +--
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 10 +-
.../Taxonomy/TestTaxonomyFacetCounts.cs | 18 ++--
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 2 +-
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 8 +-
.../TestDrillDownQuery.cs | 2 +-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 8 +-
.../TestRandomSamplingFacetsCollector.cs | 2 +-
.../Lucene.Net.Tests.Join.csproj | 2 +-
src/Lucene.Net.Tests.Join/TestBlockJoin.cs | 28 +++---
.../BooleanFilterTest.cs | 2 +-
.../ChainedFilterTest.cs | 4 +-
.../CommonTermsQueryTest.cs | 6 +-
.../Function/TestBoostedQuery.cs | 2 +-
.../Function/TestFieldScoreQuery.cs | 2 +-
.../Function/TestLongNormValueSource.cs | 2 +-
.../Function/TestOrdValues.cs | 4 +-
.../Function/TestValueSources.cs | 4 +-
.../Mlt/TestMoreLikeThis.cs | 4 +-
src/Lucene.Net.Tests.Queries/TermFilterTest.cs | 4 +-
src/Lucene.Net.Tests.Queries/TermsFilterTest.cs | 12 +--
.../TestCustomScoreQuery.cs | 10 +-
.../core/Analysis/TestCachingTokenFilter.cs | 2 +-
.../core/Analysis/TestMockAnalyzer.cs | 2 +-
.../core/Document/TestBinaryDocument.cs | 4 +-
.../core/Document/TestDocument.cs | 10 +-
.../core/Index/TestAddIndexes.cs | 14 +--
.../core/Index/TestBinaryDocValuesUpdates.cs | 3 +-
.../core/Index/TestBinaryTerms.cs | 2 +-
.../core/Index/TestCodecHoldsOpenFiles.cs | 4 +-
.../core/Index/TestCompoundFile.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestCrash.cs | 6 +-
.../core/Index/TestDirectoryReader.cs | 2 +-
.../core/Index/TestDirectoryReaderReopen.cs | 6 +-
src/Lucene.Net.Tests/core/Index/TestDocCount.cs | 2 +-
.../core/Index/TestDocValuesIndexing.cs | 12 +--
.../core/Index/TestDocValuesWithThreads.cs | 2 +-
.../core/Index/TestDocsAndPositions.cs | 4 +-
.../core/Index/TestFieldsReader.cs | 2 +-
.../core/Index/TestIndexWriter.cs | 4 +-
.../core/Index/TestIndexWriterDelete.cs | 4 +-
.../core/Index/TestIndexWriterExceptions.cs | 4 +-
.../core/Index/TestIndexWriterReader.cs | 8 +-
.../core/Index/TestIndexWriterUnicode.cs | 2 +-
.../core/Index/TestIndexableField.cs | 2 +-
.../core/Index/TestIsCurrent.cs | 2 +-
.../core/Index/TestOmitPositions.cs | 4 +-
src/Lucene.Net.Tests/core/Index/TestPayloads.cs | 6 +-
.../core/Index/TestPayloadsOnVectors.cs | 4 +-
.../core/Index/TestPostingsOffsets.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestRollback.cs | 2 +-
.../core/Index/TestSameTokenSamePosition.cs | 4 +-
.../core/Index/TestSizeBoundedForceMerge.cs | 2 +-
.../core/Index/TestStressAdvance.cs | 2 +-
.../core/Index/TestStressIndexing.cs | 10 +-
.../core/Index/TestStressIndexing2.cs | 4 +-
.../core/Index/TestStressNRT.cs | 2 +-
.../core/Index/TestSumDocFreq.cs | 2 +-
.../core/Index/TestTermVectorsReader.cs | 2 +-
.../core/Index/TestTermsEnum.cs | 6 +-
.../core/Index/TestTransactions.cs | 4 +-
.../core/Search/Payloads/PayloadHelper.cs | 2 +-
.../Search/Payloads/TestPayloadTermQuery.cs | 2 +-
.../core/Search/Similarities/TestSimilarity2.cs | 14 +--
.../Search/Similarities/TestSimilarityBase.cs | 2 +-
.../core/Search/Spans/TestBasics.cs | 2 +-
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 2 +-
.../core/Search/Spans/TestNearSpansOrdered.cs | 2 +-
.../core/Search/Spans/TestSpanFirstQuery.cs | 2 +-
.../Spans/TestSpanMultiTermQueryWrapper.cs | 2 +-
.../core/Search/Spans/TestSpans.cs | 2 +-
.../core/Search/Spans/TestSpansAdvanced.cs | 4 +-
.../core/Search/TestAutomatonQuery.cs | 2 +-
.../core/Search/TestAutomatonQueryUnicode.cs | 2 +-
.../core/Search/TestBoolean2.cs | 6 +-
.../core/Search/TestBooleanMinShouldMatch.cs | 8 +-
.../core/Search/TestBooleanOr.cs | 4 +-
.../core/Search/TestBooleanQuery.cs | 6 +-
.../core/Search/TestBooleanScorer.cs | 8 +-
.../core/Search/TestCachingWrapperFilter.cs | 22 ++---
.../core/Search/TestConstantScoreQuery.cs | 6 +-
.../core/Search/TestCustomSearcherSort.cs | 2 +-
.../core/Search/TestDateFilter.cs | 4 +-
.../core/Search/TestDateSort.cs | 2 +-
.../core/Search/TestDisjunctionMaxQuery.cs | 24 ++---
.../core/Search/TestDocIdSet.cs | 4 +-
.../core/Search/TestDocValuesScoring.cs | 18 ++--
.../core/Search/TestEarlyTermination.cs | 2 +-
.../core/Search/TestExplanations.cs | 2 +-
.../core/Search/TestFieldCacheTermsFilter.cs | 2 +-
.../core/Search/TestFilteredQuery.cs | 22 ++---
.../core/Search/TestFuzzyQuery.cs | 14 +--
.../core/Search/TestIndexSearcher.cs | 4 +-
.../core/Search/TestMinShouldMatch2.cs | 4 +-
.../core/Search/TestMultiPhraseQuery.cs | 18 ++--
.../core/Search/TestMultiTermQueryRewrites.cs | 6 +-
.../core/Search/TestNGramPhraseQuery.cs | 4 +-
src/Lucene.Net.Tests/core/Search/TestNot.cs | 2 +-
.../core/Search/TestNumericRangeQuery32.cs | 2 +-
.../core/Search/TestNumericRangeQuery64.cs | 2 +-
.../core/Search/TestPhrasePrefixQuery.cs | 2 +-
.../core/Search/TestPhraseQuery.cs | 64 ++++++-------
.../core/Search/TestPositionIncrement.cs | 4 +-
.../Search/TestPositiveScoresOnlyCollector.cs | 2 +-
.../core/Search/TestPrefixFilter.cs | 2 +-
.../core/Search/TestPrefixInBooleanQuery.cs | 2 +-
.../core/Search/TestPrefixQuery.cs | 2 +-
.../core/Search/TestQueryRescorer.cs | 10 +-
.../core/Search/TestQueryWrapperFilter.cs | 6 +-
.../core/Search/TestRegexpQuery.cs | 2 +-
.../core/Search/TestSameScoresWithThreads.cs | 2 +-
.../Search/TestScoreCachingWrappingScorer.cs | 2 +-
.../core/Search/TestSearchAfter.cs | 2 +-
.../core/Search/TestSearchWithThreads.cs | 2 +-
.../core/Search/TestSearcherManager.cs | 6 +-
.../core/Search/TestSloppyPhraseQuery.cs | 10 +-
src/Lucene.Net.Tests/core/Search/TestSort.cs | 98 ++++++++++----------
.../core/Search/TestSortDocValues.cs | 54 +++++------
.../core/Search/TestSortRandom.cs | 4 +-
.../core/Search/TestSortRescorer.cs | 4 +-
.../core/Search/TestTermVectors.cs | 2 +-
.../core/Search/TestTopDocsCollector.cs | 2 +-
.../core/Search/TestTopDocsMerge.cs | 2 +-
.../core/Search/TestTopFieldCollector.cs | 2 +-
.../core/Search/TestTopScoreDocCollector.cs | 2 +-
.../core/Search/TestTotalHitCountCollector.cs | 2 +-
.../core/Search/TestWildcard.cs | 2 +-
.../core/Store/TestLockFactory.cs | 2 +-
136 files changed, 446 insertions(+), 444 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.TestFramework/Search/CheckHits.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/CheckHits.cs b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
index d2d3f54..f7c77aa 100644
--- a/src/Lucene.Net.TestFramework/Search/CheckHits.cs
+++ b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
@@ -7,6 +7,7 @@ using System.Text;
namespace Lucene.Net.Search
{
using NUnit.Framework;
+ using Similarities;
using System.IO;
/*
@@ -91,9 +92,9 @@ namespace Lucene.Net.Search
/// <param name="defaultFieldName"> used for displaying the query in assertion messages </param>
/// <param name="results"> a list of documentIds that must match the query </param>
/// <seealso cref= #checkHits </seealso>
- public static void CheckHitCollector(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results)
+ public static void CheckHitCollector(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results, Similarity similarity)
{
- QueryUtils.Check(random, query, searcher);
+ QueryUtils.Check(random, query, searcher, similarity);
Trace.TraceInformation("Checked");
@@ -112,7 +113,7 @@ namespace Lucene.Net.Search
for (int i = -1; i < 2; i++)
{
actual.Clear();
- IndexSearcher s = QueryUtils.WrapUnderlyingReader(random, searcher, i);
+ IndexSearcher s = QueryUtils.WrapUnderlyingReader(random, searcher, i, similarity);
s.Search(query, c);
Assert.AreEqual(correct, actual, "Wrap Reader " + i + ": " + query.ToString(defaultFieldName));
}
@@ -170,7 +171,7 @@ namespace Lucene.Net.Search
/// <param name="defaultFieldName"> used for displaing the query in assertion messages </param>
/// <param name="results"> a list of documentIds that must match the query </param>
/// <seealso cref= #checkHitCollector </seealso>
- public static void DoCheckHits(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results)
+ public static void DoCheckHits(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results, Similarity similarity)
{
ScoreDoc[] hits = searcher.Search(query, 1000).ScoreDocs;
@@ -188,7 +189,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(correct, actual, query.ToString(defaultFieldName));
- QueryUtils.Check(random, query, searcher, LuceneTestCase.Rarely(random));
+ QueryUtils.Check(random, query, searcher, LuceneTestCase.Rarely(random), similarity);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
index 1c61c6e..88ff11d 100644
--- a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
+++ b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
@@ -123,9 +123,9 @@ namespace Lucene.Net.Search
/// <seealso cref= #checkSkipTo </seealso>
/// <seealso cref= #checkExplanations </seealso>
/// <seealso cref= #checkEqual </seealso>
- public static void Check(Random random, Query q1, IndexSearcher s)
+ public static void Check(Random random, Query q1, IndexSearcher s, Similarity similarity)
{
- Check(random, q1, s, true);
+ Check(random, q1, s, true, similarity);
}
public static void Check(Random random, Query q1, IndexSearcher s, bool wrap, Similarity similarity)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
index 4762408..3ab492c 100644
--- a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
+++ b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Classification
{
base.SetUp();
dir = NewDirectory();
- indexWriter = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ indexWriter = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
textFieldName = "text";
categoryFieldName = "cat";
booleanFieldName = "bool";
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
index 792b268..765e262 100644
--- a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
+++ b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Classification
{
base.SetUp();
_dir = NewDirectory();
- _indexWriter = new RandomIndexWriter(Random(), _dir, new MockAnalyzer(Random()));
+ _indexWriter = new RandomIndexWriter(Random(), _dir, new MockAnalyzer(Random()), Similarity, TimeZone);
FieldType ft = new FieldType(TextField.TYPE_STORED);
ft.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
index 5e99845..21e5656 100644
--- a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Tests.Expressions
{
base.SetUp();
dir = NewDirectory();
- var iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
var doc = new Document
{
NewStringField("id", "1", Field.Store.YES),
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
index 9c0d15c..854f634 100644
--- a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Tests.Expressions
{
base.SetUp();
dir = NewDirectory();
- var iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
var doc = new Document
{
NewStringField("id", "1", Field.Store.YES),
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
index a69a93c..46084c7 100644
--- a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
+++ b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Tests.Expressions
{
base.SetUp();
dir = NewDirectory();
- var iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs = TestUtil.NextInt(Random(), 2049, 4000);
for (int i = 0; i < numDocs; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
index d2a296b..e3a2623 100644
--- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestBasicLong()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
NumericDocValuesField field = new NumericDocValuesField("field", 0L);
doc.Add(field);
@@ -149,7 +149,7 @@ namespace Lucene.Net.Facet.Range
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
NumericDocValuesField field = new NumericDocValuesField("field", 0L);
doc.Add(field);
@@ -180,7 +180,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestOverlappedEndStart()
{
Directory d = NewDirectory();
- var w = new RandomIndexWriter(Random(), d);
+ var w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
NumericDocValuesField field = new NumericDocValuesField("field", 0L);
doc.Add(field);
@@ -216,7 +216,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestMixedRangeAndNonRangeTaxonomy()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Directory td = NewDirectory();
DirectoryTaxonomyWriter tw = new DirectoryTaxonomyWriter(td, IndexWriterConfig.OpenMode_e.CREATE);
@@ -331,7 +331,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestBasicDouble()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
DoubleDocValuesField field = new DoubleDocValuesField("field", 0.0);
doc.Add(field);
@@ -358,7 +358,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestBasicFloat()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
FloatDocValuesField field = new FloatDocValuesField("field", 0.0f);
doc.Add(field);
@@ -386,7 +386,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestRandomLongs()
{
Directory dir = NewDirectory();
- var w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs = AtLeast(1000);
if (VERBOSE)
@@ -579,7 +579,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestRandomFloats()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs = AtLeast(1000);
float[] values = new float[numDocs];
@@ -784,7 +784,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestRandomDoubles()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs = AtLeast(1000);
double[] values = new double[numDocs];
@@ -973,7 +973,7 @@ namespace Lucene.Net.Facet.Range
{
AssumeTrue("codec does not support docsWithField", DefaultCodecSupportsDocsWithField());
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document doc = new Document();
NumericDocValuesField field = new NumericDocValuesField("field", 0L);
doc.Add(field);
@@ -1006,7 +1006,7 @@ namespace Lucene.Net.Facet.Range
public virtual void TestCustomDoublesValueSource()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
index 51c26ec..7b42c55 100644
--- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
+++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Facet.SortedSet
FacetsConfig config = new FacetsConfig();
config.SetMultiValued("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new SortedSetDocValuesFacetField("a", "foo"));
@@ -105,7 +105,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -153,7 +153,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -211,7 +211,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -253,7 +253,7 @@ namespace Lucene.Net.Facet.SortedSet
AssumeTrue("Test requires SortedSetDV support", DefaultCodecSupportsSortedSet());
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
@@ -292,7 +292,7 @@ namespace Lucene.Net.Facet.SortedSet
Directory indexDir = NewDirectory();
Directory taxoDir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), indexDir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), indexDir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
int numDocs = AtLeast(1000);
int numDims = TestUtil.NextInt(Random(), 1, 7);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 74f66f3..2df9d52 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Facet.Taxonomy
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
dir = NewDirectory();
taxoDir = NewDirectory();
@@ -62,7 +62,7 @@ namespace Lucene.Net.Facet.Taxonomy
config.SetIndexFieldName("float", "$facets.float");
config.SetMultiValued("float", true);
- var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
// index documents, 50% have only 'b' and all have 'a'
for (int i = 0; i < 110; i++)
@@ -190,7 +190,7 @@ namespace Lucene.Net.Facet.Taxonomy
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new IntAssociationFacetField(14, "a", "x"));
@@ -216,7 +216,7 @@ namespace Lucene.Net.Facet.Taxonomy
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new IntAssociationFacetField(14, "a", "x"));
@@ -241,7 +241,7 @@ namespace Lucene.Net.Facet.Taxonomy
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
config.SetRequireDimCount("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new IntAssociationFacetField(14, "a", "x"));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index 27aba82..a2b412e 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("Publish Date", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new FacetField("Author", "Bob"));
@@ -152,7 +152,7 @@ namespace Lucene.Net.Facet.Taxonomy
// main index:
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -214,7 +214,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetIndexFieldName("a", "$facets2");
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new FacetField("a", "foo1"));
@@ -318,7 +318,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("a", true);
config.SetMultiValued("a", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewTextField("field", "text", Field.Store.NO));
@@ -364,7 +364,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
FacetsConfig config = new FacetsConfig();
@@ -399,7 +399,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
FacetsConfig config = new FacetsConfig();
@@ -510,7 +510,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -536,7 +536,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory dir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -749,7 +749,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory indexDir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), indexDir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), indexDir, Similarity, TimeZone);
var tw = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
int numDocs = AtLeast(1000);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index 30f9633..6cc8314 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -246,7 +246,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
[TestFixtureSetUp]
- public static void BeforeClassCountingFacetsAggregatorTest()
+ public void BeforeClassCountingFacetsAggregatorTest()
{
indexDir = NewDirectory();
taxoDir = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
index 3ec1ef6..21ede3c 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Facet.Taxonomy
// main index:
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
// Reused across documents, to add the necessary facet
@@ -144,7 +144,7 @@ namespace Lucene.Net.Facet.Taxonomy
// main index:
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
Document doc = new Document();
@@ -213,7 +213,7 @@ namespace Lucene.Net.Facet.Taxonomy
FacetsConfig config = new FacetsConfig();
config.SetIndexFieldName("a", "$facets2");
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new IntField("num", 10, Field.Store.NO));
@@ -498,7 +498,7 @@ namespace Lucene.Net.Facet.Taxonomy
Store.Directory indexDir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), indexDir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), indexDir, Similarity, TimeZone);
var tw = new DirectoryTaxonomyWriter(taxoDir);
FacetsConfig config = new FacetsConfig();
int numDocs = AtLeast(1000);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 49ce90a..3ceb005 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Facet
}
[TestFixtureSetUp]
- public static void BeforeClassDrillDownQueryTest()
+ public void BeforeClassDrillDownQueryTest()
{
dir = NewDirectory();
Random r = Random();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
index e0add44..366a16a 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Facet
FacetsConfig config = new FacetsConfig();
config.SetHierarchical("Publish Date", true);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(new FacetField("Author", "Bob"));
@@ -252,7 +252,7 @@ namespace Lucene.Net.Facet
{
Directory dir = NewDirectory();
Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
// Writes facet ords to a separate directory from the
// main index:
@@ -308,7 +308,7 @@ namespace Lucene.Net.Facet
{
Directory dir = NewDirectory();
Directory taxoDir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
// Writes facet ords to a separate directory from the
// main index:
@@ -1307,7 +1307,7 @@ namespace Lucene.Net.Facet
// LUCENE-5045: make sure DrillSideways works with an empty index
Directory dir = NewDirectory();
Directory taxoDir = NewDirectory();
- var writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ var writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
var taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode_e.CREATE);
IndexSearcher searcher = NewSearcher(writer.Reader);
var taxoReader = new DirectoryTaxonomyReader(taxoWriter);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
index 69df3c9..7b5915b 100644
--- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
+++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Facet
Directory taxoDir = NewDirectory();
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
FacetsConfig config = new FacetsConfig();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
index f49b920..838b1fd 100644
--- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
+++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
@@ -31,7 +31,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+ <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
index 2359946..c140c75 100644
--- a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
+++ b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Tests.Join
public void TestSimple()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IList<Document> docs = new List<Document>();
@@ -221,7 +221,7 @@ namespace Lucene.Net.Tests.Join
public void TestBugCausedByRewritingTwice()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IList<Document> docs = new List<Document>();
@@ -278,7 +278,7 @@ namespace Lucene.Net.Tests.Join
public virtual void TestSimpleFilter()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IList<Document> docs = new List<Document>();
docs.Add(MakeJob("java", 2007));
@@ -376,13 +376,13 @@ namespace Lucene.Net.Tests.Join
public void TestBoostBug()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IndexReader r = w.Reader;
w.Dispose();
IndexSearcher s = NewSearcher(r);
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchAllDocsQuery(), new QueryWrapperFilter(new MatchAllDocsQuery()), ScoreMode.Avg);
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
s.Search(q, 10);
BooleanQuery bq = new BooleanQuery();
bq.Boost = 2f; // we boost the BQ
@@ -521,8 +521,8 @@ namespace Lucene.Net.Tests.Join
IList<int> toDelete = new List<int>();
// TODO: parallel star join, nested join cases too!
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
- RandomIndexWriter joinW = new RandomIndexWriter(Random(), joinDir);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
+ RandomIndexWriter joinW = new RandomIndexWriter(Random(), joinDir, Similarity, TimeZone);
for (int parentDocID = 0; parentDocID < numParentDocs; parentDocID++)
{
Document parentDoc = new Document();
@@ -1125,7 +1125,7 @@ namespace Lucene.Net.Tests.Join
public void TestMultiChildTypes()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IList<Document> docs = new List<Document>();
@@ -1212,7 +1212,7 @@ namespace Lucene.Net.Tests.Join
public void TestAdvanceSingleParentSingleChild()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document childDoc = new Document();
childDoc.Add(NewStringField("child", "1", Field.Store.NO));
Document parentDoc = new Document();
@@ -1271,7 +1271,7 @@ namespace Lucene.Net.Tests.Join
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IList<Document> docs = new List<Document>();
docs.Add(MakeJob("ruby", 2005));
@@ -1365,7 +1365,7 @@ namespace Lucene.Net.Tests.Join
public void TestSometimesParentOnlyMatches()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document parent = new Document();
parent.Add(new StoredField("parentID", "0"));
parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1430,7 +1430,7 @@ namespace Lucene.Net.Tests.Join
public void TestChildQueryNeverMatches()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document parent = new Document();
parent.Add(new StoredField("parentID", "0"));
parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1496,7 +1496,7 @@ namespace Lucene.Net.Tests.Join
public void TestChildQueryMatchesParent()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
Document parent = new Document();
parent.Add(new StoredField("parentID", "0"));
parent.Add(NewTextField("parentText", "text", Field.Store.NO));
@@ -1547,7 +1547,7 @@ namespace Lucene.Net.Tests.Join
public void TestAdvanceSingleDeletedParentNoChild()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
// First doc with 1 children
Document parentDoc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs b/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
index 2bd949a..3b5e22a 100644
--- a/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/BooleanFilterTest.cs
@@ -19,7 +19,7 @@ namespace Lucene.Net.Tests.Queries
{
base.SetUp();
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, false));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, false), Similarity, TimeZone);
AddDoc(writer, @"admin guest", @"010", @"20040101", @"Y");
AddDoc(writer, @"guest", @"020", @"20040101", @"Y");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs b/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
index 9d63a8c..cd6255d 100644
--- a/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/ChainedFilterTest.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Tests.Queries
{
base.SetUp();
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
// we use the default Locale/TZ since LuceneTestCase randomizes it
var cal = new DateTime(1970, 1, 1, 0, 0, 0, (int)TestUtil.NextLong(Random(), 0, long.MaxValue), new GregorianCalendar());
@@ -160,7 +160,7 @@ namespace Lucene.Net.Tests.Queries
public virtual void TestWithCachingFilter()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
IndexReader reader = writer.Reader;
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
index 05c43cd..a9dc7b4 100644
--- a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
+++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Tests.Queries
{
Directory dir = NewDirectory();
MockAnalyzer analyzer = new MockAnalyzer(Random());
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer, Similarity, TimeZone);
var docs = new string[]
{
@"this is the end of the world right", @"is this it or maybe not",
@@ -153,7 +153,7 @@ namespace Lucene.Net.Tests.Queries
{
Directory dir = NewDirectory();
MockAnalyzer analyzer = new MockAnalyzer(Random());
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer, Similarity, TimeZone);
string[] docs = new string[]
{
@"this is the end of the world right", @"is this it or maybe not",
@@ -305,7 +305,7 @@ namespace Lucene.Net.Tests.Queries
{
Directory dir = NewDirectory();
MockAnalyzer analyzer = new MockAnalyzer(Random());
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer, Similarity, TimeZone);
var docs = new string[]
{
@"this is the end of the world right", @"is this it or maybe not",
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs b/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
index 8ddd281..39ee59d 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestBoostedQuery.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Tests.Queries.Function
expected[i] = new ScoreDoc(i, scores[i]);
}
TopDocs docs = @is.Search(q, 10, new Sort(new SortField("id", SortField.Type_e.STRING)));
- CheckHits.DoCheckHits(Random(), q, "", @is, expectedDocs);
+ CheckHits.DoCheckHits(Random(), q, "", @is, expectedDocs, Similarity);
CheckHits.CheckHitsQuery(q, expected, docs.ScoreDocs, expectedDocs);
CheckHits.CheckExplanations(q, "", @is);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs b/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
index 39938bd..13495cb 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestFieldScoreQuery.cs
@@ -76,7 +76,7 @@ namespace Lucene.Net.Tests.Queries.Function
IndexReader r = DirectoryReader.Open(dir);
IndexSearcher s = NewSearcher(r);
Log("test: " + functionQuery);
- QueryUtils.Check(Random(), functionQuery, s);
+ QueryUtils.Check(Random(), functionQuery, s, Similarity);
ScoreDoc[] h = s.Search(functionQuery, null, 1000).ScoreDocs;
assertEquals("All docs should be matched!", N_DOCS, h.Length);
string prevID = "ID" + (N_DOCS + 1); // greater than all ids of docs in this test
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs b/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
index 38ebe7f..ef0b2f1 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestLongNormValueSource.cs
@@ -89,7 +89,7 @@ namespace Lucene.Net.Tests.Queries.Function
}
*/
- CheckHits.DoCheckHits(Random(), q, "", searcher, expectedDocs);
+ CheckHits.DoCheckHits(Random(), q, "", searcher, expectedDocs, Similarity);
CheckHits.CheckHitsQuery(q, expected, docs.ScoreDocs, expectedDocs);
CheckHits.CheckExplanations(q, "", searcher);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs b/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
index ef396ee..3067d63 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestOrdValues.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Tests.Queries.Function
/// </summary>
/// <param name="field"></param>
/// <param name="inOrder"></param>
- private static void DoTestRank(string field, bool inOrder)
+ private void DoTestRank(string field, bool inOrder)
{
IndexReader r = DirectoryReader.Open(dir);
IndexSearcher s = NewSearcher(r);
@@ -65,7 +65,7 @@ namespace Lucene.Net.Tests.Queries.Function
Query q = new FunctionQuery(vs);
Log("test: " + q);
- QueryUtils.Check(Random(), q, s);
+ QueryUtils.Check(Random(), q, s, Similarity);
ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
assertEquals("All docs should be matched!", N_DOCS, h.Length);
string prevID = inOrder ? "IE" : "IC"; // smaller than all ids of docs in this test ("ID0001", etc.) - greater than all ids of docs in this test ("ID0001", etc.)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs b/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
index d48d41c..4e14abe 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
@@ -321,7 +321,7 @@ namespace Lucene.Net.Tests.Queries.Function
}
}
- private static void AssertHits(Query q, float[] scores)
+ private void AssertHits(Query q, float[] scores)
{
ScoreDoc[] expected = new ScoreDoc[scores.Length];
int[] expectedDocs = new int[scores.Length];
@@ -331,7 +331,7 @@ namespace Lucene.Net.Tests.Queries.Function
expected[i] = new ScoreDoc(i, scores[i]);
}
TopDocs docs = searcher.Search(q, null, documents.Count, new Sort(new SortField("id", SortField.Type_e.STRING)), true, false);
- CheckHits.DoCheckHits(Random(), q, "", searcher, expectedDocs);
+ CheckHits.DoCheckHits(Random(), q, "", searcher, expectedDocs, Similarity);
CheckHits.CheckHitsQuery(q, expected, docs.ScoreDocs, expectedDocs);
CheckHits.CheckExplanations(q, "", searcher);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
index 3b33bdc..bed7c26 100644
--- a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
+++ b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
{
base.SetUp();
directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, Similarity, TimeZone);
// Add series of docs with specific information for MoreLikeThis
AddDoc(writer, "lucene");
@@ -126,7 +126,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
public void TestMoreLikeThisQuery()
{
Query query = new MoreLikeThisQuery("this is a test", new[] { "text" }, new MockAnalyzer(Random()), "text");
- QueryUtils.Check(Random(), query, searcher);
+ QueryUtils.Check(Random(), query, searcher, Similarity);
}
// TODO: add tests for the MoreLikeThisQuery
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
index ef19de1..5837c3c 100644
--- a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Tests.Queries
{
string fieldName = @"field1";
Directory rd = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), rd);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), rd, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField(fieldName, @"value1", Field.Store.NO));
w.AddDocument(doc);
@@ -54,7 +54,7 @@ namespace Lucene.Net.Tests.Queries
public void TestRandom()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int num = AtLeast(100);
var terms = new List<Term>();
for (int i = 0; i < num; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
index 6fbd43f..7c5624d 100644
--- a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Tests.Queries
{
string fieldName = "field1";
Directory rd = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), rd);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), rd, Similarity, TimeZone);
for (int i = 0; i < 100; i++)
{
Document doc = new Document();
@@ -72,7 +72,7 @@ namespace Lucene.Net.Tests.Queries
{
string fieldName = "field1";
Directory rd1 = NewDirectory();
- RandomIndexWriter w1 = new RandomIndexWriter(Random(), rd1);
+ RandomIndexWriter w1 = new RandomIndexWriter(Random(), rd1, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField(fieldName, "content1", Field.Store.YES));
w1.AddDocument(doc);
@@ -81,7 +81,7 @@ namespace Lucene.Net.Tests.Queries
fieldName = "field2";
Directory rd2 = NewDirectory();
- RandomIndexWriter w2 = new RandomIndexWriter(Random(), rd2);
+ RandomIndexWriter w2 = new RandomIndexWriter(Random(), rd2, Similarity, TimeZone);
doc = new Document();
doc.Add(NewStringField(fieldName, "content2", Field.Store.YES));
w2.AddDocument(doc);
@@ -114,7 +114,7 @@ namespace Lucene.Net.Tests.Queries
public void TestFieldNotPresent()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int num = AtLeast(3);
int skip = Random().Next(num);
var terms = new List<Term>();
@@ -150,7 +150,7 @@ namespace Lucene.Net.Tests.Queries
public void TestSkipField()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int num = AtLeast(10);
var terms = new HashSet<Term>();
for (int i = 0; i < num; i++)
@@ -192,7 +192,7 @@ namespace Lucene.Net.Tests.Queries
public void TestRandom()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int num = AtLeast(100);
bool singleField = Random().NextBoolean();
IList<Term> terms = new List<Term>();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
index 3fbb797..b074df9 100644
--- a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
@@ -334,11 +334,11 @@ namespace Lucene.Net.Tests.Queries
assertEquals("queries should have same #hits", h1.Count, h4CustomAdd.Count);
assertEquals("queries should have same #hits", h1.Count, h5CustomMulAdd.Count);
- QueryUtils.Check(Random(), q1, s, Rarely());
- QueryUtils.Check(Random(), q2, s, Rarely());
- QueryUtils.Check(Random(), q3, s, Rarely());
- QueryUtils.Check(Random(), q4, s, Rarely());
- QueryUtils.Check(Random(), q5, s, Rarely());
+ QueryUtils.Check(Random(), q1, s, Rarely(), Similarity);
+ QueryUtils.Check(Random(), q2, s, Rarely(), Similarity);
+ QueryUtils.Check(Random(), q3, s, Rarely(), Similarity);
+ QueryUtils.Check(Random(), q4, s, Rarely(), Similarity);
+ QueryUtils.Check(Random(), q5, s, Rarely(), Similarity);
// verify scores ratios
foreach (int doc in h1.Keys)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs b/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
index 004a4ac..b7d326a 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Analysis
public virtual void TestCaching()
{
Directory dir = new RAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
TokenStream stream = new TokenStreamAnonymousInnerClassHelper(this);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
index 9a52c52..351c4fc 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
@@ -349,7 +349,7 @@ namespace Lucene.Net.Analysis
Analyzer @delegate = new MockAnalyzer(Random());
Analyzer a = new AnalyzerWrapperAnonymousInnerClassHelper2(this, @delegate.Strategy, positionGap, offsetGap, @delegate);
- RandomIndexWriter writer = new RandomIndexWriter(Random(), NewDirectory());
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), NewDirectory(), Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType();
ft.Indexed = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs b/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
index 1e010f8..742a0f4 100644
--- a/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestBinaryDocument.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Document
/// add the doc to a ram index </summary>
Directory dir = NewDirectory();
Random r = Random();
- RandomIndexWriter writer = new RandomIndexWriter(r, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(r, dir, Similarity, TimeZone);
writer.AddDocument(doc);
/// <summary>
@@ -98,7 +98,7 @@ namespace Lucene.Net.Document
var doc = new Documents.Document {binaryFldCompressed, stringFldCompressed};
using (Directory dir = NewDirectory())
- using (RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone))
+ using (RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone))
{
writer.AddDocument(doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index cc35b32..36ac3b4 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -190,7 +190,7 @@ namespace Lucene.Net.Document
public virtual void TestGetValuesForIndexedDocument()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.AddDocument(MakeDocumentWithFields());
IndexReader reader = writer.Reader;
@@ -223,7 +223,7 @@ namespace Lucene.Net.Document
public virtual void TestPositionIncrementMultiFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.AddDocument(MakeDocumentWithFields());
IndexReader reader = writer.Reader;
@@ -303,7 +303,7 @@ namespace Lucene.Net.Document
doc.Add(new StringField("keyword", "test", Field.Store.YES));
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
writer.AddDocument(doc);
field.StringValue = "id2";
writer.AddDocument(doc);
@@ -366,7 +366,7 @@ namespace Lucene.Net.Document
public virtual void TestTransitionAPI()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Documents.Document doc = new Documents.Document();
doc.Add(new Field("stored", "abc", Field.Store.YES, Field.Index.NO));
@@ -443,7 +443,7 @@ namespace Lucene.Net.Document
Assert.AreEqual(new string[] { "5", "4" }, doc.GetValues("int"));
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
iw.AddDocument(doc);
DirectoryReader ir = iw.Reader;
Documents.Document sdoc = ir.Document(0);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
index bed2d07..b3bf19f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
@@ -1267,7 +1267,7 @@ namespace Lucene.Net.Index
public virtual void TestFieldNamesChanged()
{
Directory d1 = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d1);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d1, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("f1", "doc1 field1", Field.Store.YES));
doc.Add(NewStringField("id", "1", Field.Store.YES));
@@ -1276,7 +1276,7 @@ namespace Lucene.Net.Index
w.Dispose();
Directory d2 = NewDirectory();
- w = new RandomIndexWriter(Random(), d2);
+ w = new RandomIndexWriter(Random(), d2, Similarity, TimeZone);
doc = new Document();
doc.Add(NewStringField("f2", "doc2 field2", Field.Store.YES));
doc.Add(NewStringField("id", "2", Field.Store.YES));
@@ -1285,7 +1285,7 @@ namespace Lucene.Net.Index
w.Dispose();
Directory d3 = NewDirectory();
- w = new RandomIndexWriter(Random(), d3);
+ w = new RandomIndexWriter(Random(), d3, Similarity, TimeZone);
w.AddIndexes(r1, r2);
r1.Dispose();
d1.Dispose();
@@ -1315,7 +1315,7 @@ namespace Lucene.Net.Index
public virtual void TestAddEmpty()
{
Directory d1 = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d1);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d1, Similarity, TimeZone);
MultiReader empty = new MultiReader();
w.AddIndexes(empty);
w.Dispose();
@@ -1336,12 +1336,12 @@ namespace Lucene.Net.Index
public virtual void TestFakeAllDeleted()
{
Directory src = NewDirectory(), dest = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), src);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), src, Similarity, TimeZone);
w.AddDocument(new Document());
IndexReader allDeletedReader = new AllDeletedFilterReader((AtomicReader)w.Reader.Leaves[0].Reader);
w.Dispose();
- w = new RandomIndexWriter(Random(), dest);
+ w = new RandomIndexWriter(Random(), dest, Similarity, TimeZone);
w.AddIndexes(allDeletedReader);
w.Dispose();
DirectoryReader dr = DirectoryReader.Open(src);
@@ -1363,7 +1363,7 @@ namespace Lucene.Net.Index
public virtual void TestLocksBlock()
{
Directory src = NewDirectory();
- RandomIndexWriter w1 = new RandomIndexWriter(Random(), src);
+ RandomIndexWriter w1 = new RandomIndexWriter(Random(), src, Similarity, TimeZone);
w1.AddDocument(new Document());
w1.Commit();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
index 2caa695..eadd065 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
@@ -1110,6 +1110,7 @@ namespace Lucene.Net.Index
public virtual void TestUpdateOldSegments()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+
Codec[] oldCodecs = new Codec[] {
new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
new Lucene41RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE),
@@ -1128,8 +1129,6 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
writer.Dispose();
dir.Dispose();
-
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
index ef7fa5a..0c0fabc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryTerms.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Index
public virtual void TestBinary()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
BytesRef bytes = new BytesRef(2);
BinaryTokenStream tokenStream = new BinaryTokenStream(bytes);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs b/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
index db7e926..1c2a37e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
@@ -35,7 +35,7 @@ namespace Lucene.Net.Index
public virtual void Test()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
@@ -73,7 +73,7 @@ namespace Lucene.Net.Index
public virtual void TestExposeUnclosedFiles()
{
Directory d = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
//int numDocs = AtLeast(100);
int numDocs = 5;
for (int i = 0; i < numDocs; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
index e43aae9..f64ddc6 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
@@ -850,7 +850,7 @@ namespace Lucene.Net.Index
{
Directory dir = NewDirectory();
// riw should sometimes create docvalues fields, etc
- RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter riw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
// these fields should sometimes get term vectors, etc
Field idField = NewStringField("id", "", Field.Store.NO);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestCrash.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCrash.cs b/src/Lucene.Net.Tests/core/Index/TestCrash.cs
index 4c13291..0a4e374 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCrash.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCrash.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Index
Directory dir2 = NewDirectory(dir);
dir.Dispose();
- (new RandomIndexWriter(Random(), dir2)).Dispose();
+ (new RandomIndexWriter(Random(), dir2, Similarity, TimeZone)).Dispose();
dir2.Dispose();
}
@@ -137,7 +137,7 @@ namespace Lucene.Net.Index
Directory dir2 = NewDirectory(dir);
dir.Dispose();
- (new RandomIndexWriter(Random(), dir2)).Dispose();
+ (new RandomIndexWriter(Random(), dir2, Similarity, TimeZone)).Dispose();
dir2.Dispose();
}
@@ -176,7 +176,7 @@ namespace Lucene.Net.Index
Directory dir2 = NewDirectory(dir);
dir.Dispose();
- (new RandomIndexWriter(Random(), dir2)).Dispose();
+ (new RandomIndexWriter(Random(), dir2, Similarity, TimeZone)).Dispose();
dir2.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index aa61570..2de7c4d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -1206,7 +1206,7 @@ namespace Lucene.Net.Index
public virtual void TestLoadCertainFields()
{
Directory dir = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
doc.Add(NewStringField("field1", "foobar", Field.Store.YES));
doc.Add(NewStringField("field2", "foobaz", Field.Store.YES));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
index 5a21c47..95dcfa9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
@@ -400,7 +400,7 @@ namespace Lucene.Net.Index
refreshed = r;
}
- IndexSearcher searcher = NewSearcher(refreshed);
+ IndexSearcher searcher = OuterInstance.NewSearcher(refreshed);
ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field1", "a" + rnd.Next(refreshed.MaxDoc))), null, 1000).ScoreDocs;
if (hits.Length > 0)
{
@@ -559,10 +559,10 @@ namespace Lucene.Net.Index
}
}
- public static void CreateIndex(Random random, Directory dir, bool multiSegment)
+ public void CreateIndex(Random random, Directory dir, bool multiSegment)
{
IndexWriter.Unlock(dir);
- IndexWriter w = new IndexWriter(dir, LuceneTestCase.NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(new LogDocMergePolicy()));
+ IndexWriter w = new IndexWriter(dir, NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c8e1eae6/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
index 11165b2..01ef636 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Index
public virtual void TestSimple()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
int numDocs = AtLeast(100);
for (int i = 0; i < numDocs; i++)
{
[15/34] lucenenet git commit: Fixing NewSearcher errors in QueryUtils
Posted by sy...@apache.org.
Fixing NewSearcher errors in QueryUtils
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9067582a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9067582a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9067582a
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 9067582a3bf68430a789e641670e3a96fe688d95
Parents: 72840c6
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 15:07:46 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 15:07:46 2016 -0700
----------------------------------------------------------------------
.../Search/QueryUtils.cs | 43 ++++++++++++--------
1 file changed, 25 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9067582a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
index 1156eee..1c61c6e 100644
--- a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
+++ b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
@@ -43,6 +43,7 @@ namespace Lucene.Net.Search
using MultiReader = Lucene.Net.Index.MultiReader;
using RAMDirectory = Lucene.Net.Store.RAMDirectory;
using SlowCompositeReaderWrapper = Lucene.Net.Index.SlowCompositeReaderWrapper;
+ using Similarities;
/// <summary>
/// Utility class for sanity-checking queries.
@@ -127,20 +128,20 @@ namespace Lucene.Net.Search
Check(random, q1, s, true);
}
- public static void Check(Random random, Query q1, IndexSearcher s, bool wrap)
+ public static void Check(Random random, Query q1, IndexSearcher s, bool wrap, Similarity similarity)
{
try
{
Check(q1);
if (s != null)
{
- CheckFirstSkipTo(q1, s);
- CheckSkipTo(q1, s);
+ CheckFirstSkipTo(q1, s, similarity);
+ CheckSkipTo(q1, s, similarity);
if (wrap)
{
- Check(random, q1, WrapUnderlyingReader(random, s, -1), false);
- Check(random, q1, WrapUnderlyingReader(random, s, 0), false);
- Check(random, q1, WrapUnderlyingReader(random, s, +1), false);
+ Check(random, q1, WrapUnderlyingReader(random, s, -1, similarity), false, similarity);
+ Check(random, q1, WrapUnderlyingReader(random, s, 0, similarity), false, similarity);
+ Check(random, q1, WrapUnderlyingReader(random, s, +1, similarity), false, similarity);
}
CheckExplanations(q1, s);
@@ -199,7 +200,7 @@ namespace Lucene.Net.Search
/// behave exactly the same as the original IndexSearcher. </summary>
/// <param name="s"> the searcher to wrap </param>
/// <param name="edge"> if negative, s will be the first sub; if 0, s will be in the middle, if positive s will be the last sub </param>
- public static IndexSearcher WrapUnderlyingReader(Random random, IndexSearcher s, int edge)
+ public static IndexSearcher WrapUnderlyingReader(Random random, IndexSearcher s, int edge, Similarity similarity)
{
IndexReader r = s.IndexReader;
@@ -207,7 +208,7 @@ namespace Lucene.Net.Search
// it will throw off the docIds
IndexReader[] readers = new IndexReader[] { edge < 0 ? r : EmptyReaders[0], EmptyReaders[0], new FCInvisibleMultiReader(edge < 0 ? EmptyReaders[4] : EmptyReaders[0], EmptyReaders[0], 0 == edge ? r : EmptyReaders[0]), 0 < edge ? EmptyReaders[0] : EmptyReaders[7], EmptyReaders[0], new FCInvisibleMultiReader(0 < edge ? EmptyReaders[0] : EmptyReaders[5], EmptyReaders[0], 0 < edge ? r : EmptyReaders[0]) };
- IndexSearcher @out = LuceneTestCase.NewSearcher(new FCInvisibleMultiReader(readers));
+ IndexSearcher @out = LuceneTestCase.NewSearcher(new FCInvisibleMultiReader(readers), similarity);
@out.Similarity = s.Similarity;
return @out;
}
@@ -250,7 +251,7 @@ namespace Lucene.Net.Search
/// alternate scorer skipTo(),skipTo(),next(),next(),skipTo(),skipTo(), etc
/// and ensure a hitcollector receives same docs and scores
/// </summary>
- public static void CheckSkipTo(Query q, IndexSearcher s)
+ public static void CheckSkipTo(Query q, IndexSearcher s, Similarity similarity)
{
//System.out.println("Checking "+q);
IList<AtomicReaderContext> readerContextArray = s.TopReaderContext.Leaves;
@@ -276,14 +277,14 @@ namespace Lucene.Net.Search
const float maxDiff = 1e-5f;
AtomicReader[] lastReader = new AtomicReader[] { null };
- s.Search(q, new CollectorAnonymousInnerClassHelper(q, s, readerContextArray, skip_op, order, opidx, lastDoc, maxDiff, lastReader));
+ s.Search(q, new CollectorAnonymousInnerClassHelper(q, s, readerContextArray, skip_op, order, opidx, lastDoc, maxDiff, lastReader, similarity));
if (lastReader[0] != null)
{
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
AtomicReader previousReader = lastReader[0];
- IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader, false);
+ IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader, false, similarity);
indexSearcher.Similarity = s.Similarity;
Weight w = indexSearcher.CreateNormalizedWeight(q);
AtomicReaderContext ctx = (AtomicReaderContext)previousReader.Context;
@@ -308,8 +309,11 @@ namespace Lucene.Net.Search
private int[] LastDoc;
private float MaxDiff;
private AtomicReader[] LastReader;
+ private readonly Similarity Similarity;
- public CollectorAnonymousInnerClassHelper(Query q, IndexSearcher s, IList<AtomicReaderContext> readerContextArray, int skip_op, int[] order, int[] opidx, int[] lastDoc, float maxDiff, AtomicReader[] lastReader)
+ public CollectorAnonymousInnerClassHelper(Query q, IndexSearcher s, IList<AtomicReaderContext> readerContextArray,
+ int skip_op, int[] order, int[] opidx, int[] lastDoc, float maxDiff, AtomicReader[] lastReader,
+ Similarity similarity)
{
this.q = q;
this.s = s;
@@ -320,6 +324,7 @@ namespace Lucene.Net.Search
this.LastDoc = lastDoc;
this.MaxDiff = maxDiff;
this.LastReader = lastReader;
+ this.Similarity = similarity;
}
private Scorer sc;
@@ -381,7 +386,7 @@ namespace Lucene.Net.Search
if (LastReader[0] != null)
{
AtomicReader previousReader = LastReader[0];
- IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader);
+ IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader, Similarity);
indexSearcher.Similarity = s.Similarity;
Weight w = indexSearcher.CreateNormalizedWeight(q);
AtomicReaderContext ctx = (AtomicReaderContext)indexSearcher.TopReaderContext;
@@ -408,21 +413,21 @@ namespace Lucene.Net.Search
/// <summary>
/// check that first skip on just created scorers always goes to the right doc </summary>
- public static void CheckFirstSkipTo(Query q, IndexSearcher s)
+ public static void CheckFirstSkipTo(Query q, IndexSearcher s, Similarity similarity)
{
//System.out.println("checkFirstSkipTo: "+q);
const float maxDiff = 1e-3f;
int[] lastDoc = new int[] { -1 };
AtomicReader[] lastReader = new AtomicReader[] { null };
IList<AtomicReaderContext> context = s.TopReaderContext.Leaves;
- s.Search(q, new CollectorAnonymousInnerClassHelper2(q, s, maxDiff, lastDoc, lastReader, context));
+ s.Search(q, new CollectorAnonymousInnerClassHelper2(q, s, maxDiff, lastDoc, lastReader, context, similarity));
if (lastReader[0] != null)
{
// confirm that skipping beyond the last doc, on the
// previous reader, hits NO_MORE_DOCS
AtomicReader previousReader = lastReader[0];
- IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader);
+ IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader, similarity);
indexSearcher.Similarity = s.Similarity;
Weight w = indexSearcher.CreateNormalizedWeight(q);
Scorer scorer = w.Scorer((AtomicReaderContext)indexSearcher.TopReaderContext, previousReader.LiveDocs);
@@ -442,8 +447,9 @@ namespace Lucene.Net.Search
private int[] LastDoc;
private AtomicReader[] LastReader;
private IList<AtomicReaderContext> Context;
+ private readonly Similarity Similarity;
- public CollectorAnonymousInnerClassHelper2(Query q, IndexSearcher s, float maxDiff, int[] lastDoc, AtomicReader[] lastReader, IList<AtomicReaderContext> context)
+ public CollectorAnonymousInnerClassHelper2(Query q, IndexSearcher s, float maxDiff, int[] lastDoc, AtomicReader[] lastReader, IList<AtomicReaderContext> context, Similarity similarity)
{
this.q = q;
this.s = s;
@@ -451,6 +457,7 @@ namespace Lucene.Net.Search
this.LastDoc = lastDoc;
this.LastReader = lastReader;
this.Context = context;
+ this.Similarity = similarity;
}
private Scorer scorer;
@@ -505,7 +512,7 @@ namespace Lucene.Net.Search
if (LastReader[0] != null)
{
AtomicReader previousReader = LastReader[0];
- IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader);
+ IndexSearcher indexSearcher = LuceneTestCase.NewSearcher(previousReader, Similarity);
indexSearcher.Similarity = s.Similarity;
Weight w = indexSearcher.CreateNormalizedWeight(q);
Scorer scorer = w.Scorer((AtomicReaderContext)indexSearcher.TopReaderContext, previousReader.LiveDocs);
[25/34] lucenenet git commit: Injecting
OLD_FORMAT_IMPERSONATION_IS_ACTIVE into Codecs so that they do not reference
static value
Posted by sy...@apache.org.
Injecting OLD_FORMAT_IMPERSONATION_IS_ACTIVE into Codecs so that they do not reference static value
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f772f19d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f772f19d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f772f19d
Branch: refs/heads/lucenenet-indexablefield-api
Commit: f772f19daecf8b7b139b38a9662dc19d110c8432
Parents: b9bb484
Author: Connie Yau <co...@microsoft.com>
Authored: Sun Jul 31 23:29:27 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Sun Jul 31 23:29:48 2016 -0700
----------------------------------------------------------------------
.../Codecs/lucene3x/PreFlexRWCodec.cs | 18 ++++++++++-----
.../Codecs/lucene40/Lucene40RWCodec.cs | 20 ++++++++++++----
.../lucene40/Lucene40RWDocValuesFormat.cs | 9 +++++++-
.../Codecs/lucene40/Lucene40RWNormsFormat.cs | 9 +++++++-
.../Codecs/lucene40/Lucene40RWPostingsFormat.cs | 9 +++++++-
.../Codecs/lucene41/Lucene41RWCodec.cs | 24 +++++++++++++++-----
.../Codecs/lucene42/Lucene42RWCodec.cs | 18 +++++++++++----
.../lucene42/Lucene42RWDocValuesFormat.cs | 9 +++++++-
.../Codecs/lucene45/Lucene45RWCodec.cs | 14 +++++++++---
.../TestCompressingTermVectorsFormat.cs | 2 +-
.../Lucene3x/TestLucene3xPostingsFormat.cs | 6 ++---
.../Lucene3x/TestLucene3xStoredFieldsFormat.cs | 5 ++--
.../Lucene3x/TestLucene3xTermVectorsFormat.cs | 5 ++--
.../core/Codecs/Lucene3x/TestSurrogates.cs | 7 +++---
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 10 ++++----
.../Lucene40/TestLucene40DocValuesFormat.cs | 7 +++---
.../Lucene40/TestLucene40PostingsFormat.cs | 7 +++---
.../Lucene40/TestLucene40PostingsReader.cs | 2 +-
.../Lucene40/TestLucene40StoredFieldsFormat.cs | 5 ++--
.../Lucene40/TestLucene40TermVectorsFormat.cs | 5 ++--
.../core/Codecs/Lucene40/TestReuseDocsEnum.cs | 8 +++----
.../Lucene41/TestLucene41StoredFieldsFormat.cs | 2 +-
.../Lucene42/TestLucene42DocValuesFormat.cs | 3 ++-
23 files changed, 140 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
index b7fc7be..a925737 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
@@ -31,10 +31,16 @@ namespace Lucene.Net.Codecs.Lucene3x
private readonly TermVectorsFormat TermVectors = new PreFlexRWTermVectorsFormat();
private readonly SegmentInfoFormat SegmentInfos = new PreFlexRWSegmentInfoFormat();
private readonly StoredFieldsFormat StoredFields = new PreFlexRWStoredFieldsFormat();
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public PreFlexRWCodec(bool oldFormatImpersonationIsActive) : base()
+ {
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
+ }
public override PostingsFormat PostingsFormat()
{
- if (LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (_oldFormatImpersonationIsActive)
{
return Postings;
}
@@ -46,7 +52,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public override NormsFormat NormsFormat()
{
- if (LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (_oldFormatImpersonationIsActive)
{
return Norms;
}
@@ -58,7 +64,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public override SegmentInfoFormat SegmentInfoFormat()
{
- if (LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (_oldFormatImpersonationIsActive)
{
return SegmentInfos;
}
@@ -70,7 +76,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public override FieldInfosFormat FieldInfosFormat()
{
- if (LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (_oldFormatImpersonationIsActive)
{
return FieldInfos;
}
@@ -82,7 +88,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public override TermVectorsFormat TermVectorsFormat()
{
- if (LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (_oldFormatImpersonationIsActive)
{
return TermVectors;
}
@@ -94,7 +100,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public override StoredFieldsFormat StoredFieldsFormat()
{
- if (LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (_oldFormatImpersonationIsActive)
{
return StoredFields;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
index c7102d1..2e54359 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
@@ -23,19 +23,29 @@ namespace Lucene.Net.Codecs.Lucene40
/// Read-write version of Lucene40Codec for testing </summary>
public sealed class Lucene40RWCodec : Lucene40Codec
{
- private readonly FieldInfosFormat fieldInfos = new Lucene40FieldInfosFormatAnonymousInnerClassHelper();
+ private readonly FieldInfosFormat fieldInfos;
+
+ public Lucene40RWCodec(bool oldFormatImpersonationIsActive) : base()
+ {
+ fieldInfos = new Lucene40FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
+ DocValues = new Lucene40RWDocValuesFormat(oldFormatImpersonationIsActive);
+ Norms = new Lucene40RWNormsFormat(oldFormatImpersonationIsActive);
+ }
private class Lucene40FieldInfosFormatAnonymousInnerClassHelper : Lucene40FieldInfosFormat
{
- public Lucene40FieldInfosFormatAnonymousInnerClassHelper()
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene40FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
}
public override FieldInfosWriter FieldInfosWriter
{
get
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldInfosWriter;
}
@@ -47,8 +57,8 @@ namespace Lucene.Net.Codecs.Lucene40
}
}
- private readonly DocValuesFormat DocValues = new Lucene40RWDocValuesFormat();
- private readonly NormsFormat Norms = new Lucene40RWNormsFormat();
+ private readonly DocValuesFormat DocValues;
+ private readonly NormsFormat Norms;
public override FieldInfosFormat FieldInfosFormat()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
index e44147f..2d47058 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
@@ -25,9 +25,16 @@ namespace Lucene.Net.Codecs.Lucene40
/// Read-write version of <seealso cref="Lucene40DocValuesFormat"/> for testing </summary>
public class Lucene40RWDocValuesFormat : Lucene40DocValuesFormat
{
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene40RWDocValuesFormat(bool oldFormatImpersonationIsActive) : base()
+ {
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
+ }
+
public override DocValuesConsumer FieldsConsumer(SegmentWriteState state)
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldsConsumer(state);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
index 576aafe..5aaf248 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
@@ -25,9 +25,16 @@ namespace Lucene.Net.Codecs.Lucene40
/// Read-write version of <seealso cref="Lucene40NormsFormat"/> for testing </summary>
public class Lucene40RWNormsFormat : Lucene40NormsFormat
{
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene40RWNormsFormat(bool oldFormatImpersonationIsActive) : base()
+ {
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
+ }
+
public override DocValuesConsumer NormsConsumer(SegmentWriteState state)
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.NormsConsumer(state);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
index e6f7706..c6e6676 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
@@ -25,9 +25,16 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class Lucene40RWPostingsFormat : Lucene40PostingsFormat
{
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene40RWPostingsFormat(bool oldFormatImpersonationIsActive) : base()
+ {
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
+ }
+
public override FieldsConsumer FieldsConsumer(SegmentWriteState state)
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldsConsumer(state);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
index 64b6a1e..ab5b775 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
@@ -29,19 +29,34 @@ namespace Lucene.Net.Codecs.Lucene41
public class Lucene41RWCodec : Lucene41Codec
{
private readonly StoredFieldsFormat FieldsFormat = new Lucene41StoredFieldsFormat();
- private readonly FieldInfosFormat fieldInfos = new Lucene40FieldInfosFormatAnonymousInnerClassHelper();
+ private readonly FieldInfosFormat fieldInfos;
+ private readonly DocValuesFormat DocValues;
+ private readonly NormsFormat Norms;
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene41RWCodec(bool oldFormatImpersonationIsActive) : base()
+ {
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
+
+ Norms = new Lucene40RWNormsFormat(oldFormatImpersonationIsActive);
+ fieldInfos = new Lucene40FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
+ DocValues = new Lucene40RWDocValuesFormat(oldFormatImpersonationIsActive);
+ }
private class Lucene40FieldInfosFormatAnonymousInnerClassHelper : Lucene40FieldInfosFormat
{
- public Lucene40FieldInfosFormatAnonymousInnerClassHelper()
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene40FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
}
public override FieldInfosWriter FieldInfosWriter
{
get
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldInfosWriter;
}
@@ -53,9 +68,6 @@ namespace Lucene.Net.Codecs.Lucene41
}
}
- private readonly DocValuesFormat DocValues = new Lucene40RWDocValuesFormat();
- private readonly NormsFormat Norms = new Lucene40RWNormsFormat();
-
public override FieldInfosFormat FieldInfosFormat()
{
return fieldInfos;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
index 84de2dd..93b192d 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
@@ -24,22 +24,30 @@ namespace Lucene.Net.Codecs.Lucene42
/// </summary>
public class Lucene42RWCodec : Lucene42Codec
{
- private static readonly DocValuesFormat Dv = new Lucene42RWDocValuesFormat();
- private static readonly NormsFormat Norms = new Lucene42NormsFormat();
+ private readonly DocValuesFormat Dv;
+ private readonly NormsFormat Norms = new Lucene42NormsFormat();
+ private readonly FieldInfosFormat fieldInfosFormat;
- private readonly FieldInfosFormat fieldInfosFormat = new Lucene42FieldInfosFormatAnonymousInnerClassHelper();
+ public Lucene42RWCodec(bool oldFormatImpersonationIsActive) : base()
+ {
+ Dv = new Lucene42RWDocValuesFormat(oldFormatImpersonationIsActive);
+ fieldInfosFormat = new Lucene42FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
+ }
private class Lucene42FieldInfosFormatAnonymousInnerClassHelper : Lucene42FieldInfosFormat
{
- public Lucene42FieldInfosFormatAnonymousInnerClassHelper()
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene42FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
}
public override FieldInfosWriter FieldInfosWriter
{
get
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldInfosWriter;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
index 03c856c..5c00c98 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
@@ -26,9 +26,16 @@ namespace Lucene.Net.Codecs.Lucene42
/// </summary>
public class Lucene42RWDocValuesFormat : Lucene42DocValuesFormat
{
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene42RWDocValuesFormat(bool oldFormatImpersonationIsActive) : base()
+ {
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
+ }
+
public override DocValuesConsumer FieldsConsumer(SegmentWriteState state)
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldsConsumer(state);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
index ed8fd79..25c6571 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
@@ -26,19 +26,27 @@ namespace Lucene.Net.Codecs.Lucene45
/// </summary>
public class Lucene45RWCodec : Lucene45Codec
{
- private readonly FieldInfosFormat fieldInfosFormat = new Lucene42FieldInfosFormatAnonymousInnerClassHelper();
+ private readonly FieldInfosFormat fieldInfosFormat;
+
+ public Lucene45RWCodec(bool oldFormatImpersonationIsActive) : base()
+ {
+ fieldInfosFormat = new Lucene42FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
+ }
private class Lucene42FieldInfosFormatAnonymousInnerClassHelper : Lucene42FieldInfosFormat
{
- public Lucene42FieldInfosFormatAnonymousInnerClassHelper()
+ private readonly bool _oldFormatImpersonationIsActive;
+
+ public Lucene42FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
+ _oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
}
public override FieldInfosWriter FieldInfosWriter
{
get
{
- if (!LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE)
+ if (!_oldFormatImpersonationIsActive)
{
return base.FieldInfosWriter;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
index e2ffe7d..90b06cf 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs.Compressing
public virtual void TestNoOrds()
{
Directory dir = NewDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ RandomIndexWriter iw = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.StoreTermVectors = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xPostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xPostingsFormat.cs
index 0038f19..cf1bafc 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xPostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xPostingsFormat.cs
@@ -27,12 +27,12 @@ namespace Lucene.Net.Codecs.Lucene3x
/// </summary>
public class TestLucene3xPostingsFormat : BasePostingsFormatTestCase
{
- private readonly Codec Codec_Renamed = new PreFlexRWCodec();
+ private readonly Codec Codec_Renamed;
- [TestFixtureSetUp]
- public static void BeforeClass()
+ public TestLucene3xPostingsFormat() : base()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
+ Codec_Renamed = new PreFlexRWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
protected override Codec Codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
index 35c30b1..f323e3a 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Codecs.Lucene3x
public class TestLucene3xStoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
@@ -35,7 +35,8 @@ namespace Lucene.Net.Codecs.Lucene3x
{
get
{
- return new PreFlexRWCodec();
+ Assert.IsTrue(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "This should have been set up in the test fixture");
+ return new PreFlexRWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xTermVectorsFormat.cs
index 07d1aec..1cf090b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xTermVectorsFormat.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Codecs.Lucene3x
[SetUp]
public override void SetUp()
{
- LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
base.SetUp();
}
@@ -37,7 +37,8 @@ namespace Lucene.Net.Codecs.Lucene3x
{
get
{
- return new PreFlexRWCodec();
+ Assert.IsTrue(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "This should have been set up in the test fixture");
+ return new PreFlexRWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
index f49f846..ad96e0d 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -35,9 +35,9 @@ namespace Lucene.Net.Codecs.Lucene3x
/// <summary>
/// we will manually instantiate preflex-rw here </summary>
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
- LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
}
private static string MakeDifficultRandomUnicodeString(Random r)
@@ -340,7 +340,8 @@ namespace Lucene.Net.Codecs.Lucene3x
public virtual void TestSurrogatesOrder()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetCodec(new PreFlexRWCodec()));
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))
+ .SetCodec(new PreFlexRWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE)));
int numField = TestUtil.NextInt(Random(), 2, 5);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index 0316e66..3927927 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -66,10 +66,10 @@ namespace Lucene.Net.Codecs.Lucene3x
/// <summary>
/// we will manually instantiate preflex-rw here </summary>
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
// NOTE: turn off compound file, this test will open some index files directly.
- LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+ OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
IndexWriterConfig config = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random(), MockTokenizer.KEYWORD, false)).SetUseCompoundFile(false);
TermIndexInterval = config.TermIndexInterval;
@@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs.Lucene3x
Directory = NewDirectory();
- config.SetCodec(new PreFlexRWCodec());
+ config.SetCodec(new PreFlexRWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE));
LogMergePolicy mp = NewLogMergePolicy();
// NOTE: turn off compound file, this test will open some index files directly.
mp.NoCFSRatio = 0.0;
@@ -92,7 +92,7 @@ namespace Lucene.Net.Codecs.Lucene3x
string segment = r.SegmentName;
r.Dispose();
- FieldInfosReader infosReader = (new PreFlexRWCodec()).FieldInfosFormat().FieldInfosReader;
+ FieldInfosReader infosReader = (new PreFlexRWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE)).FieldInfosFormat().FieldInfosReader;
FieldInfos fieldInfos = infosReader.Read(Directory, segment, "", IOContext.READONCE);
string segmentFileName = IndexFileNames.SegmentFileName(segment, "", Lucene3xPostingsFormat.TERMS_INDEX_EXTENSION);
long tiiFileLength = Directory.FileLength(segmentFileName);
@@ -202,7 +202,7 @@ namespace Lucene.Net.Codecs.Lucene3x
return term;
}
- private static void Populate(Directory directory, IndexWriterConfig config)
+ private void Populate(Directory directory, IndexWriterConfig config)
{
RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, config);
for (int i = 0; i < NUMBER_OF_DOCUMENTS; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
index 9693bdb..86a0bde 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -26,10 +26,8 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class TestLucene40DocValuesFormat : BaseDocValuesFormatTestCase
{
- private readonly Codec Codec_Renamed = new Lucene40RWCodec();
-
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
@@ -38,7 +36,8 @@ namespace Lucene.Net.Codecs.Lucene40
{
get
{
- return Codec_Renamed;
+ Assert.True(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "Expecting that this is true");
+ return new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
index b862763..b418edf 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -26,10 +26,8 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class TestLucene40PostingsFormat : BasePostingsFormatTestCase
{
- private readonly Codec Codec_Renamed = new Lucene40RWCodec();
-
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
@@ -38,7 +36,8 @@ namespace Lucene.Net.Codecs.Lucene40
{
get
{
- return Codec_Renamed;
+ Assert.True(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "Expecting this to be set already before creating codec");
+ return new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
index 63dfa8e..793fc3a 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
index 7330789..ee4e582 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40StoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
@@ -33,7 +33,8 @@ namespace Lucene.Net.Codecs.Lucene40
{
get
{
- return new Lucene40RWCodec();
+ Assert.True(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "Expecting this to be set already");
+ return new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
index 6597165..a512f67 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40TermVectorsFormat : BaseTermVectorsFormatTestCase
{
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
@@ -33,7 +33,8 @@ namespace Lucene.Net.Codecs.Lucene40
{
get
{
- return new Lucene40RWCodec();
+ Assert.True(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "Expecting this to be set already");
+ return new Lucene40RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
index a2ecdf0..29efae2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestReuseDocsEnum : LuceneTestCase
{
[TestFixtureSetUp]
- public static void BeforeClass()
+ public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
}
@@ -56,7 +56,7 @@ namespace Lucene.Net.Codecs.Lucene40
public virtual void TestReuseDocsEnumNoReuse()
{
Directory dir = NewDirectory();
- Codec cp = TestUtil.AlwaysPostingsFormat(new Lucene40RWPostingsFormat());
+ Codec cp = TestUtil.AlwaysPostingsFormat(new Lucene40RWPostingsFormat(OLD_FORMAT_IMPERSONATION_IS_ACTIVE));
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetCodec(cp));
int numdocs = AtLeast(20);
CreateRandomIndex(numdocs, writer, Random());
@@ -86,7 +86,7 @@ namespace Lucene.Net.Codecs.Lucene40
public virtual void TestReuseDocsEnumSameBitsOrNull()
{
Directory dir = NewDirectory();
- Codec cp = TestUtil.AlwaysPostingsFormat(new Lucene40RWPostingsFormat());
+ Codec cp = TestUtil.AlwaysPostingsFormat(new Lucene40RWPostingsFormat(OLD_FORMAT_IMPERSONATION_IS_ACTIVE));
RandomIndexWriter writer = new RandomIndexWriter(Random(), dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetCodec(cp));
int numdocs = AtLeast(20);
CreateRandomIndex(numdocs, writer, Random());
@@ -135,7 +135,7 @@ namespace Lucene.Net.Codecs.Lucene40
public virtual void TestReuseDocsEnumDifferentReader()
{
Directory dir = NewDirectory();
- Codec cp = TestUtil.AlwaysPostingsFormat(new Lucene40RWPostingsFormat());
+ Codec cp = TestUtil.AlwaysPostingsFormat(new Lucene40RWPostingsFormat(OLD_FORMAT_IMPERSONATION_IS_ACTIVE));
MockAnalyzer analyzer = new MockAnalyzer(Random());
analyzer.MaxTokenLength = TestUtil.NextInt(Random(), 1, IndexWriter.MAX_TERM_LENGTH);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index 0111163..4f55ac2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Codecs.Lucene41
{
get
{
- return new Lucene41RWCodec();
+ return new Lucene41RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f772f19d/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index 19416f2..417b29b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -26,12 +26,13 @@ namespace Lucene.Net.Codecs.Lucene42
/// </summary>
public class TestLucene42DocValuesFormat : BaseCompressingDocValuesFormatTestCase
{
- private readonly Codec Codec_Renamed = new Lucene42RWCodec();
+ private Codec Codec_Renamed;
[TestFixtureSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
+ Codec_Renamed = new Lucene42RWCodec(OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
}
protected override Codec Codec
[12/34] lucenenet git commit: Adding another overload for
LuceneTestCase.NewSearcher
Posted by sy...@apache.org.
Adding another overload for LuceneTestCase.NewSearcher
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ef7f1dd1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ef7f1dd1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ef7f1dd1
Branch: refs/heads/lucenenet-indexablefield-api
Commit: ef7f1dd17feda9fbb1a2cc02d5f764268d7e7354
Parents: c499981
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 12:33:30 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:33:30 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ef7f1dd1/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 6dc0940..f63d5cc 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -1570,7 +1570,12 @@ namespace Lucene.Net.Util
/// </summary>
public IndexSearcher NewSearcher(IndexReader r)
{
- return NewSearcher(r, true, ClassEnvRule.Similarity);
+ return NewSearcher(r, ClassEnvRule.Similarity);
+ }
+
+ public static IndexSearcher NewSearcher(IndexReader r, Similarity similarity)
+ {
+ return NewSearcher(r, true, similarity);
}
/// <summary>
[20/34] lucenenet git commit: Changed IndexableField.BinaryValue() to
IndexableField.BinaryValue (method into a property) for API consistency.
Posted by sy...@apache.org.
Changed IndexableField.BinaryValue() to IndexableField.BinaryValue (method into a property) for API consistency.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cf2396b9
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cf2396b9
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cf2396b9
Branch: refs/heads/lucenenet-indexablefield-api
Commit: cf2396b91a8e3b87ce978d7dbb4ec6cfc6b11b48
Parents: 87aa424
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Jul 29 00:54:44 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Jul 29 00:54:44 2016 +0700
----------------------------------------------------------------------
.../Utils/DatasetSplitter.cs | 4 ++--
.../SimpleText/SimpleTextStoredFieldsWriter.cs | 2 +-
.../CompressingStoredFieldsWriter.cs | 2 +-
.../Lucene40/Lucene40StoredFieldsWriter.cs | 2 +-
src/Lucene.Net.Core/Document/Document.cs | 4 ++--
src/Lucene.Net.Core/Document/Field.cs | 17 +++++++------
src/Lucene.Net.Core/Index/DocValuesProcessor.cs | 6 ++---
src/Lucene.Net.Core/Index/IndexableField.cs | 2 +-
.../lucene3x/PreFlexRWStoredFieldsWriter.cs | 2 +-
.../Index/BaseStoredFieldsFormatTestCase.cs | 12 +++++-----
.../Util/LuceneTestCase.cs | 2 +-
src/Lucene.Net.TestFramework/Util/TestUtil.cs | 4 ++--
.../core/Document/TestDocument.cs | 2 +-
src/Lucene.Net.Tests/core/Document/TestField.cs | 6 ++---
.../core/Index/TestDirectoryReader.cs | 8 +++----
.../core/Index/TestIndexWriter.cs | 8 +++----
.../core/Index/TestIndexWriterExceptions.cs | 4 ++--
.../core/Index/TestIndexableField.cs | 25 +++++++++++---------
.../core/Index/TestStressIndexing2.cs | 4 ++--
19 files changed, 61 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs b/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
index 3b91dc4..7d8dfbc 100644
--- a/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
+++ b/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
@@ -99,9 +99,9 @@ namespace Lucene.Net.Classification.Utils
{
doc.Add(new Field(storableField.Name, storableField.ReaderValue, ft));
}
- else if (storableField.BinaryValue() != null)
+ else if (storableField.BinaryValue != null)
{
- doc.Add(new Field(storableField.Name, storableField.BinaryValue(), ft));
+ doc.Add(new Field(storableField.Name, storableField.BinaryValue, ft));
}
else if (storableField.StringValue != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
index c298ccc..396de05 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs
@@ -154,7 +154,7 @@ namespace Lucene.Net.Codecs.SimpleText
}
else
{
- BytesRef bytes = field.BinaryValue();
+ BytesRef bytes = field.BinaryValue;
if (bytes != null)
{
Write(TYPE_BINARY);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
index c234dbb..423a503 100644
--- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
@@ -316,7 +316,7 @@ namespace Lucene.Net.Codecs.Compressing
}
else
{
- bytes = field.BinaryValue();
+ bytes = field.BinaryValue;
if (bytes != null)
{
bits = BYTE_ARR;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
index 45eede8..0b9beb6 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
@@ -188,7 +188,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
else
{
- bytes = field.BinaryValue();
+ bytes = field.BinaryValue;
if (bytes != null)
{
bits |= FIELD_IS_BINARY;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Core/Document/Document.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Document.cs b/src/Lucene.Net.Core/Document/Document.cs
index a8e8348..30b8634 100644
--- a/src/Lucene.Net.Core/Document/Document.cs
+++ b/src/Lucene.Net.Core/Document/Document.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Documents
{
if (field.Name.Equals(name))
{
- BytesRef bytes = field.BinaryValue();
+ BytesRef bytes = field.BinaryValue;
if (bytes != null)
{
@@ -160,7 +160,7 @@ namespace Lucene.Net.Documents
{
if (field.Name.Equals(name))
{
- BytesRef bytes = field.BinaryValue();
+ BytesRef bytes = field.BinaryValue;
if (bytes != null)
{
return bytes;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Core/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Field.cs b/src/Lucene.Net.Core/Document/Field.cs
index 3e6f834..5e4ab2e 100644
--- a/src/Lucene.Net.Core/Document/Field.cs
+++ b/src/Lucene.Net.Core/Document/Field.cs
@@ -533,15 +533,18 @@ namespace Lucene.Net.Documents
}
}
- public BytesRef BinaryValue()
+ public BytesRef BinaryValue
{
- if (FieldsData is BytesRef)
- {
- return (BytesRef)FieldsData;
- }
- else
+ get
{
- return null;
+ if (FieldsData is BytesRef)
+ {
+ return (BytesRef)FieldsData;
+ }
+ else
+ {
+ return null;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocValuesProcessor.cs b/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
index ad4f011..6565856 100644
--- a/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
+++ b/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
@@ -59,15 +59,15 @@ namespace Lucene.Net.Index
fieldInfo.DocValuesType = dvType;
if (dvType == DocValuesType_e.BINARY)
{
- AddBinaryField(fieldInfo, docID, field.BinaryValue());
+ AddBinaryField(fieldInfo, docID, field.BinaryValue);
}
else if (dvType == DocValuesType_e.SORTED)
{
- AddSortedField(fieldInfo, docID, field.BinaryValue());
+ AddSortedField(fieldInfo, docID, field.BinaryValue);
}
else if (dvType == DocValuesType_e.SORTED_SET)
{
- AddSortedSetField(fieldInfo, docID, field.BinaryValue());
+ AddSortedSetField(fieldInfo, docID, field.BinaryValue);
}
else if (dvType == DocValuesType_e.NUMERIC)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Core/Index/IndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexableField.cs b/src/Lucene.Net.Core/Index/IndexableField.cs
index fbd6a85..aa2a16b 100644
--- a/src/Lucene.Net.Core/Index/IndexableField.cs
+++ b/src/Lucene.Net.Core/Index/IndexableField.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Index
/// <summary>
/// Non-null if this field has a binary value </summary>
- BytesRef BinaryValue();
+ BytesRef BinaryValue { get; }
/// <summary>
/// Non-null if this field has a string value </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
index 6e36184..c85a0de 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWStoredFieldsWriter.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Codecs.Lucene3x
}
else
{
- bytes = field.BinaryValue();
+ bytes = field.BinaryValue;
if (bytes != null)
{
bits |= Lucene3xStoredFieldsReader.FIELD_IS_BINARY;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index e3f8442..c97593c 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -240,11 +240,11 @@ namespace Lucene.Net.Index
Document doc = new Document();
Field f = new StoredField("binary", b, 10, 17);
- var bx = f.BinaryValue().Bytes;
+ var bx = f.BinaryValue.Bytes;
Assert.IsTrue(bx != null);
Assert.AreEqual(50, bx.Length);
- Assert.AreEqual(10, f.BinaryValue().Offset);
- Assert.AreEqual(17, f.BinaryValue().Length);
+ Assert.AreEqual(10, f.BinaryValue.Offset);
+ Assert.AreEqual(17, f.BinaryValue.Length);
doc.Add(f);
w.AddDocument(doc);
w.Dispose();
@@ -252,7 +252,7 @@ namespace Lucene.Net.Index
IndexReader ir = DirectoryReader.Open(dir);
Document doc2 = ir.Document(0);
IndexableField f2 = doc2.GetField("binary");
- b = f2.BinaryValue().Bytes;
+ b = f2.BinaryValue.Bytes;
Assert.IsTrue(b != null);
Assert.AreEqual(17, b.Length, 17);
Assert.AreEqual(87, b[0]);
@@ -405,7 +405,7 @@ namespace Lucene.Net.Index
IndexableField sField = sDoc.GetField(fldName);
if (typeof(Field) == fld.GetType())
{
- Assert.AreEqual(fld.BinaryValue(), sField.BinaryValue());
+ Assert.AreEqual(fld.BinaryValue, sField.BinaryValue);
Assert.AreEqual(fld.StringValue, sField.StringValue);
}
else
@@ -737,7 +737,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(docs[i].GetFields("fld").Length, fieldValues.Length);
if (fieldValues.Length > 0)
{
- Assert.AreEqual(docs[i].GetFields("fld")[0].BinaryValue(), fieldValues[0].BinaryValue());
+ Assert.AreEqual(docs[i].GetFields("fld")[0].BinaryValue, fieldValues[0].BinaryValue);
}
}
rd.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 63100f0..978ea45 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -2227,7 +2227,7 @@ namespace Lucene.Net.Util
public void AssertStoredFieldEquals(string info, IndexableField leftField, IndexableField rightField)
{
Assert.AreEqual(leftField.Name, rightField.Name, info);
- Assert.AreEqual(leftField.BinaryValue(), rightField.BinaryValue(), info);
+ Assert.AreEqual(leftField.BinaryValue, rightField.BinaryValue, info);
Assert.AreEqual(leftField.StringValue, rightField.StringValue, info);
Assert.AreEqual(leftField.NumericValue, rightField.NumericValue, info);
// TODO: should we check the FT at all?
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.TestFramework/Util/TestUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
index 89f690a..59386cf 100644
--- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
@@ -1004,11 +1004,11 @@ namespace Lucene.Net.Util
break;
case DocValuesType_e.BINARY:
- field2 = new BinaryDocValuesField(field1.Name, field1.BinaryValue());
+ field2 = new BinaryDocValuesField(field1.Name, field1.BinaryValue);
break;
case DocValuesType_e.SORTED:
- field2 = new SortedDocValuesField(field1.Name, field1.BinaryValue());
+ field2 = new SortedDocValuesField(field1.Name, field1.BinaryValue);
break;
default:
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index c2700da..391f4ac 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Document
Assert.AreEqual(2, doc.Fields.Count);
- Assert.IsTrue(binaryFld.BinaryValue() != null);
+ Assert.IsTrue(binaryFld.BinaryValue != null);
Assert.IsTrue(binaryFld.FieldType.Stored);
Assert.IsFalse(binaryFld.FieldType.Indexed);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Document/TestField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestField.cs b/src/Lucene.Net.Tests/core/Document/TestField.cs
index ab1016f..cbe8ecd 100644
--- a/src/Lucene.Net.Tests/core/Document/TestField.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestField.cs
@@ -211,7 +211,7 @@ namespace Lucene.Net.Document
TrySetStringValue(field);
TrySetTokenStreamValue(field);
- Assert.AreEqual(new BytesRef("baz"), field.BinaryValue());
+ Assert.AreEqual(new BytesRef("baz"), field.BinaryValue);
}
[Test]
@@ -232,7 +232,7 @@ namespace Lucene.Net.Document
TrySetStringValue(field);
TrySetTokenStreamValue(field);
- Assert.AreEqual(new BytesRef("baz"), field.BinaryValue());
+ Assert.AreEqual(new BytesRef("baz"), field.BinaryValue);
}
[Test]
@@ -332,7 +332,7 @@ namespace Lucene.Net.Document
TrySetStringValue(field);
TrySetTokenStreamValue(field);
- Assert.AreEqual(new BytesRef("baz"), field.BinaryValue());
+ Assert.AreEqual(new BytesRef("baz"), field.BinaryValue);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 925995e..ade37a4 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -389,8 +389,8 @@ namespace Lucene.Net.Index
Assert.IsNotNull(fields);
Assert.AreEqual(1, fields.Length);
IndexableField b1 = fields[0];
- Assert.IsTrue(b1.BinaryValue() != null);
- BytesRef bytesRef = b1.BinaryValue();
+ Assert.IsTrue(b1.BinaryValue != null);
+ BytesRef bytesRef = b1.BinaryValue;
Assert.AreEqual(bin.Length, bytesRef.Length);
for (int i = 0; i < bin.Length; i++)
{
@@ -408,8 +408,8 @@ namespace Lucene.Net.Index
Assert.IsNotNull(fields);
Assert.AreEqual(1, fields.Length);
b1 = fields[0];
- Assert.IsTrue(b1.BinaryValue() != null);
- bytesRef = b1.BinaryValue();
+ Assert.IsTrue(b1.BinaryValue != null);
+ bytesRef = b1.BinaryValue;
Assert.AreEqual(bin.Length, bytesRef.Length);
for (int i = 0; i < bin.Length; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 48332ac..3b7eafc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -1508,14 +1508,14 @@ namespace Lucene.Net.Index
IndexReader ir = DirectoryReader.Open(dir);
Document doc2 = ir.Document(0);
IndexableField f3 = doc2.GetField("binary");
- b = f3.BinaryValue().Bytes;
+ b = f3.BinaryValue.Bytes;
Assert.IsTrue(b != null);
Assert.AreEqual(17, b.Length, 17);
Assert.AreEqual(87, b[0]);
- Assert.IsTrue(ir.Document(0).GetField("binary").BinaryValue() != null);
- Assert.IsTrue(ir.Document(1).GetField("binary").BinaryValue() != null);
- Assert.IsTrue(ir.Document(2).GetField("binary").BinaryValue() != null);
+ Assert.IsTrue(ir.Document(0).GetField("binary").BinaryValue != null);
+ Assert.IsTrue(ir.Document(1).GetField("binary").BinaryValue != null);
+ Assert.IsTrue(ir.Document(2).GetField("binary").BinaryValue != null);
Assert.AreEqual("value", ir.Document(0).Get("string"));
Assert.AreEqual("value", ir.Document(1).Get("string"));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index cfc66b4..324a5e9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -2019,9 +2019,9 @@ namespace Lucene.Net.Index
get { return 5f; }
}
- public BytesRef BinaryValue()
+ public BytesRef BinaryValue
{
- return null;
+ get { return null; }
}
public string StringValue
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index 8790059..336437f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -162,20 +162,23 @@ namespace Lucene.Net.Index
get { return 1.0f + (float)Random().NextDouble(); }
}
- public BytesRef BinaryValue()
+ public BytesRef BinaryValue
{
- if ((Counter % 10) == 3)
+ get
{
- var bytes = new byte[10];
- for (int idx = 0; idx < bytes.Length; idx++)
+ if ((Counter % 10) == 3)
{
- bytes[idx] = (byte)(Counter + idx);
+ var bytes = new byte[10];
+ for (int idx = 0; idx < bytes.Length; idx++)
+ {
+ bytes[idx] = (byte)(Counter + idx);
+ }
+ return new BytesRef(bytes, 0, bytes.Length);
+ }
+ else
+ {
+ return null;
}
- return new BytesRef(bytes, 0, bytes.Length);
- }
- else
- {
- return null;
}
}
@@ -302,7 +305,7 @@ namespace Lucene.Net.Index
if (binary)
{
Assert.IsNotNull(f, "doc " + id + " doesn't have field f" + counter);
- BytesRef b = f.BinaryValue();
+ BytesRef b = f.BinaryValue;
Assert.IsNotNull(b);
Assert.AreEqual(10, b.Length);
for (int idx = 0; idx < 10; idx++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf2396b9/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index 2720c7f..7881cf1 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -681,9 +681,9 @@ namespace Lucene.Net.Index
{
IndexableField f1 = ff1[i];
IndexableField f2 = ff2[i];
- if (f1.BinaryValue() != null)
+ if (f1.BinaryValue != null)
{
- Debug.Assert(f2.BinaryValue() != null);
+ Debug.Assert(f2.BinaryValue != null);
}
else
{
[21/34] lucenenet git commit: Fixing non-static calls from private
classes using OuterInstance
Posted by sy...@apache.org.
Fixing non-static calls from private classes using OuterInstance
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/95bd05b7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/95bd05b7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/95bd05b7
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 95bd05b76fbde14a852e789dc4c445dc93cb7d6e
Parents: 659d952
Author: Connie Yau <co...@microsoft.com>
Authored: Sun Jul 31 22:50:16 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Sun Jul 31 22:50:16 2016 -0700
----------------------------------------------------------------------
.../ThreadedIndexingAndSearchingTestCase.cs | 2 +-
.../core/Index/TestBagOfPostings.cs | 2 +-
.../core/Index/TestIndexWriter.cs | 28 ++++++++++----------
.../core/Index/TestIndexWriterDelete.cs | 6 ++---
.../core/Index/TestIndexWriterExceptions.cs | 24 ++++++++---------
.../core/Index/TestIndexWriterWithThreads.cs | 26 +++++++++++-------
.../core/Index/TestIndexableField.cs | 2 +-
.../core/Index/TestNeverDelete.cs | 10 +++++--
.../core/Index/TestRollingUpdates.cs | 7 +++--
.../core/Index/TestSnapshotDeletionPolicy.cs | 8 +++---
.../core/Index/TestStressIndexing.cs | 15 ++++++-----
.../core/Index/TestStressIndexing2.cs | 10 +++----
.../core/Index/TestStressNRT.cs | 12 ++++-----
.../core/Index/TestThreadedForceMerge.cs | 4 +--
.../core/Index/TestTransactions.cs | 4 +--
.../core/Store/TestRAMDirectory.cs | 2 +-
16 files changed, 91 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index 72e6994..74d15c0 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -801,7 +801,7 @@ namespace Lucene.Net.Index
}
}
- IndexSearcher searcher = NewSearcher(reader);
+ IndexSearcher searcher = OuterInstance.NewSearcher(reader);
sum += searcher.Search(new TermQuery(new Term("body", "united")), 10).TotalHits;
if (VERBOSE)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs b/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
index 1650604..6f4741e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
@@ -151,7 +151,7 @@ namespace Lucene.Net.Index
try
{
Document document = new Document();
- Field field = NewTextField("field", "", Field.Store.NO);
+ Field field = OuterInstance.NewTextField("field", "", Field.Store.NO);
document.Add(field);
StartingGun.Wait();
while (!(Postings.Count == 0))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index d1fe9dd..b1c9888 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -145,14 +145,14 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- internal static void AddDoc(IndexWriter writer)
+ private void AddDoc(IndexWriter writer)
{
Document doc = new Document();
doc.Add(NewTextField("content", "aaa", Field.Store.NO));
writer.AddDocument(doc);
}
- internal static void AddDocWithIndex(IndexWriter writer, int index)
+ private void AddDocWithIndex(IndexWriter writer, int index)
{
Document doc = new Document();
doc.Add(NewField("content", "aaa " + index, StoredTextType));
@@ -1137,11 +1137,11 @@ namespace Lucene.Net.Index
// make a little directory for addIndexes
// LUCENE-2239: won't work with NIOFS/MMAP
Adder = new MockDirectoryWrapper(this.Random, new RAMDirectory());
- IndexWriterConfig conf = NewIndexWriterConfig(this.Random, TEST_VERSION_CURRENT, new MockAnalyzer(this.Random));
+ IndexWriterConfig conf = OuterInstance.NewIndexWriterConfig(this.Random, TEST_VERSION_CURRENT, new MockAnalyzer(this.Random));
IndexWriter w = new IndexWriter(Adder, conf);
Document doc = new Document();
- doc.Add(NewStringField(this.Random, "id", "500", Field.Store.NO));
- doc.Add(NewField(this.Random, "field", "some prepackaged text contents", StoredTextType));
+ doc.Add(OuterInstance.NewStringField(this.Random, "id", "500", Field.Store.NO));
+ doc.Add(OuterInstance.NewField(this.Random, "field", "some prepackaged text contents", StoredTextType));
if (DefaultCodecSupportsDocValues())
{
doc.Add(new BinaryDocValuesField("binarydv", new BytesRef("500")));
@@ -1155,8 +1155,8 @@ namespace Lucene.Net.Index
}
w.AddDocument(doc);
doc = new Document();
- doc.Add(NewStringField(this.Random, "id", "501", Field.Store.NO));
- doc.Add(NewField(this.Random, "field", "some more contents", StoredTextType));
+ doc.Add(OuterInstance.NewStringField(this.Random, "id", "501", Field.Store.NO));
+ doc.Add(OuterInstance.NewField(this.Random, "field", "some more contents", StoredTextType));
if (DefaultCodecSupportsDocValues())
{
doc.Add(new BinaryDocValuesField("binarydv", new BytesRef("501")));
@@ -1199,17 +1199,17 @@ namespace Lucene.Net.Index
w.Dispose();
w = null;
}
- IndexWriterConfig conf = NewIndexWriterConfig(Random, TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMaxBufferedDocs(2);
+ IndexWriterConfig conf = OuterInstance.NewIndexWriterConfig(Random, TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMaxBufferedDocs(2);
w = new IndexWriter(dir, conf);
Document doc = new Document();
- Field idField = NewStringField(Random, "id", "", Field.Store.NO);
+ Field idField = OuterInstance.NewStringField(Random, "id", "", Field.Store.NO);
Field binaryDVField = null;
Field numericDVField = null;
Field sortedDVField = null;
Field sortedSetDVField = new SortedSetDocValuesField("sortedsetdv", new BytesRef());
doc.Add(idField);
- doc.Add(NewField(Random, "field", "some text contents", StoredTextType));
+ doc.Add(OuterInstance.NewField(Random, "field", "some text contents", StoredTextType));
if (DefaultCodecSupportsDocValues())
{
binaryDVField = new BinaryDocValuesField("binarydv", new BytesRef());
@@ -1933,7 +1933,7 @@ namespace Lucene.Net.Index
public virtual void TestWickedLongTerm()
{
Directory dir = NewDirectory();
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, new StringSplitAnalyzer());
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, new StringSplitAnalyzer(), Similarity, TimeZone);
char[] chars = new char[DocumentsWriterPerThread.MAX_TERM_LENGTH_UTF8];
Arrays.Fill(chars, 'x');
@@ -1986,7 +1986,7 @@ namespace Lucene.Net.Index
Field contentField = new Field("content", "", customType);
doc.Add(contentField);
- w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
contentField.StringValue = "other";
w.AddDocument(doc);
@@ -2090,7 +2090,7 @@ namespace Lucene.Net.Index
// somehow "knows" a lock is held against write.lock
// even if you remove that file:
d.LockFactory = new SimpleFSLockFactory();
- RandomIndexWriter w1 = new RandomIndexWriter(Random(), d);
+ RandomIndexWriter w1 = new RandomIndexWriter(Random(), d, Similarity, TimeZone);
w1.DeleteAll();
try
{
@@ -2854,7 +2854,7 @@ namespace Lucene.Net.Index
dir.DeleteFile(fileName);
}
- w = new RandomIndexWriter(Random(), dir, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
+ w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
w.AddDocument(doc);
w.Dispose();
r.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
index cb85a55..60df181 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
@@ -398,9 +398,9 @@ namespace Lucene.Net.Index
for (int j = 0; j < 1000; j++)
{
Document doc = new Document();
- doc.Add(NewTextField("content", "aaa", Field.Store.NO));
- doc.Add(NewStringField("id", Convert.ToString(id++), Field.Store.YES));
- doc.Add(NewStringField("value", Convert.ToString(value), Field.Store.NO));
+ doc.Add(OuterInstance.NewTextField("content", "aaa", Field.Store.NO));
+ doc.Add(OuterInstance.NewStringField("id", Convert.ToString(id++), Field.Store.YES));
+ doc.Add(OuterInstance.NewStringField("value", Convert.ToString(value), Field.Store.NO));
if (DefaultCodecSupportsDocValues())
{
doc.Add(new NumericDocValuesField("dv", value));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index d732cc5..2a927d9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -181,13 +181,13 @@ namespace Lucene.Net.Index
{
Document doc = new Document();
- doc.Add(NewTextField(r, "content1", "aaa bbb ccc ddd", Field.Store.YES));
- doc.Add(NewField(r, "content6", "aaa bbb ccc ddd", DocCopyIterator.Custom1));
- doc.Add(NewField(r, "content2", "aaa bbb ccc ddd", DocCopyIterator.Custom2));
- doc.Add(NewField(r, "content3", "aaa bbb ccc ddd", DocCopyIterator.Custom3));
+ doc.Add(OuterInstance.NewTextField(r, "content1", "aaa bbb ccc ddd", Field.Store.YES));
+ doc.Add(OuterInstance.NewField(r, "content6", "aaa bbb ccc ddd", DocCopyIterator.Custom1));
+ doc.Add(OuterInstance.NewField(r, "content2", "aaa bbb ccc ddd", DocCopyIterator.Custom2));
+ doc.Add(OuterInstance.NewField(r, "content3", "aaa bbb ccc ddd", DocCopyIterator.Custom3));
- doc.Add(NewTextField(r, "content4", "aaa bbb ccc ddd", Field.Store.NO));
- doc.Add(NewStringField(r, "content5", "aaa bbb ccc ddd", Field.Store.NO));
+ doc.Add(OuterInstance.NewTextField(r, "content4", "aaa bbb ccc ddd", Field.Store.NO));
+ doc.Add(OuterInstance.NewStringField(r, "content5", "aaa bbb ccc ddd", Field.Store.NO));
if (DefaultCodecSupportsDocValues())
{
doc.Add(new NumericDocValuesField("numericdv", 5));
@@ -200,9 +200,9 @@ namespace Lucene.Net.Index
doc.Add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("again")));
}
- doc.Add(NewField(r, "content7", "aaa bbb ccc ddd", DocCopyIterator.Custom4));
+ doc.Add(OuterInstance.NewField(r, "content7", "aaa bbb ccc ddd", DocCopyIterator.Custom4));
- Field idField = NewField(r, "id", "", DocCopyIterator.Custom2);
+ Field idField = OuterInstance.NewField(r, "id", "", DocCopyIterator.Custom2);
doc.Add(idField);
long stopTime = ((long)(DateTime.UtcNow - unixEpoch).TotalMilliseconds) + 500;
@@ -1026,11 +1026,11 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < NUM_ITER; iter++)
{
Document doc = new Document();
- doc.Add(NewField("contents", "here are some contents", DocCopyIterator.Custom5));
+ doc.Add(OuterInstance.NewField("contents", "here are some contents", DocCopyIterator.Custom5));
Writer.AddDocument(doc);
Writer.AddDocument(doc);
- doc.Add(NewField("crash", "this should crash after 4 terms", DocCopyIterator.Custom5));
- doc.Add(NewField("other", "this will not get indexed", DocCopyIterator.Custom5));
+ doc.Add(OuterInstance.NewField("crash", "this should crash after 4 terms", DocCopyIterator.Custom5));
+ doc.Add(OuterInstance.NewField("other", "this will not get indexed", DocCopyIterator.Custom5));
try
{
Writer.AddDocument(doc);
@@ -1043,7 +1043,7 @@ namespace Lucene.Net.Index
if (0 == FinalI)
{
doc = new Document();
- doc.Add(NewField("contents", "here are some contents", DocCopyIterator.Custom5));
+ doc.Add(OuterInstance.NewField("contents", "here are some contents", DocCopyIterator.Custom5));
Writer.AddDocument(doc);
Writer.AddDocument(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
index 0e1d1e7..d983d88 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
@@ -45,6 +45,7 @@ namespace Lucene.Net.Index
using NumericDocValuesField = NumericDocValuesField;
using TestUtil = Lucene.Net.Util.TestUtil;
using TextField = TextField;
+ using Util;
/// <summary>
/// MultiThreaded IndexWriter tests
@@ -55,6 +56,8 @@ namespace Lucene.Net.Index
// Used by test cases below
private class IndexerThread : ThreadClass
{
+ private readonly Func<string, string, FieldType, Field> NewField;
+
internal bool DiskFull;
internal Exception Error;
internal AlreadyClosedException Ace;
@@ -62,10 +65,11 @@ namespace Lucene.Net.Index
internal bool NoErrors;
internal volatile int AddCount;
- public IndexerThread(IndexWriter writer, bool noErrors)
+ public IndexerThread(IndexWriter writer, bool noErrors, Func<string, string, FieldType, Field> newField)
{
this.Writer = writer;
this.NoErrors = noErrors;
+ NewField = newField;
}
public override void Run()
@@ -168,7 +172,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_THREADS; i++)
{
- threads[i] = new IndexerThread(writer, true);
+ threads[i] = new IndexerThread(writer, true, NewField);
}
for (int i = 0; i < NUM_THREADS; i++)
@@ -219,7 +223,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_THREADS; i++)
{
- threads[i] = new IndexerThread(writer, false);
+ threads[i] = new IndexerThread(writer, false, NewField);
}
for (int i = 0; i < NUM_THREADS; i++)
@@ -303,7 +307,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_THREADS; i++)
{
- threads[i] = new IndexerThread(writer, true);
+ threads[i] = new IndexerThread(writer, true, NewField);
}
for (int i = 0; i < NUM_THREADS; i++)
@@ -555,8 +559,8 @@ namespace Lucene.Net.Index
{
Directory dir = NewDirectory();
CountdownEvent oneIWConstructed = new CountdownEvent(1);
- DelayedIndexAndCloseRunnable thread1 = new DelayedIndexAndCloseRunnable(dir, oneIWConstructed);
- DelayedIndexAndCloseRunnable thread2 = new DelayedIndexAndCloseRunnable(dir, oneIWConstructed);
+ DelayedIndexAndCloseRunnable thread1 = new DelayedIndexAndCloseRunnable(dir, oneIWConstructed, this);
+ DelayedIndexAndCloseRunnable thread2 = new DelayedIndexAndCloseRunnable(dir, oneIWConstructed, this);
thread1.Start();
thread2.Start();
@@ -596,11 +600,13 @@ namespace Lucene.Net.Index
internal Exception Failure = null;
internal readonly CountdownEvent StartIndexing_Renamed = new CountdownEvent(1);
internal CountdownEvent IwConstructed;
+ private readonly LuceneTestCase OuterInstance;
- public DelayedIndexAndCloseRunnable(Directory dir, CountdownEvent iwConstructed)
+ public DelayedIndexAndCloseRunnable(Directory dir, CountdownEvent iwConstructed, LuceneTestCase outerInstance)
{
this.Dir = dir;
this.IwConstructed = iwConstructed;
+ OuterInstance = outerInstance;
}
public virtual void StartIndexing()
@@ -613,9 +619,9 @@ namespace Lucene.Net.Index
try
{
Document doc = new Document();
- Field field = NewTextField("field", "testData", Field.Store.YES);
+ Field field = OuterInstance.NewTextField("field", "testData", Field.Store.YES);
doc.Add(field);
- IndexWriter writer = new IndexWriter(Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())));
+ IndexWriter writer = new IndexWriter(Dir, OuterInstance.NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())));
IwConstructed.Signal();
StartIndexing_Renamed.Wait();
writer.AddDocument(doc);
@@ -718,7 +724,7 @@ namespace Lucene.Net.Index
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": rollback done; now open new writer");
}
WriterRef.Value =
- new IndexWriter(d, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())));
+ new IndexWriter(d, OuterInstance.NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())));
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index 8059126..cce7ca3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -423,7 +423,7 @@ namespace Lucene.Net.Index
if (fieldUpto == 0)
{
fieldUpto = 1;
- current = NewStringField("id", "" + OuterInstance.FinalDocCount, Field.Store.YES);
+ current = OuterTextIndexableField.NewStringField("id", "" + OuterInstance.FinalDocCount, Field.Store.YES);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs b/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
index 61a5105..74db3bb 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Index
long stopTime = Environment.TickCount + AtLeast(1000);
for (int x = 0; x < indexThreads.Length; x++)
{
- indexThreads[x] = new ThreadAnonymousInnerClassHelper(w, stopTime);
+ indexThreads[x] = new ThreadAnonymousInnerClassHelper(w, stopTime, NewStringField, NewTextField);
indexThreads[x].Name = "Thread " + x;
indexThreads[x].Start();
}
@@ -104,13 +104,19 @@ namespace Lucene.Net.Index
private class ThreadAnonymousInnerClassHelper : ThreadClass
{
+ private readonly Func<string, string, Field.Store, Field> NewStringField;
+ private readonly Func<string, string, Field.Store, Field> NewTextField;
+
private RandomIndexWriter w;
private long StopTime;
- public ThreadAnonymousInnerClassHelper(RandomIndexWriter w, long stopTime)
+ public ThreadAnonymousInnerClassHelper(RandomIndexWriter w, long stopTime,
+ Func<string, string, Field.Store, Field> newStringField, Func<string, string, Field.Store, Field> newTextField)
{
this.w = w;
this.StopTime = stopTime;
+ NewStringField = newStringField;
+ NewTextField = newTextField;
}
public override void Run()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
index 8032dfc..804822c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
@@ -204,7 +204,7 @@ namespace Lucene.Net.Index
IndexingThread[] threads = new IndexingThread[numThreads];
for (int i = 0; i < numThreads; i++)
{
- threads[i] = new IndexingThread(docs, w, numUpdates);
+ threads[i] = new IndexingThread(docs, w, numUpdates, NewStringField);
threads[i].Start();
}
@@ -229,12 +229,15 @@ namespace Lucene.Net.Index
internal readonly IndexWriter Writer;
internal readonly int Num;
- public IndexingThread(LineFileDocs docs, IndexWriter writer, int num)
+ private readonly Func<string, string, Field.Store, Field> NewStringField;
+
+ public IndexingThread(LineFileDocs docs, IndexWriter writer, int num, Func<string, string, Field.Store, Field> newStringField)
: base()
{
this.Docs = docs;
this.Writer = writer;
this.Num = num;
+ NewStringField = newStringField;
}
public override void Run()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
index b03b743..682e1cc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
@@ -148,7 +148,7 @@ namespace Lucene.Net.Index
dp = (SnapshotDeletionPolicy)writer.Config.DelPolicy;
writer.Commit();
- ThreadClass t = new ThreadAnonymousInnerClassHelper(stopTime, writer);
+ ThreadClass t = new ThreadAnonymousInnerClassHelper(stopTime, writer, NewField);
t.Start();
@@ -183,11 +183,13 @@ namespace Lucene.Net.Index
{
private long StopTime;
private IndexWriter Writer;
+ private readonly Func<string, string, FieldType, Field> _newFieldFunc;
- public ThreadAnonymousInnerClassHelper(long stopTime, IndexWriter writer)
+ public ThreadAnonymousInnerClassHelper(long stopTime, IndexWriter writer, Func<string, string, FieldType, Field> newFieldFunc)
{
this.StopTime = stopTime;
this.Writer = writer;
+ _newFieldFunc = newFieldFunc;
}
public override void Run()
@@ -197,7 +199,7 @@ namespace Lucene.Net.Index
customType.StoreTermVectors = true;
customType.StoreTermVectorPositions = true;
customType.StoreTermVectorOffsets = true;
- doc.Add(NewField("content", "aaa", customType));
+ doc.Add(_newFieldFunc("content", "aaa", customType));
do
{
for (int i = 0; i < 27; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
index 8f271f3..f594fdc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
@@ -89,6 +89,9 @@ namespace Lucene.Net.Index
private class IndexerThread : TimedThread
{
+ private readonly Func<string, string, Field.Store, Field> NewStringFieldFunc;
+ private readonly Func<string, string, Field.Store, Field> NewTextFieldFunc;
+
internal IndexWriter Writer;
internal int NextID;
@@ -98,8 +101,8 @@ namespace Lucene.Net.Index
: base(threads)
{
this.Writer = writer;
- NewStringField = newStringField;
- NewTextField = newTextField;
+ NewStringFieldFunc = newStringField;
+ NewTextFieldFunc = newTextField;
}
public override void DoWork()
@@ -109,8 +112,8 @@ namespace Lucene.Net.Index
{
Documents.Document d = new Documents.Document();
int n = Random().Next();
- d.Add(NewStringField("id", Convert.ToString(NextID++), Field.Store.YES));
- d.Add(NewTextField("contents", English.IntToEnglish(n), Field.Store.NO));
+ d.Add(NewStringFieldFunc("id", Convert.ToString(NextID++), Field.Store.YES));
+ d.Add(NewTextFieldFunc("contents", English.IntToEnglish(n), Field.Store.NO));
Writer.AddDocument(d);
}
@@ -161,11 +164,11 @@ namespace Lucene.Net.Index
// One modifier that writes 10 docs then removes 5, over
// and over:
- IndexerThread indexerThread = new IndexerThread(modifier, threads);
+ IndexerThread indexerThread = new IndexerThread(modifier, threads, NewStringField, NewTextField);
threads[numThread++] = indexerThread;
indexerThread.Start();
- IndexerThread indexerThread2 = new IndexerThread(modifier, threads);
+ IndexerThread indexerThread2 = new IndexerThread(modifier, threads, NewStringField, NewTextField);
threads[numThread++] = indexerThread2;
indexerThread2.Start();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index cc9fc39..f335a90 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -917,7 +917,7 @@ namespace Lucene.Net.Index
List<Field> fields = new List<Field>();
string idString = IdString;
- Field idField = NewField("id", idString, customType1);
+ Field idField = OuterInstance.NewField("id", idString, customType1);
fields.Add(idField);
int nFields = NextInt(MaxFields);
@@ -950,13 +950,13 @@ namespace Lucene.Net.Index
customType.Stored = true;
customType.OmitNorms = true;
customType.Indexed = true;
- fields.Add(NewField("f" + NextInt(100), GetString(1), customType));
+ fields.Add(OuterInstance.NewField("f" + NextInt(100), GetString(1), customType));
break;
case 1:
customType.Indexed = true;
customType.Tokenized = true;
- fields.Add(NewField("f" + NextInt(100), GetString(0), customType));
+ fields.Add(OuterInstance.NewField("f" + NextInt(100), GetString(0), customType));
break;
case 2:
@@ -964,14 +964,14 @@ namespace Lucene.Net.Index
customType.StoreTermVectors = false;
customType.StoreTermVectorOffsets = false;
customType.StoreTermVectorPositions = false;
- fields.Add(NewField("f" + NextInt(100), GetString(0), customType));
+ fields.Add(OuterInstance.NewField("f" + NextInt(100), GetString(0), customType));
break;
case 3:
customType.Stored = true;
customType.Indexed = true;
customType.Tokenized = true;
- fields.Add(NewField("f" + NextInt(100), GetString(BigFieldSize), customType));
+ fields.Add(OuterInstance.NewField("f" + NextInt(100), GetString(BigFieldSize), customType));
break;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs b/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
index b514ec0..af8649a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressNRT.cs
@@ -337,8 +337,8 @@ namespace Lucene.Net.Index
if (Tombstones)
{
Document d = new Document();
- d.Add(NewStringField("id", "-" + Convert.ToString(id), Documents.Field.Store.YES));
- d.Add(NewField(OuterInstance.Field, Convert.ToString(nextVal), StoredOnlyType));
+ d.Add(OuterInstance.NewStringField("id", "-" + Convert.ToString(id), Documents.Field.Store.YES));
+ d.Add(OuterInstance.NewField(OuterInstance.Field, Convert.ToString(nextVal), StoredOnlyType));
Writer.UpdateDocument(new Term("id", "-" + Convert.ToString(id)), d);
}
@@ -357,8 +357,8 @@ namespace Lucene.Net.Index
if (Tombstones)
{
Document d = new Document();
- d.Add(NewStringField("id", "-" + Convert.ToString(id), Documents.Field.Store.YES));
- d.Add(NewField(OuterInstance.Field, Convert.ToString(nextVal), StoredOnlyType));
+ d.Add(OuterInstance.NewStringField("id", "-" + Convert.ToString(id), Documents.Field.Store.YES));
+ d.Add(OuterInstance.NewField(OuterInstance.Field, Convert.ToString(nextVal), StoredOnlyType));
Writer.UpdateDocument(new Term("id", "-" + Convert.ToString(id)), d);
}
@@ -373,8 +373,8 @@ namespace Lucene.Net.Index
{
// assertU(adoc("id",Integer.toString(id), field, Long.toString(nextVal)));
Document d = new Document();
- d.Add(NewStringField("id", Convert.ToString(id), Documents.Field.Store.YES));
- d.Add(NewField(OuterInstance.Field, Convert.ToString(nextVal), StoredOnlyType));
+ d.Add(OuterInstance.NewStringField("id", Convert.ToString(id), Documents.Field.Store.YES));
+ d.Add(OuterInstance.NewField(OuterInstance.Field, Convert.ToString(nextVal), StoredOnlyType));
if (VERBOSE)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": u id:" + id + " val=" + nextVal);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestThreadedForceMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestThreadedForceMerge.cs b/src/Lucene.Net.Tests/core/Index/TestThreadedForceMerge.cs
index 7fddf19..2a7914d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestThreadedForceMerge.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestThreadedForceMerge.cs
@@ -148,8 +148,8 @@ namespace Lucene.Net.Index
for (int k = 0; k < 17 * (1 + IFinal); k++)
{
Document d = new Document();
- d.Add(NewField("id", IterFinal + "_" + IFinal + "_" + j + "_" + k, CustomType));
- d.Add(NewField("contents", English.IntToEnglish(IFinal + k), CustomType));
+ d.Add(OuterInstance.NewField("id", IterFinal + "_" + IFinal + "_" + j + "_" + k, CustomType));
+ d.Add(OuterInstance.NewField("contents", English.IntToEnglish(IFinal + k), CustomType));
WriterFinal.AddDocument(d);
}
for (int k = 0; k < 9 * (1 + IFinal); k++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTransactions.cs b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
index 0bba56f..a6d4635 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
@@ -201,8 +201,8 @@ namespace Lucene.Net.Index
{
Document d = new Document();
int n = Random().Next();
- d.Add(NewField("id", Convert.ToString(NextID++), customType));
- d.Add(NewTextField("contents", English.IntToEnglish(n), Field.Store.NO));
+ d.Add(OuterInstance.NewField("id", Convert.ToString(NextID++), customType));
+ d.Add(OuterInstance.NewTextField("contents", English.IntToEnglish(n), Field.Store.NO));
writer.AddDocument(d);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/95bd05b7/src/Lucene.Net.Tests/core/Store/TestRAMDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestRAMDirectory.cs b/src/Lucene.Net.Tests/core/Store/TestRAMDirectory.cs
index 7fa05f4..114a995 100644
--- a/src/Lucene.Net.Tests/core/Store/TestRAMDirectory.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestRAMDirectory.cs
@@ -158,7 +158,7 @@ namespace Lucene.Net.Store
for (int j = 1; j < OuterInstance.DocsPerThread; j++)
{
Document doc = new Document();
- doc.Add(NewStringField("sizeContent", English.IntToEnglish(Num * OuterInstance.DocsPerThread + j).Trim(), Field.Store.YES));
+ doc.Add(OuterInstance.NewStringField("sizeContent", English.IntToEnglish(Num * OuterInstance.DocsPerThread + j).Trim(), Field.Store.YES));
try
{
Writer.AddDocument(doc);
[22/34] lucenenet git commit: Exposing external getters for
ClassEnvRule.TimeZone and Similarity
Posted by sy...@apache.org.
Exposing external getters for ClassEnvRule.TimeZone and Similarity
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3930ae4a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3930ae4a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3930ae4a
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 3930ae4a014c336e73ed4bc24a867e18be4b008f
Parents: 95bd05b
Author: Connie Yau <co...@microsoft.com>
Authored: Sun Jul 31 22:51:02 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Sun Jul 31 22:51:02 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3930ae4a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index f63d5cc..ac143ba 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -440,6 +440,16 @@ namespace Lucene.Net.Util
/// </summary>
internal TestRuleSetupAndRestoreClassEnv ClassEnvRule { get; private set; }
+ /// <summary>
+ /// Gets the Similarity from the Class Environment setup rule
+ /// </summary>
+ public Similarity Similarity { get { return ClassEnvRule.Similarity; } }
+
+ /// <summary>
+ /// Gets the Timezone from the Class Environment setup rule
+ /// </summary>
+ public TimeZone TimeZone { get { return ClassEnvRule.TimeZone; } }
+
// LUCENENET TODO
/// <summary>
/// Suite failure marker (any error in the test or suite scope).
[11/34] lucenenet git commit: Making
LuceneTestCase.NewField/NewTextField non-static
Posted by sy...@apache.org.
Making LuceneTestCase.NewField/NewTextField non-static
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c4999819
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c4999819
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c4999819
Branch: refs/heads/lucenenet-indexablefield-api
Commit: c499981985b086d31699bde5438ff0bc410d7e37
Parents: 8be2a54
Author: Connie Yau <co...@microsoft.com>
Authored: Fri Jul 22 12:31:18 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Fri Jul 22 12:31:18 2016 -0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c4999819/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index f729954..6dc0940 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -1267,32 +1267,32 @@ namespace Lucene.Net.Util
}
}
- public static Field NewStringField(string name, string value, Field.Store stored)
+ public Field NewStringField(string name, string value, Field.Store stored)
{
return NewField(Random(), name, value, stored == Field.Store.YES ? StringField.TYPE_STORED : StringField.TYPE_NOT_STORED);
}
- public static Field NewTextField(string name, string value, Field.Store stored)
+ public Field NewTextField(string name, string value, Field.Store stored)
{
return NewField(Random(), name, value, stored == Field.Store.YES ? TextField.TYPE_STORED : TextField.TYPE_NOT_STORED);
}
- public static Field NewStringField(Random random, string name, string value, Field.Store stored)
+ public Field NewStringField(Random random, string name, string value, Field.Store stored)
{
return NewField(random, name, value, stored == Field.Store.YES ? StringField.TYPE_STORED : StringField.TYPE_NOT_STORED);
}
- public static Field NewTextField(Random random, string name, string value, Field.Store stored)
+ public Field NewTextField(Random random, string name, string value, Field.Store stored)
{
return NewField(random, name, value, stored == Field.Store.YES ? TextField.TYPE_STORED : TextField.TYPE_NOT_STORED);
}
- public static Field NewField(string name, string value, FieldType type)
+ public Field NewField(string name, string value, FieldType type)
{
return NewField(Random(), name, value, type);
}
- public static Field NewField(Random random, string name, string value, FieldType type)
+ public Field NewField(Random random, string name, string value, FieldType type)
{
name = new string(name.ToCharArray());
if (Usually(random) || !type.Indexed)
[18/34] lucenenet git commit: Changed IndexableField.FieldType() to
IndexableField.FieldType (method into a property) for API consistency.
Posted by sy...@apache.org.
Changed IndexableField.FieldType() to IndexableField.FieldType (method into a property) for API consistency.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b83de2cd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b83de2cd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b83de2cd
Branch: refs/heads/lucenenet-indexablefield-api
Commit: b83de2cdfe86edc1e284121b39afb8ba5ea72be9
Parents: 3c2c4f4
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Jul 29 00:39:13 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Jul 29 00:39:13 2016 +0700
----------------------------------------------------------------------
.../Codecs/StoredFieldsWriter.cs | 4 +--
src/Lucene.Net.Core/Document/Field.cs | 10 ++++----
src/Lucene.Net.Core/Index/DocFieldProcessor.cs | 4 +--
.../Index/DocInverterPerField.cs | 2 +-
src/Lucene.Net.Core/Index/DocValuesProcessor.cs | 2 +-
.../Index/FreqProxTermsWriterPerField.cs | 2 +-
src/Lucene.Net.Core/Index/IndexableField.cs | 2 +-
.../Index/StoredFieldsProcessor.cs | 2 +-
.../Index/TermVectorsConsumerPerField.cs | 26 ++++++++++----------
src/Lucene.Net.Facet/FacetsConfig.cs | 8 +++---
.../Analysis/BaseTokenStreamTestCase.cs | 2 +-
.../Index/BaseStoredFieldsFormatTestCase.cs | 4 +--
src/Lucene.Net.TestFramework/Index/DocHelper.cs | 14 +++++------
src/Lucene.Net.TestFramework/Util/TestUtil.cs | 14 +++++------
.../core/Document/TestDocument.cs | 4 +--
.../core/Index/TestBagOfPositions.cs | 2 +-
.../core/Index/TestConsistentFieldNumbers.cs | 4 +--
.../core/Index/TestDocumentWriter.cs | 4 +--
.../core/Index/TestFieldInfos.cs | 2 +-
.../core/Index/TestFieldsReader.cs | 20 +++++++--------
.../core/Index/TestIndexWriterExceptions.cs | 8 +++---
.../core/Index/TestIndexableField.cs | 4 +--
.../core/Index/TestSegmentReader.cs | 4 +--
23 files changed, 74 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
index 9a60977..0686d62 100644
--- a/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
@@ -133,7 +133,7 @@ namespace Lucene.Net.Codecs
int storedCount = 0;
foreach (IndexableField field in doc)
{
- if (field.FieldType().Stored)
+ if (field.FieldType.Stored)
{
storedCount++;
}
@@ -143,7 +143,7 @@ namespace Lucene.Net.Codecs
foreach (IndexableField field in doc)
{
- if (field.FieldType().Stored)
+ if (field.FieldType.Stored)
{
WriteField(fieldInfos.FieldInfo(field.Name), field);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Field.cs b/src/Lucene.Net.Core/Document/Field.cs
index d29f8e7..6fcdc2e 100644
--- a/src/Lucene.Net.Core/Document/Field.cs
+++ b/src/Lucene.Net.Core/Document/Field.cs
@@ -571,18 +571,18 @@ namespace Lucene.Net.Documents
/// <summary>
/// Returns the <seealso cref="FieldType"/> for this field. </summary>
- public IndexableFieldType FieldType()
+ public IndexableFieldType FieldType
{
- return Type;
+ get { return Type; }
}
public TokenStream GetTokenStream(Analyzer analyzer)
{
- if (!((FieldType)FieldType()).Indexed)
+ if (!((FieldType)FieldType).Indexed)
{
return null;
}
- FieldType.NumericType? numericType = ((FieldType)FieldType()).NumericTypeValue;
+ FieldType.NumericType? numericType = ((FieldType)FieldType).NumericTypeValue;
if (numericType != null)
{
if (!(InternalTokenStream is NumericTokenStream))
@@ -618,7 +618,7 @@ namespace Lucene.Net.Documents
return InternalTokenStream;
}
- if (!((FieldType)FieldType()).Tokenized)
+ if (!((FieldType)FieldType).Tokenized)
{
if (StringValue == null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocFieldProcessor.cs b/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
index 301277f..6657d7e 100644
--- a/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
+++ b/src/Lucene.Net.Core/Index/DocFieldProcessor.cs
@@ -225,7 +225,7 @@ namespace Lucene.Net.Index
// needs to be more "pluggable" such that if I want
// to have a new "thing" my Fields can do, I can
// easily add it
- FieldInfo fi = fieldInfos.AddOrUpdate(fieldName, field.FieldType());
+ FieldInfo fi = fieldInfos.AddOrUpdate(fieldName, field.FieldType);
fp = new DocFieldProcessorPerField(this, fi);
fp.Next = FieldHash[hashPos];
@@ -241,7 +241,7 @@ namespace Lucene.Net.Index
{
// need to addOrUpdate so that FieldInfos can update globalFieldNumbers
// with the correct DocValue type (LUCENE-5192)
- FieldInfo fi = fieldInfos.AddOrUpdate(fieldName, field.FieldType());
+ FieldInfo fi = fieldInfos.AddOrUpdate(fieldName, field.FieldType);
Debug.Assert(fi == fp.FieldInfo, "should only have updated an existing FieldInfo instance");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/DocInverterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocInverterPerField.cs b/src/Lucene.Net.Core/Index/DocInverterPerField.cs
index 808dbda..e6c9ac4 100644
--- a/src/Lucene.Net.Core/Index/DocInverterPerField.cs
+++ b/src/Lucene.Net.Core/Index/DocInverterPerField.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < count; i++)
{
IndexableField field = fields[i];
- IndexableFieldType fieldType = field.FieldType();
+ IndexableFieldType fieldType = field.FieldType;
// TODO FI: this should be "genericized" to querying
// consumer if it wants to see this particular field
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocValuesProcessor.cs b/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
index 04ccc66..ad4f011 100644
--- a/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
+++ b/src/Lucene.Net.Core/Index/DocValuesProcessor.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Index
public override void AddField(int docID, IndexableField field, FieldInfo fieldInfo)
{
- DocValuesType_e? dvType = field.FieldType().DocValueType;
+ DocValuesType_e? dvType = field.FieldType.DocValueType;
if (dvType != null)
{
fieldInfo.DocValuesType = dvType;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/FreqProxTermsWriterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/FreqProxTermsWriterPerField.cs b/src/Lucene.Net.Core/Index/FreqProxTermsWriterPerField.cs
index c86d76e..ba24d12 100644
--- a/src/Lucene.Net.Core/Index/FreqProxTermsWriterPerField.cs
+++ b/src/Lucene.Net.Core/Index/FreqProxTermsWriterPerField.cs
@@ -123,7 +123,7 @@ namespace Lucene.Net.Index
{
for (int i = 0; i < count; i++)
{
- if (fields[i].FieldType().Indexed)
+ if (fields[i].FieldType.Indexed)
{
return true;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/IndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexableField.cs b/src/Lucene.Net.Core/Index/IndexableField.cs
index d28f80a..cf4005e 100644
--- a/src/Lucene.Net.Core/Index/IndexableField.cs
+++ b/src/Lucene.Net.Core/Index/IndexableField.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Index
/// <seealso cref="IndexableFieldType"/> describing the properties
/// of this field.
/// </summary>
- IndexableFieldType FieldType();
+ IndexableFieldType FieldType { get; }
/// <summary>
/// Returns the field's index-time boost.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/StoredFieldsProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/StoredFieldsProcessor.cs b/src/Lucene.Net.Core/Index/StoredFieldsProcessor.cs
index 8c242c5..89a632b 100644
--- a/src/Lucene.Net.Core/Index/StoredFieldsProcessor.cs
+++ b/src/Lucene.Net.Core/Index/StoredFieldsProcessor.cs
@@ -158,7 +158,7 @@ namespace Lucene.Net.Index
public override void AddField(int docID, IndexableField field, FieldInfo fieldInfo)
{
- if (field.FieldType().Stored)
+ if (field.FieldType.Stored)
{
if (NumStoredFields == StoredFields.Length)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs b/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
index fd1b1d3..4bb2e05 100644
--- a/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
+++ b/src/Lucene.Net.Core/Index/TermVectorsConsumerPerField.cs
@@ -75,18 +75,18 @@ namespace Lucene.Net.Index
for (int i = 0; i < count; i++)
{
IndexableField field = fields[i];
- if (field.FieldType().Indexed)
+ if (field.FieldType.Indexed)
{
- if (field.FieldType().StoreTermVectors)
+ if (field.FieldType.StoreTermVectors)
{
DoVectors = true;
- DoVectorPositions |= field.FieldType().StoreTermVectorPositions;
- DoVectorOffsets |= field.FieldType().StoreTermVectorOffsets;
+ DoVectorPositions |= field.FieldType.StoreTermVectorPositions;
+ DoVectorOffsets |= field.FieldType.StoreTermVectorOffsets;
if (DoVectorPositions)
{
- DoVectorPayloads |= field.FieldType().StoreTermVectorPayloads;
+ DoVectorPayloads |= field.FieldType.StoreTermVectorPayloads;
}
- else if (field.FieldType().StoreTermVectorPayloads)
+ else if (field.FieldType.StoreTermVectorPayloads)
{
// TODO: move this check somewhere else, and impl the other missing ones
throw new System.ArgumentException("cannot index term vector payloads without term vector positions (field=\"" + field.Name + "\")");
@@ -94,15 +94,15 @@ namespace Lucene.Net.Index
}
else
{
- if (field.FieldType().StoreTermVectorOffsets)
+ if (field.FieldType.StoreTermVectorOffsets)
{
throw new System.ArgumentException("cannot index term vector offsets when term vectors are not indexed (field=\"" + field.Name + "\")");
}
- if (field.FieldType().StoreTermVectorPositions)
+ if (field.FieldType.StoreTermVectorPositions)
{
throw new System.ArgumentException("cannot index term vector positions when term vectors are not indexed (field=\"" + field.Name + "\")");
}
- if (field.FieldType().StoreTermVectorPayloads)
+ if (field.FieldType.StoreTermVectorPayloads)
{
throw new System.ArgumentException("cannot index term vector payloads when term vectors are not indexed (field=\"" + field.Name + "\")");
}
@@ -110,19 +110,19 @@ namespace Lucene.Net.Index
}
else
{
- if (field.FieldType().StoreTermVectors)
+ if (field.FieldType.StoreTermVectors)
{
throw new System.ArgumentException("cannot index term vectors when field is not indexed (field=\"" + field.Name + "\")");
}
- if (field.FieldType().StoreTermVectorOffsets)
+ if (field.FieldType.StoreTermVectorOffsets)
{
throw new System.ArgumentException("cannot index term vector offsets when field is not indexed (field=\"" + field.Name + "\")");
}
- if (field.FieldType().StoreTermVectorPositions)
+ if (field.FieldType.StoreTermVectorPositions)
{
throw new System.ArgumentException("cannot index term vector positions when field is not indexed (field=\"" + field.Name + "\")");
}
- if (field.FieldType().StoreTermVectorPayloads)
+ if (field.FieldType.StoreTermVectorPayloads)
{
throw new System.ArgumentException("cannot index term vector payloads when field is not indexed (field=\"" + field.Name + "\")");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Facet/FacetsConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/FacetsConfig.cs b/src/Lucene.Net.Facet/FacetsConfig.cs
index 2539c8b..97ed4cf 100644
--- a/src/Lucene.Net.Facet/FacetsConfig.cs
+++ b/src/Lucene.Net.Facet/FacetsConfig.cs
@@ -290,7 +290,7 @@ namespace Lucene.Net.Facet
foreach (IndexableField field in doc.Fields)
{
- if (field.FieldType() == FacetField.TYPE)
+ if (field.FieldType == FacetField.TYPE)
{
FacetField facetField = (FacetField)field;
FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.dim);
@@ -308,7 +308,7 @@ namespace Lucene.Net.Facet
fields.Add(facetField);
}
- if (field.FieldType() == SortedSetDocValuesFacetField.TYPE)
+ if (field.FieldType == SortedSetDocValuesFacetField.TYPE)
{
var facetField = (SortedSetDocValuesFacetField)field;
FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.Dim);
@@ -326,7 +326,7 @@ namespace Lucene.Net.Facet
fields.Add(facetField);
}
- if (field.FieldType() == AssociationFacetField.TYPE)
+ if (field.FieldType == AssociationFacetField.TYPE)
{
AssociationFacetField facetField = (AssociationFacetField)field;
FacetsConfig.DimConfig dimConfig = GetDimConfig(facetField.dim);
@@ -390,7 +390,7 @@ namespace Lucene.Net.Facet
foreach (IndexableField field in doc.Fields)
{
- IndexableFieldType ft = field.FieldType();
+ IndexableFieldType ft = field.FieldType;
if (ft != FacetField.TYPE && ft != SortedSetDocValuesFacetField.TYPE && ft != AssociationFacetField.TYPE)
{
result.Add(field);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index bb1098c..fc59cec 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -769,7 +769,7 @@ namespace Lucene.Net.Analysis
if (random.Next(7) == 0)
{
// pile up a multivalued field
- var ft = (FieldType)field.FieldType();
+ var ft = (FieldType)field.FieldType;
currentField = new Field("dummy", bogus, ft);
doc.Add(currentField);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index 38ad4e1..e3f8442 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -357,8 +357,8 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
IndexReader r = w.Reader;
w.Dispose();
- Assert.IsFalse(r.Document(0).GetField("field").FieldType().Indexed);
- Assert.IsTrue(r.Document(0).GetField("field2").FieldType().Indexed);
+ Assert.IsFalse(r.Document(0).GetField("field").FieldType.Indexed);
+ Assert.IsTrue(r.Document(0).GetField("field2").FieldType.Indexed);
r.Dispose();
dir.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.TestFramework/Index/DocHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/DocHelper.cs b/src/Lucene.Net.TestFramework/Index/DocHelper.cs
index e2afbe0..8322dbb 100644
--- a/src/Lucene.Net.TestFramework/Index/DocHelper.cs
+++ b/src/Lucene.Net.TestFramework/Index/DocHelper.cs
@@ -261,7 +261,7 @@ namespace Lucene.Net.Index
{
IndexableField f = Fields[i];
Add(All, f);
- if (f.FieldType().Indexed)
+ if (f.FieldType.Indexed)
{
Add(Indexed, f);
}
@@ -269,15 +269,15 @@ namespace Lucene.Net.Index
{
Add(Unindexed, f);
}
- if (f.FieldType().StoreTermVectors)
+ if (f.FieldType.StoreTermVectors)
{
Add(Termvector, f);
}
- if (f.FieldType().Indexed && !f.FieldType().StoreTermVectors)
+ if (f.FieldType.Indexed && !f.FieldType.StoreTermVectors)
{
Add(Notermvector, f);
}
- if (f.FieldType().Stored)
+ if (f.FieldType.Stored)
{
Add(Stored, f);
}
@@ -285,15 +285,15 @@ namespace Lucene.Net.Index
{
Add(Unstored, f);
}
- if (f.FieldType().IndexOptions == FieldInfo.IndexOptions.DOCS_ONLY)
+ if (f.FieldType.IndexOptions == FieldInfo.IndexOptions.DOCS_ONLY)
{
Add(NoTf, f);
}
- if (f.FieldType().OmitNorms)
+ if (f.FieldType.OmitNorms)
{
Add(NoNorms, f);
}
- if (f.FieldType().IndexOptions == FieldInfo.IndexOptions.DOCS_ONLY)
+ if (f.FieldType.IndexOptions == FieldInfo.IndexOptions.DOCS_ONLY)
{
Add(NoTf, f);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.TestFramework/Util/TestUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
index a0c46ac..89f690a 100644
--- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
@@ -993,8 +993,8 @@ namespace Lucene.Net.Util
{
Field field1 = (Field)f;
Field field2;
- DocValuesType_e? dvType = field1.FieldType().DocValueType;
- NumericType? numType = field1.FieldType().NumericTypeValue;
+ DocValuesType_e? dvType = field1.FieldType.DocValueType;
+ NumericType? numType = field1.FieldType.NumericTypeValue;
if (dvType != null)
{
switch (dvType)
@@ -1020,19 +1020,19 @@ namespace Lucene.Net.Util
switch (numType)
{
case NumericType.INT:
- field2 = new IntField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new IntField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType);
break;
case NumericType.FLOAT:
- field2 = new FloatField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new FloatField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType);
break;
case NumericType.LONG:
- field2 = new LongField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new LongField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType);
break;
case NumericType.DOUBLE:
- field2 = new DoubleField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType());
+ field2 = new DoubleField(field1.Name, (int)field1.NumericValue, (FieldType)field1.FieldType);
break;
default:
@@ -1041,7 +1041,7 @@ namespace Lucene.Net.Util
}
else
{
- field2 = new Field(field1.Name, field1.StringValue, (FieldType)field1.FieldType());
+ field2 = new Field(field1.Name, field1.StringValue, (FieldType)field1.FieldType);
}
doc2.Add(field2);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index 8d31bfc..c2700da 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -69,8 +69,8 @@ namespace Lucene.Net.Document
Assert.AreEqual(2, doc.Fields.Count);
Assert.IsTrue(binaryFld.BinaryValue() != null);
- Assert.IsTrue(binaryFld.FieldType().Stored);
- Assert.IsFalse(binaryFld.FieldType().Indexed);
+ Assert.IsTrue(binaryFld.FieldType.Stored);
+ Assert.IsFalse(binaryFld.FieldType.Indexed);
string binaryTest = doc.GetBinaryValue("binary").Utf8ToString();
Assert.IsTrue(binaryTest.Equals(BinaryVal));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs b/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
index 12cdc72..a82e3a6 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
@@ -91,7 +91,7 @@ namespace Lucene.Net.Index
}
Field prototype = NewTextField("field", "", Field.Store.NO);
- FieldType fieldType = new FieldType((FieldType)prototype.FieldType());
+ FieldType fieldType = new FieldType((FieldType)prototype.FieldType);
if (Random().NextBoolean())
{
fieldType.OmitNorms = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestConsistentFieldNumbers.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestConsistentFieldNumbers.cs b/src/Lucene.Net.Tests/core/Index/TestConsistentFieldNumbers.cs
index f91bda1..c887899 100644
--- a/src/Lucene.Net.Tests/core/Index/TestConsistentFieldNumbers.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestConsistentFieldNumbers.cs
@@ -283,8 +283,8 @@ namespace Lucene.Net.Index
foreach (FieldInfo fi in fis)
{
Field expected = GetField(Convert.ToInt32(fi.Name));
- Assert.AreEqual(expected.FieldType().Indexed, fi.Indexed);
- Assert.AreEqual(expected.FieldType().StoreTermVectors, fi.HasVectors());
+ Assert.AreEqual(expected.FieldType.Indexed, fi.Indexed);
+ Assert.AreEqual(expected.FieldType.StoreTermVectors, fi.HasVectors());
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs b/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
index dbe3ff5..dbe3e32 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
@@ -80,12 +80,12 @@ namespace Lucene.Net.Index
IndexableField[] fields = doc.GetFields("textField2");
Assert.IsTrue(fields != null && fields.Length == 1);
Assert.IsTrue(fields[0].StringValue.Equals(DocHelper.FIELD_2_TEXT));
- Assert.IsTrue(fields[0].FieldType().StoreTermVectors);
+ Assert.IsTrue(fields[0].FieldType.StoreTermVectors);
fields = doc.GetFields("textField1");
Assert.IsTrue(fields != null && fields.Length == 1);
Assert.IsTrue(fields[0].StringValue.Equals(DocHelper.FIELD_1_TEXT));
- Assert.IsFalse(fields[0].FieldType().StoreTermVectors);
+ Assert.IsFalse(fields[0].FieldType.StoreTermVectors);
fields = doc.GetFields("keyField");
Assert.IsTrue(fields != null && fields.Length == 1);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs b/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
index 59973e2..7453ea9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldInfos.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Index
FieldInfos.Builder builder = new FieldInfos.Builder();
foreach (IndexableField field in TestDoc)
{
- builder.AddOrUpdate(field.Name, field.FieldType());
+ builder.AddOrUpdate(field.Name, field.FieldType);
}
FieldInfos fieldInfos = builder.Finish();
//Since the complement is stored as well in the fields map
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
index fcaac0d..46aa94b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Index
DocHelper.SetupDoc(TestDoc);
foreach (IndexableField field in TestDoc)
{
- FieldInfos.AddOrUpdate(field.Name, field.FieldType());
+ FieldInfos.AddOrUpdate(field.Name, field.FieldType);
}
Dir = NewDirectory();
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy());
@@ -85,22 +85,22 @@ namespace Lucene.Net.Index
Field field = (Field)doc.GetField(DocHelper.TEXT_FIELD_2_KEY);
Assert.IsTrue(field != null);
- Assert.IsTrue(field.FieldType().StoreTermVectors);
+ Assert.IsTrue(field.FieldType.StoreTermVectors);
- Assert.IsFalse(field.FieldType().OmitNorms);
- Assert.IsTrue(field.FieldType().IndexOptions == FieldInfo.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
+ Assert.IsFalse(field.FieldType.OmitNorms);
+ Assert.IsTrue(field.FieldType.IndexOptions == FieldInfo.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
field = (Field)doc.GetField(DocHelper.TEXT_FIELD_3_KEY);
Assert.IsTrue(field != null);
- Assert.IsFalse(field.FieldType().StoreTermVectors);
- Assert.IsTrue(field.FieldType().OmitNorms);
- Assert.IsTrue(field.FieldType().IndexOptions == FieldInfo.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
+ Assert.IsFalse(field.FieldType.StoreTermVectors);
+ Assert.IsTrue(field.FieldType.OmitNorms);
+ Assert.IsTrue(field.FieldType.IndexOptions == FieldInfo.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
field = (Field)doc.GetField(DocHelper.NO_TF_KEY);
Assert.IsTrue(field != null);
- Assert.IsFalse(field.FieldType().StoreTermVectors);
- Assert.IsFalse(field.FieldType().OmitNorms);
- Assert.IsTrue(field.FieldType().IndexOptions == FieldInfo.IndexOptions.DOCS_ONLY);
+ Assert.IsFalse(field.FieldType.StoreTermVectors);
+ Assert.IsFalse(field.FieldType.OmitNorms);
+ Assert.IsTrue(field.FieldType.IndexOptions == FieldInfo.IndexOptions.DOCS_ONLY);
DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(DocHelper.TEXT_FIELD_3_KEY);
reader.Document(0, visitor);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index 8e322d0..a80f4ee 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -1628,7 +1628,7 @@ namespace Lucene.Net.Index
try
{
w.AddDocument(doc);
- Assert.IsFalse(field.FieldType().StoreTermVectors);
+ Assert.IsFalse(field.FieldType.StoreTermVectors);
}
catch (Exception e)
{
@@ -1653,7 +1653,7 @@ namespace Lucene.Net.Index
try
{
w.AddDocument(doc);
- Assert.IsFalse(field.FieldType().StoreTermVectors);
+ Assert.IsFalse(field.FieldType.StoreTermVectors);
}
catch (Exception e)
{
@@ -2009,9 +2009,9 @@ namespace Lucene.Net.Index
get { return "foo"; }
}
- public IndexableFieldType FieldType()
+ public IndexableFieldType FieldType
{
- return StringField.TYPE_NOT_STORED;
+ get { return StringField.TYPE_NOT_STORED; }
}
public float GetBoost()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index cdb111b..6da64d2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -215,9 +215,9 @@ namespace Lucene.Net.Index
get { return null; }
}
- public IndexableFieldType FieldType()
+ public IndexableFieldType FieldType
{
- return fieldType;
+ get { return fieldType; }
}
public TokenStream GetTokenStream(Analyzer analyzer)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b83de2cd/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
index 2f6d8fb..d7c3711 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
@@ -191,9 +191,9 @@ namespace Lucene.Net.Index
for (int i = 0; i < DocHelper.Fields.Length; i++)
{
IndexableField f = DocHelper.Fields[i];
- if (f.FieldType().Indexed)
+ if (f.FieldType.Indexed)
{
- Assert.AreEqual(reader.GetNormValues(f.Name) != null, !f.FieldType().OmitNorms);
+ Assert.AreEqual(reader.GetNormValues(f.Name) != null, !f.FieldType.OmitNorms);
Assert.AreEqual(reader.GetNormValues(f.Name) != null, !DocHelper.NoNorms.ContainsKey(f.Name));
if (reader.GetNormValues(f.Name) == null)
{