Repository: lucenenet Updated Branches: refs/heads/api-work 7a4940010 -> 6a3b1ec95
Changed all BeforeClass() methods to override LuceneTestCase and call the base class (since we now have global setup there). Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6a3b1ec9 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6a3b1ec9 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6a3b1ec9 Branch: refs/heads/api-work Commit: 6a3b1ec95081c0fede163337676e5453edb4aa72 Parents: 7a49400 Author: Shad Storhaug <[email protected]> Authored: Mon Feb 27 06:58:06 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Mon Feb 27 06:58:06 2017 +0700 ---------------------------------------------------------------------- src/Lucene.Net.Tests/Index/Test2BDocs.cs | 4 +++- src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 4 +++- src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs | 3 ++- src/Lucene.Net.Tests/Index/TestIndexInput.cs | 4 +++- src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs | 4 +++- src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs | 2 +- src/Lucene.Net.Tests/Search/Spans/TestBasics.cs | 4 +++- src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs | 4 +++- src/Lucene.Net.Tests/Search/TestBoolean2.cs | 4 +++- src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs | 4 +++- src/Lucene.Net.Tests/Search/TestFieldCache.cs | 4 +++- src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs | 4 +++- src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs | 4 +++- src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs | 4 +++- src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs | 4 +++- src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs | 4 +++- src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs | 4 +++- src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 4 +++- src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs | 4 +++- src/Lucene.Net.Tests/Search/TestTermVectors.cs | 4 +++- src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs | 4 +++- 21 files changed, 60 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Index/Test2BDocs.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/Test2BDocs.cs b/src/Lucene.Net.Tests/Index/Test2BDocs.cs index 35963e5..2c8c5a9 100644 --- a/src/Lucene.Net.Tests/Index/Test2BDocs.cs +++ b/src/Lucene.Net.Tests/Index/Test2BDocs.cs @@ -30,8 +30,10 @@ namespace Lucene.Net.Index internal static Directory Dir; [OneTimeSetUp] - public static void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Dir = NewFSDirectory(CreateTempDir("2Bdocs")); IndexWriter iw = new IndexWriter(Dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null)); Document doc = new Document(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Index/TestFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs index e539561..698eacd 100644 --- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs +++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs @@ -49,8 +49,10 @@ namespace Lucene.Net.Index /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + TestDoc = new Document(); FieldInfos = new FieldInfos.Builder(); DocHelper.SetupDoc(TestDoc); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs index 001f9e9..c9bf2e1 100644 --- a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs +++ b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs @@ -40,8 +40,9 @@ namespace Lucene.Net.Index private static LineFileDocs LineDocFile; [OneTimeSetUp] - public static void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); LineDocFile = new LineFileDocs(Random(), DefaultCodecSupportsDocValues()); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Index/TestIndexInput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/Index/TestIndexInput.cs index 32cd6a5..82e293a 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexInput.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexInput.cs @@ -43,8 +43,10 @@ namespace Lucene.Net.Index internal static byte[] RANDOM_TEST_BYTES; [OneTimeSetUp] - public static void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Random random = Random(); INTS = new int[COUNT]; LONGS = new long[COUNT]; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs index d621574..c21fbb8 100644 --- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs +++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs @@ -115,8 +115,10 @@ namespace Lucene.Net.Search.Payloads /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Directory = NewDirectory(); RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(similarity)); //writer.infoStream = System.out; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs index a68867e..44f70c3 100644 --- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs +++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs @@ -120,7 +120,7 @@ namespace Lucene.Net.Search.Payloads /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override 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/6a3b1ec9/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs index 737aa82..de0dfb8 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs @@ -100,8 +100,10 @@ namespace Lucene.Net.Search.Spans /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + SimplePayloadAnalyzer = new AnalyzerAnonymousInnerClassHelper(); Directory = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs index 7e78239..a4c144a 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs @@ -59,8 +59,10 @@ namespace Lucene.Net.Search.Spans /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.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/6a3b1ec9/src/Lucene.Net.Tests/Search/TestBoolean2.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/Search/TestBoolean2.cs index 514f560..093b0d1 100644 --- a/src/Lucene.Net.Tests/Search/TestBoolean2.cs +++ b/src/Lucene.Net.Tests/Search/TestBoolean2.cs @@ -62,8 +62,10 @@ namespace Lucene.Net.Search /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Directory = NewDirectory(); RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetMergePolicy(NewLogMergePolicy())); for (int i = 0; i < DocFields.Length; i++) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs index 29471a0..3fe841a 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs @@ -49,8 +49,10 @@ namespace Lucene.Net.Search /// Is non-static because NewStringField is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.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" }; Index = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestFieldCache.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/Search/TestFieldCache.cs index d98b8b5..41bfdee 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldCache.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldCache.cs @@ -102,8 +102,10 @@ namespace Lucene.Net.Search // LUCENENET: Changed to non-static because NewIndexWriterConfig is non-static [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + NUM_DOCS = AtLeast(500); NUM_ORDS = AtLeast(2); Directory = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs index 6e27f37..4103f91 100644 --- a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs +++ b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs @@ -66,8 +66,10 @@ namespace Lucene.Net.Search /// Is non-static because Similarity and TimeZone are not static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Dir = NewDirectory(); RandomIndexWriter iw = new RandomIndexWriter(Random(), Dir, Similarity, TimeZone); int numDocs = AtLeast(300); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs index 5aeaf7c..ef754e4 100644 --- a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs +++ b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs @@ -55,8 +55,10 @@ namespace Lucene.Net.Search /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.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" }; Small = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs index 0d7afc5..88abfb6 100644 --- a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs +++ b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs @@ -52,8 +52,10 @@ namespace Lucene.Net.Search /// Is non-static because Similarity and TimeZone are not static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Dir = NewDirectory(); Sdir1 = NewDirectory(); Sdir2 = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs index c445929..bbcb21f 100644 --- a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs @@ -37,8 +37,10 @@ namespace Lucene.Net.Search /// Is non-static because Similarity and TimeZone are not static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Directory = NewDirectory(); RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone); writer.Dispose(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs index 776286a..10ba1fc 100644 --- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs +++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs @@ -66,8 +66,10 @@ namespace Lucene.Net.Search /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + NoDocs = AtLeast(4096); Distance = (1 << 30) / NoDocs; Directory = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs index c5c39c9..bb89508 100644 --- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs +++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs @@ -66,8 +66,10 @@ namespace Lucene.Net.Search /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + NoDocs = AtLeast(4096); Distance = (1L << 60) / NoDocs; Directory = NewDirectory(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs index 14dde30..05042d0 100644 --- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs @@ -56,8 +56,10 @@ namespace Lucene.Net.Search private static Directory Directory; [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Directory = NewDirectory(); Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper(); RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, analyzer, Similarity, TimeZone); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs index 8eeb32d..de130ae 100644 --- a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs @@ -51,8 +51,10 @@ namespace Lucene.Net.Search /// Is non-static because Similarity and TimeZone are not static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Directory = NewDirectory(); RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, Similarity, TimeZone); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Search/TestTermVectors.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/Search/TestTermVectors.cs index ff49de1..58aad23 100644 --- a/src/Lucene.Net.Tests/Search/TestTermVectors.cs +++ b/src/Lucene.Net.Tests/Search/TestTermVectors.cs @@ -52,8 +52,10 @@ namespace Lucene.Net.Search /// Is non-static because NewIndexWriterConfig is no longer static. /// </summary> [OneTimeSetUp] - public void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + Directory = NewDirectory(); RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random(), MockTokenizer.SIMPLE, true)).SetMergePolicy(NewLogMergePolicy())); //writer.setNoCFSRatio(1.0); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6a3b1ec9/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs index 96bb33c..9f94154 100644 --- a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs +++ b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs @@ -31,8 +31,10 @@ namespace Lucene.Net.Util private static int MAX_RANDOM_BINARY_LENGTH; [OneTimeSetUp] - public static void BeforeClass() + public override void BeforeClass() { + base.BeforeClass(); + NUM_RANDOM_TESTS = AtLeast(200); MAX_RANDOM_BINARY_LENGTH = AtLeast(300); }
