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:37 UTC
[23/34] lucenenet git commit: Changing methods that do not have to be
static to non-static. (ie. TestFixture TearDown/Setup)
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()));