You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/02/01 12:49:26 UTC
[1/5] lucenenet git commit: SWEEP: Globally replaced
[TestFixtureSetUp] > [OneTimeSetUp], [TestFixtureTearDown] > [OneTimeTearDown]
Repository: lucenenet
Updated Branches:
refs/heads/api-work 460653e4e -> b43ac82a6
SWEEP: Globally replaced [TestFixtureSetUp] > [OneTimeSetUp], [TestFixtureTearDown] > [OneTimeTearDown]
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/fe8795b1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/fe8795b1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/fe8795b1
Branch: refs/heads/api-work
Commit: fe8795b181d04bd4aa3f8d5442b102e37cb35dee
Parents: 460653e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 18:01:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 18:01:17 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs | 4 ++--
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 4 ++--
src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs | 4 ++--
src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs | 4 ++--
src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs | 4 ++--
src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs | 2 +-
src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs | 4 ++--
.../Index/Sorter/SortingAtomicReaderTest.cs | 2 +-
src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs | 4 ++--
src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs | 4 ++--
.../core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs | 2 +-
src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs | 2 +-
.../core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 4 ++--
.../core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs | 2 +-
.../core/Codecs/Lucene40/TestLucene40PostingsFormat.cs | 2 +-
.../core/Codecs/Lucene40/TestLucene40PostingsReader.cs | 2 +-
.../core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs | 2 +-
.../core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs | 2 +-
src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs | 2 +-
.../core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs | 2 +-
.../core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs | 2 +-
src/Lucene.Net.Tests/core/Index/Test2BDocs.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/TestIndexInput.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs | 4 ++--
.../core/Search/Payloads/TestPayloadNearQuery.cs | 4 ++--
.../core/Search/Payloads/TestPayloadTermQuery.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs | 4 ++--
.../core/Search/Spans/TestFieldMaskingSpanQuery.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestBoolean2.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestDateFilter.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestExplanations.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestFieldCache.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs | 4 ++--
src/Lucene.Net.Tests/core/Search/TestTermVectors.cs | 4 ++--
src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs | 2 +-
49 files changed, 84 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index d501468..c562b7f 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -370,7 +370,7 @@ namespace Lucene.Net.Index
return new SeedPostings(seed, minDocFreq, maxDocFreq, withLiveDocs ? GlobalLiveDocs : null, options);
}
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void CreatePostings()
{
TotalPostings = 0;
@@ -488,7 +488,7 @@ namespace Lucene.Net.Index
}
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
AllTerms = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 8cdd14d..fc38863 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// LUCENENET specific
/// Is non-static because Similarity and TimeZone are not static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
dir = NewDirectory();
@@ -92,7 +92,7 @@ namespace Lucene.Net.Facet.Taxonomy
taxoReader = new DirectoryTaxonomyReader(taxoDir);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 f0103da..ab94a16 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Facet.Taxonomy
private static Net.Store.Directory indexDir, taxoDir;
private static IDictionary<string, int?> allExpectedCounts, termExpectedCounts;
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClassCountingFacetsAggregatorTest()
{
IOUtils.Close(indexDir, taxoDir);
@@ -245,7 +245,7 @@ namespace Lucene.Net.Facet.Taxonomy
return counts;
}
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClassCountingFacetsAggregatorTest()
{
indexDir = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 01f7fe5..2ab70d8 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Facet
private static FacetsConfig config;
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClassDrillDownQueryTest()
{
IOUtils.Close(reader, taxo, dir, taxoDir);
@@ -67,7 +67,7 @@ namespace Lucene.Net.Facet
config = null;
}
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClassDrillDownQueryTest()
{
dir = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
index 5d7fb42..228cb8b 100644
--- a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
+++ b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Documents
public Directory dir = NewDirectory();
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public void RemoveIndex()
{
if (null != dir)
@@ -34,7 +34,7 @@ namespace Lucene.Net.Documents
}
}
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void CreateIndex()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
index 45eee95..16dfb54 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Index.Sorter
new Sort(new SortField(null, SortFieldType.DOC, true))
};
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClassSorterUtilTest()
{
// only read the values of the undeleted documents, since after addIndexes,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 3b7ddca..bd8be54 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -212,7 +212,7 @@ namespace Lucene.Net.Index.Sorter
}
}
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClassSorterTestBase()
{
dir = NewDirectory();
@@ -222,7 +222,7 @@ namespace Lucene.Net.Index.Sorter
reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClassSorterTestBase()
{
reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
index e3a3473..0ea86f8 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Index.Sorter
public class SortingAtomicReaderTest : SorterTestBase
{
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClassSortingAtomicReaderTest()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
index 4661836..c579077 100644
--- a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
+++ b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
@@ -14,7 +14,7 @@ namespace Lucene.Net.Misc
private static Directory dir = null;
private static IndexReader reader = null;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void SetUpClass()
{
dir = NewDirectory();
@@ -26,7 +26,7 @@ namespace Lucene.Net.Misc
TestUtil.CheckIndex(dir);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void TearDownClass()
{
reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index 3dfb0de..a0604d1 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -25,13 +25,13 @@ namespace Lucene.Net.QueryParsers.Util
{
public static Analyzer qpAnalyzer;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClass()
{
qpAnalyzer = new QPTestAnalyzer();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
qpAnalyzer = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 e69c5f2..e78db47 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene3x
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 01fa90f..625e769 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Codecs.Lucene3x
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 bf2eae7..b661f08 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Codecs.Lucene3x
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
// NOTE: turn off compound file, this test will open some index files directly.
@@ -114,7 +114,7 @@ namespace Lucene.Net.Codecs.Lucene3x
SampleTerms = Sample(Random(), Reader, 1000);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
TermEnum.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 3686767..d63a6b3 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene40
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 0d3666d..2d2b5f1 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene40
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 b4702ed..aea5ce0 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Codecs.Lucene40
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 b2ab13d..c78b1b4 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Codecs.Lucene40
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 a113bec..d7541eb 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Codecs.Lucene40
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 556a013..c2bdadf 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs.Lucene40
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 2f42e41..0cbb28b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Codecs.Lucene41
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 598f373..f9c47ce 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Codecs.Lucene42
/// LUCENENET specific
/// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
index ba1f2a7..35963e5 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Index
{
internal static Directory Dir;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClass()
{
Dir = NewFSDirectory(CreateTempDir("2Bdocs"));
@@ -43,7 +43,7 @@ namespace Lucene.Net.Index
iw.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public void AfterClass()
{
Dir.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
index 33c858a..598782f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -200,7 +200,7 @@ namespace Lucene.Net.Index
return null; // never get here
}
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Assert.IsFalse(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "test infra is broken!");
@@ -219,7 +219,7 @@ namespace Lucene.Net.Index
}
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public void AfterClass()
{
foreach (Directory d in OldIndexDirs.Values)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
index 8f27199..711ea4d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Index
internal static IDictionary<string, Directory> OldIndexDirs;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Assert.IsFalse(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "test infra is broken!");
@@ -147,7 +147,7 @@ namespace Lucene.Net.Index
}
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public void AfterClass()
{
foreach (Directory d in OldIndexDirs.Values)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 f9b4b68..70dc0bc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Index
private const int DOC_FREQ_RAND = 500; // must be > 16 to test skipping
private const int TERM_DOC_FREQ_RAND = 20;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClass()
{
NUM_TEST_ITER = AtLeast(20);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 bcc259c..e539561 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Index
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
TestDoc = new Document();
@@ -67,7 +67,7 @@ namespace Lucene.Net.Index
FaultyIndexInput.DoFail = false;
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Dir.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
index 7e84a9a..9450356 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
@@ -39,13 +39,13 @@ namespace Lucene.Net.Index
private static LineFileDocs LineDocFile;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClass()
{
LineDocFile = new LineFileDocs(Random(), DefaultCodecSupportsDocValues());
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
LineDocFile.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
index 0b862cb..71357ac 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Index
internal static long[] LONGS;
internal static byte[] RANDOM_TEST_BYTES;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClass()
{
Random random = Random();
@@ -71,7 +71,7 @@ namespace Lucene.Net.Index
}
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
INTS = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 be0beda..3bd412e 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Search
/// Is non-static because <see cref="Build(Random, TestIndex)"/> is no
/// longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClassBaseTestRangeFilter()
{
MaxId = AtLeast(500);
@@ -110,7 +110,7 @@ namespace Lucene.Net.Search
UnsignedIndexReader = Build(Random(), UnsignedIndexDir);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClassBaseTestRangeFilter()
{
SignedIndexReader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 ff8f897..d621574 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Search.Payloads
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search.Payloads
Searcher.Similarity = similarity;
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 2c4a220..a68867e 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Search.Payloads
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -142,7 +142,7 @@ namespace Lucene.Net.Search.Payloads
Searcher.Similarity = similarity;
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 daaa766..737aa82 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search.Spans
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
SimplePayloadAnalyzer = new AnalyzerAnonymousInnerClassHelper();
@@ -131,7 +131,7 @@ namespace Lucene.Net.Search.Spans
}
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 f0f92e0..7e78239 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search.Spans
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Spans
Searcher = NewSearcher(Reader);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 e0fc5b0..514f560 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
riw.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 f2335ec..29471a0 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because NewStringField is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
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" };
@@ -74,7 +74,7 @@ namespace Lucene.Net.Search
//System.out.println("Set up " + getName());
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
s = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 a0154b2..11e62e1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
public class TestDateFilter : LuceneTestCase
{
///
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public virtual void TestBefore()
{
// create an index
@@ -105,7 +105,7 @@ namespace Lucene.Net.Search
}
///
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public virtual void TestAfter()
{
// create an index
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 175a0a3..ee2abb2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
// same contents, but no field boost
public const string ALTFIELD = "alt";
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClassTestExplanations()
{
Searcher = null;
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search
/// Is non-static because NewIndexWriterConfig, NewTextField and
/// NewStringField are no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClassTestExplanations()
{
Directory = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
index afde736..ba63742 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search
// LUCENENET: Changed to non-static because NewIndexWriterConfig is non-static
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
NUM_DOCS = AtLeast(500);
@@ -165,7 +165,7 @@ namespace Lucene.Net.Search
writer.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 822dce5..6e27f37 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because Similarity and TimeZone are not static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Dir = NewDirectory();
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search
}
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
atomicReader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 f17acf5..5aeaf7c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
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" };
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
writer.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 fd04407..0d7afc5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because Similarity and TimeZone are not static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Dir = NewDirectory();
@@ -85,7 +85,7 @@ namespace Lucene.Net.Search
MultiSearcherDupls = NewSearcher(MultiReaderDupls);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 5b227ef..c445929 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
/// LUCENENET specific
/// Is non-static because Similarity and TimeZone are not static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
Reader = DirectoryReader.Open(Directory);
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 6d25893..ce5741d 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
NoDocs = AtLeast(4096);
@@ -134,7 +134,7 @@ namespace Lucene.Net.Search
writer.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 f2836ec..861f3cd 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
NoDocs = AtLeast(4096);
@@ -143,7 +143,7 @@ namespace Lucene.Net.Search
writer.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 394bfca..14dde30 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
private PhraseQuery Query;
private static Directory Directory;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -108,7 +108,7 @@ namespace Lucene.Net.Search
Query = new PhraseQuery();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 a990f0a..8eeb32d 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
/// LUCENENET specific
/// Is non-static because Similarity and TimeZone are not static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -82,7 +82,7 @@ namespace Lucene.Net.Search
writer.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Searcher = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 ce7c03c..1be58e1 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search
private static Directory Dir;
private static IndexSearcher s;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void MakeIndex()
{
Dir = new RAMDirectory();
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search
w.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void Finish()
{
s.IndexReader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/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 db970a0..0170ab4 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void BeforeClass()
{
Directory = NewDirectory();
@@ -93,7 +93,7 @@ namespace Lucene.Net.Search
writer.Dispose();
}
- [TestFixtureTearDown]
+ [OneTimeTearDown]
public static void AfterClass()
{
Reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fe8795b1/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs b/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
index 9d190d1..96bb33c 100644
--- a/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Util
private static int NUM_RANDOM_TESTS;
private static int MAX_RANDOM_BINARY_LENGTH;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public static void BeforeClass()
{
NUM_RANDOM_TESTS = AtLeast(200);
[3/5] lucenenet git commit: Lucene.Net.Analysis.Common.Analysis.Util
(CharArrayMap + CharArraySet): Marked overloads of ContainsKey(), Get(), Put(),
PutAll() and TryGetValue() that accept ushort, uint, ulong,
and sbyte parameters as CLSCompliant(false)
Posted by ni...@apache.org.
Lucene.Net.Analysis.Common.Analysis.Util (CharArrayMap + CharArraySet): Marked overloads of ContainsKey(), Get(), Put(), PutAll() and TryGetValue() that accept ushort, uint, ulong, and sbyte parameters as CLSCompliant(false)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/19f22995
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/19f22995
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/19f22995
Branch: refs/heads/api-work
Commit: 19f22995cf955914017485350f67fb228af2cc51
Parents: deff177
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 18:29:25 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 18:47:36 2017 +0700
----------------------------------------------------------------------
.../Analysis/Util/CharArrayMap.cs | 24 ++++++++++++++++++++
.../Analysis/Util/CharArraySet.cs | 12 ++++++++++
2 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/19f22995/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
index 6124449..ac5edfa 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
@@ -2187,6 +2187,7 @@ namespace Lucene.Net.Analysis.Util
/// <c>true</c> if the <paramref name="key"/> <see cref="sbyte"/> is in the <see cref="CharArrayMap{TValue}.KeySet"/>;
/// otherwise <c>false</c>
/// </summary>
+ [CLSCompliant(false)]
public static bool ContainsKey<TValue>(this CharArrayMap<TValue> map, sbyte key)
{
return map.ContainsKey(key.ToString(CultureInfo.InvariantCulture));
@@ -2205,6 +2206,7 @@ namespace Lucene.Net.Analysis.Util
/// <c>true</c> if the <paramref name="key"/> <see cref="uint"/> is in the <see cref="CharArrayMap{TValue}.KeySet"/>;
/// otherwise <c>false</c>
/// </summary>
+ [CLSCompliant(false)]
public static bool ContainsKey<TValue>(this CharArrayMap<TValue> map, uint key)
{
return map.ContainsKey(key.ToString(CultureInfo.InvariantCulture));
@@ -2214,6 +2216,7 @@ namespace Lucene.Net.Analysis.Util
/// <c>true</c> if the <paramref name="key"/> <see cref="ulong"/> is in the <see cref="CharArrayMap{TValue}.KeySet"/>;
/// otherwise <c>false</c>
/// </summary>
+ [CLSCompliant(false)]
public static bool ContainsKey<TValue>(this CharArrayMap<TValue> map, ulong key)
{
return map.ContainsKey(key.ToString(CultureInfo.InvariantCulture));
@@ -2223,6 +2226,7 @@ namespace Lucene.Net.Analysis.Util
/// <c>true</c> if the <paramref name="key"/> <see cref="ushort"/> is in the <see cref="CharArrayMap{TValue}.KeySet"/>;
/// otherwise <c>false</c>
/// </summary>
+ [CLSCompliant(false)]
public static bool ContainsKey<TValue>(this CharArrayMap<TValue> map, ushort key)
{
return map.ContainsKey(key.ToString(CultureInfo.InvariantCulture));
@@ -2299,6 +2303,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// returns the value of the mapping of the chars inside this <paramref name="text"/>
/// </summary>
+ [CLSCompliant(false)]
public static TValue Get<TValue>(this CharArrayMap<TValue> map, sbyte text)
{
return map.Get(text.ToString(CultureInfo.InvariantCulture));
@@ -2315,6 +2320,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// returns the value of the mapping of the chars inside this <paramref name="text"/>
/// </summary>
+ [CLSCompliant(false)]
public static TValue Get<TValue>(this CharArrayMap<TValue> map, uint text)
{
return map.Get(text.ToString(CultureInfo.InvariantCulture));
@@ -2323,6 +2329,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// returns the value of the mapping of the chars inside this <paramref name="text"/>
/// </summary>
+ [CLSCompliant(false)]
public static TValue Get<TValue>(this CharArrayMap<TValue> map, ulong text)
{
return map.Get(text.ToString(CultureInfo.InvariantCulture));
@@ -2331,6 +2338,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// returns the value of the mapping of the chars inside this <paramref name="text"/>
/// </summary>
+ [CLSCompliant(false)]
public static TValue Get<TValue>(this CharArrayMap<TValue> map, ushort text)
{
return map.Get(text.ToString(CultureInfo.InvariantCulture));
@@ -2407,6 +2415,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// Add the given mapping.
/// </summary>
+ [CLSCompliant(false)]
public static TValue Put<TValue>(this CharArrayMap<TValue> map, sbyte text, TValue value)
{
return map.Put(text.ToString(CultureInfo.InvariantCulture), value);
@@ -2423,6 +2432,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// Add the given mapping.
/// </summary>
+ [CLSCompliant(false)]
public static TValue Put<TValue>(this CharArrayMap<TValue> map, uint text, TValue value)
{
return map.Put(text.ToString(CultureInfo.InvariantCulture), value);
@@ -2431,6 +2441,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// Add the given mapping.
/// </summary>
+ [CLSCompliant(false)]
public static TValue Put<TValue>(this CharArrayMap<TValue> map, ulong text, TValue value)
{
return map.Put(text.ToString(CultureInfo.InvariantCulture), value);
@@ -2439,6 +2450,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// Add the given mapping.
/// </summary>
+ [CLSCompliant(false)]
public static TValue Put<TValue>(this CharArrayMap<TValue> map, ushort text, TValue value)
{
return map.Put(text.ToString(CultureInfo.InvariantCulture), value);
@@ -2557,6 +2569,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">A dictionary of values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IDictionary<sbyte, TValue> collection)
{
foreach (var kvp in collection)
@@ -2583,6 +2596,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">A dictionary of values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IDictionary<uint, TValue> collection)
{
foreach (var kvp in collection)
@@ -2596,6 +2610,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">A dictionary of values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IDictionary<ulong, TValue> collection)
{
foreach (var kvp in collection)
@@ -2609,6 +2624,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">A dictionary of values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IDictionary<ushort, TValue> collection)
{
foreach (var kvp in collection)
@@ -2727,6 +2743,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">The values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IEnumerable<KeyValuePair<sbyte, TValue>> collection)
{
foreach (var kvp in collection)
@@ -2753,6 +2770,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">The values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IEnumerable<KeyValuePair<uint, TValue>> collection)
{
foreach (var kvp in collection)
@@ -2766,6 +2784,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">The values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IEnumerable<KeyValuePair<ulong, TValue>> collection)
{
foreach (var kvp in collection)
@@ -2779,6 +2798,7 @@ namespace Lucene.Net.Analysis.Util
/// entries, and calls this map's <see cref="Put(string, TValue)"/> operation once for each entry.
/// </summary>
/// <param name="collection">The values to add/update in the current map.</param>
+ [CLSCompliant(false)]
public static void PutAll<TValue>(this CharArrayMap<TValue> map, IEnumerable<KeyValuePair<ushort, TValue>> collection)
{
foreach (var kvp in collection)
@@ -2903,6 +2923,7 @@ namespace Lucene.Net.Analysis.Util
/// if the key is found; otherwise, the default value for the type of the value parameter.
/// This parameter is passed uninitialized.</param>
/// <returns><c>true</c> if the <see cref="CharArrayMap{TValue}"/> contains an element with the specified key; otherwise, <c>false</c>.</returns>
+ [CLSCompliant(false)]
public static bool TryGetValue<TValue>(this CharArrayMap<TValue> map, sbyte key, out TValue value)
{
return map.TryGetValue(key.ToString(CultureInfo.InvariantCulture), out value);
@@ -2929,6 +2950,7 @@ namespace Lucene.Net.Analysis.Util
/// if the key is found; otherwise, the default value for the type of the value parameter.
/// This parameter is passed uninitialized.</param>
/// <returns><c>true</c> if the <see cref="CharArrayMap{TValue}"/> contains an element with the specified key; otherwise, <c>false</c>.</returns>
+ [CLSCompliant(false)]
public static bool TryGetValue<TValue>(this CharArrayMap<TValue> map, uint key, out TValue value)
{
return map.TryGetValue(key.ToString(CultureInfo.InvariantCulture), out value);
@@ -2942,6 +2964,7 @@ namespace Lucene.Net.Analysis.Util
/// if the key is found; otherwise, the default value for the type of the value parameter.
/// This parameter is passed uninitialized.</param>
/// <returns><c>true</c> if the <see cref="CharArrayMap{TValue}"/> contains an element with the specified key; otherwise, <c>false</c>.</returns>
+ [CLSCompliant(false)]
public static bool TryGetValue<TValue>(this CharArrayMap<TValue> map, ulong key, out TValue value)
{
return map.TryGetValue(key.ToString(CultureInfo.InvariantCulture), out value);
@@ -2955,6 +2978,7 @@ namespace Lucene.Net.Analysis.Util
/// if the key is found; otherwise, the default value for the type of the value parameter.
/// This parameter is passed uninitialized.</param>
/// <returns><c>true</c> if the <see cref="CharArrayMap{TValue}"/> contains an element with the specified key; otherwise, <c>false</c>.</returns>
+ [CLSCompliant(false)]
public static bool TryGetValue<TValue>(this CharArrayMap<TValue> map, ushort key, out TValue value)
{
return map.TryGetValue(key.ToString(CultureInfo.InvariantCulture), out value);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/19f22995/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
index d2fc5ee..b715768 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
@@ -947,6 +947,7 @@ namespace Lucene.Net.Analysis.Util
/// Add this <see cref="sbyte"/> into the set
/// </summary>
/// <returns><c>true</c> if <paramref name="o"/> was added to the set; <c>false</c> if it already existed prior to this call</returns>
+ [CLSCompliant(false)]
public static bool Add(this CharArraySet set, sbyte text)
{
return set.map.Put(text.ToString(CultureInfo.InvariantCulture));
@@ -965,6 +966,7 @@ namespace Lucene.Net.Analysis.Util
/// Add this <see cref="uint"/> into the set
/// </summary>
/// <returns><c>true</c> if <paramref name="o"/> was added to the set; <c>false</c> if it already existed prior to this call</returns>
+ [CLSCompliant(false)]
public static bool Add(this CharArraySet set, uint text)
{
return set.map.Put(text.ToString(CultureInfo.InvariantCulture));
@@ -974,6 +976,7 @@ namespace Lucene.Net.Analysis.Util
/// Add this <see cref="ulong"/> into the set
/// </summary>
/// <returns><c>true</c> if <paramref name="o"/> was added to the set; <c>false</c> if it already existed prior to this call</returns>
+ [CLSCompliant(false)]
public static bool Add(this CharArraySet set, ulong text)
{
return set.map.Put(text.ToString(CultureInfo.InvariantCulture));
@@ -983,6 +986,7 @@ namespace Lucene.Net.Analysis.Util
/// Add this <see cref="ushort"/> into the set
/// </summary>
/// <returns><c>true</c> if <paramref name="o"/> was added to the set; <c>false</c> if it already existed prior to this call</returns>
+ [CLSCompliant(false)]
public static bool Add(this CharArraySet set, ushort text)
{
return set.map.Put(text.ToString(CultureInfo.InvariantCulture));
@@ -1059,6 +1063,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// <c>true</c> if the <see cref="sbyte"/> is in the set
/// </summary>
+ [CLSCompliant(false)]
public static bool Contains(this CharArraySet set, sbyte text)
{
return set.map.ContainsKey(text.ToString(CultureInfo.InvariantCulture));
@@ -1075,6 +1080,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// <c>true</c> if the <see cref="uint"/> is in the set
/// </summary>
+ [CLSCompliant(false)]
public static bool Contains(this CharArraySet set, uint text)
{
return set.map.ContainsKey(text.ToString(CultureInfo.InvariantCulture));
@@ -1083,6 +1089,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// <c>true</c> if the <see cref="ulong"/> is in the set
/// </summary>
+ [CLSCompliant(false)]
public static bool Contains(this CharArraySet set, ulong text)
{
return set.map.ContainsKey(text.ToString(CultureInfo.InvariantCulture));
@@ -1091,6 +1098,7 @@ namespace Lucene.Net.Analysis.Util
/// <summary>
/// <c>true</c> if the <see cref="ushort"/> is in the set
/// </summary>
+ [CLSCompliant(false)]
public static bool Contains(this CharArraySet set, ushort text)
{
return set.map.ContainsKey(text.ToString(CultureInfo.InvariantCulture));
@@ -1295,6 +1303,7 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
/// <param name="other">The collection whose elements should be merged into the <see cref="CharArraySet"/>.</param>
/// <returns><c>true</c> if this <see cref="CharArraySet"/> changed as a result of the call</returns>
+ [CLSCompliant(false)]
public static bool UnionWith(this CharArraySet set, IEnumerable<sbyte> other)
{
if (other == null)
@@ -1349,6 +1358,7 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
/// <param name="other">The collection whose elements should be merged into the <see cref="CharArraySet"/>.</param>
/// <returns><c>true</c> if this <see cref="CharArraySet"/> changed as a result of the call</returns>
+ [CLSCompliant(false)]
public static bool UnionWith(this CharArraySet set, IEnumerable<uint> other)
{
if (other == null)
@@ -1376,6 +1386,7 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
/// <param name="other">The collection whose elements should be merged into the <see cref="CharArraySet"/>.</param>
/// <returns><c>true</c> if this <see cref="CharArraySet"/> changed as a result of the call</returns>
+ [CLSCompliant(false)]
public static bool UnionWith(this CharArraySet set, IEnumerable<ulong> other)
{
if (other == null)
@@ -1403,6 +1414,7 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
/// <param name="other">The collection whose elements should be merged into the <see cref="CharArraySet"/>.</param>
/// <returns><c>true</c> if this <see cref="CharArraySet"/> changed as a result of the call</returns>
+ [CLSCompliant(false)]
public static bool UnionWith(this CharArraySet set, IEnumerable<ushort> other)
{
if (other == null)
[4/5] lucenenet git commit:
Lucene.Net.Analysis.Common.Analysis.Compound.Hyphenation: converted sbyte to
byte for CLS compliance
Posted by ni...@apache.org.
Lucene.Net.Analysis.Common.Analysis.Compound.Hyphenation: converted sbyte to byte for CLS compliance
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/fb767582
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/fb767582
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/fb767582
Branch: refs/heads/api-work
Commit: fb767582411fb50dd272d07bf8d97ca877b73891
Parents: 19f2299
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 18:34:18 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 18:48:07 2017 +0700
----------------------------------------------------------------------
.../Analysis/Compound/Hyphenation/ByteVector.cs | 16 ++++++-------
.../Compound/Hyphenation/HyphenationTree.cs | 24 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fb767582/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
index 7f00460..206a7c4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
/// <summary>
/// The encapsulated array
/// </summary>
- private sbyte[] array;
+ private byte[] array;
/// <summary>
/// Points to next free item
@@ -60,18 +60,18 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
{
blockSize = DEFAULT_BLOCK_SIZE;
}
- array = new sbyte[blockSize];
+ array = new byte[blockSize];
n = 0;
}
- public ByteVector(sbyte[] a)
+ public ByteVector(byte[] a)
{
blockSize = DEFAULT_BLOCK_SIZE;
array = a;
n = 0;
}
- public ByteVector(sbyte[] a, int capacity)
+ public ByteVector(byte[] a, int capacity)
{
if (capacity > 0)
{
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
[WritableArray]
[SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
- public virtual sbyte[] Array
+ public virtual byte[] Array
{
get
{
@@ -100,7 +100,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
- public virtual sbyte this[int index]
+ public virtual byte this[int index]
{
get { return array[index]; }
set { array[index] = value; }
@@ -141,7 +141,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
int len = array.Length;
if (n + size >= len)
{
- sbyte[] aux = new sbyte[len + blockSize];
+ byte[] aux = new byte[len + blockSize];
System.Array.Copy(array, 0, aux, 0, len);
array = aux;
}
@@ -153,7 +153,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
{
if (n < array.Length)
{
- sbyte[] aux = new sbyte[n];
+ byte[] aux = new byte[n];
System.Array.Copy(array, 0, aux, 0, n);
array = aux;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fb767582/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
index 20c255d..7e1420d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
@@ -76,18 +76,18 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
int i, n = values.Length;
int m = (n & 1) == 1 ? (n >> 1) + 2 : (n >> 1) + 1;
int offset = m_vspace.Alloc(m);
- sbyte[] va = m_vspace.Array;
+ byte[] va = m_vspace.Array;
for (i = 0; i < n; i++)
{
int j = i >> 1;
- sbyte v = (sbyte)((values[i] - '0' + 1) & 0x0f);
+ byte v = (byte)((values[i] - '0' + 1) & 0x0f);
if ((i & 1) == 1)
{
- va[j + offset] = (sbyte)(va[j + offset] | v);
+ va[j + offset] = (byte)(va[j + offset] | v);
}
else
{
- va[j + offset] = (sbyte)(v << 4); // big endian
+ va[j + offset] = (byte)(v << 4); // big endian
}
}
va[m - 1 + offset] = 0; // terminator
@@ -97,7 +97,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
protected internal virtual string UnpackValues(int k)
{
StringBuilder buf = new StringBuilder();
- sbyte v = m_vspace[k++];
+ byte v = m_vspace[k++];
while (v != 0)
{
char c = (char)(((int)((uint)v >> 4)) - 1 + '0');
@@ -236,10 +236,10 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
return s[si] - t[ti];
}
- protected internal virtual sbyte[] GetValues(int k)
+ protected internal virtual byte[] GetValues(int k)
{
StringBuilder buf = new StringBuilder();
- sbyte v = m_vspace[k++];
+ byte v = m_vspace[k++];
while (v != 0)
{
char c = (char)((((int)((uint)v >> 4))) - 1);
@@ -253,10 +253,10 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
buf.Append(c);
v = m_vspace[k++];
}
- sbyte[] res = new sbyte[buf.Length];
+ byte[] res = new byte[buf.Length];
for (int i = 0; i < res.Length; i++)
{
- res[i] = (sbyte)buf[i];
+ res[i] = (byte)buf[i];
}
return res;
}
@@ -286,9 +286,9 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
/// <param name="word"> null terminated word to match </param>
/// <param name="index"> start index from word </param>
/// <param name="il"> interletter values array to update </param>
- protected internal virtual void SearchPatterns(char[] word, int index, sbyte[] il)
+ protected internal virtual void SearchPatterns(char[] word, int index, byte[] il)
{
- sbyte[] values;
+ byte[] values;
int i = index;
char p, q;
char sp = word[i];
@@ -484,7 +484,7 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
word[0] = '.'; // word start marker
word[len + 1] = '.'; // word end marker
word[len + 2] = (char)0; // null terminated
- sbyte[] il = new sbyte[len + 3]; // initialized to zero
+ byte[] il = new byte[len + 3]; // initialized to zero
for (i = 0; i < len + 1; i++)
{
SearchPatterns(word, i, il);
[5/5] lucenenet git commit:
Lucene.Net.Analysis.Common.Analysis.Payloads.IPayloadEncoder refactor:
renamed encode() > Encode()
Posted by ni...@apache.org.
Lucene.Net.Analysis.Common.Analysis.Payloads.IPayloadEncoder refactor: renamed encode() > Encode()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b43ac82a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b43ac82a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b43ac82a
Branch: refs/heads/api-work
Commit: b43ac82a6604f5a8a1f46c5e42f2ea0b68a9b257
Parents: fb76758
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 18:45:39 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 18:48:08 2017 +0700
----------------------------------------------------------------------
.../Analysis/Payloads/AbstractEncoder.cs | 2 +-
.../Analysis/Payloads/PayloadEncoder.cs | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b43ac82a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
index 37b0d31..708b7b2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Analysis.Payloads
public abstract class AbstractEncoder : IPayloadEncoder
{
public abstract BytesRef Encode(char[] buffer, int offset, int length);
- public virtual BytesRef encode(char[] buffer)
+ public virtual BytesRef Encode(char[] buffer)
{
return Encode(buffer, 0, buffer.Length);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b43ac82a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
index 5f49025..060569e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
@@ -29,8 +29,7 @@ namespace Lucene.Net.Analysis.Payloads
/// </summary>
public interface IPayloadEncoder
{
-
- BytesRef encode(char[] buffer);
+ BytesRef Encode(char[] buffer);
/// <summary>
/// Convert a char array to a <seealso cref="BytesRef"/> </summary>
[2/5] lucenenet git commit: Lucene.Net.QueryParser: refactored
members that accept IEnumerable to IList (per Lucene)
Posted by ni...@apache.org.
Lucene.Net.QueryParser: refactored members that accept IEnumerable<T> to IList<T> (per Lucene)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/deff1771
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/deff1771
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/deff1771
Branch: refs/heads/api-work
Commit: deff17716805bb5fcecd84a1b23ff41fbaa0c976
Parents: fe8795b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 18:19:14 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 18:19:14 2017 +0700
----------------------------------------------------------------------
.../Surround/Parser/QueryParser.cs | 18 +++++++++---------
.../Surround/Query/AndQuery.cs | 2 +-
.../Surround/Query/ComposedQuery.cs | 8 ++++----
.../Surround/Query/DistanceQuery.cs | 2 +-
.../Surround/Query/FieldsQuery.cs | 10 +++++-----
.../Surround/Query/NotQuery.cs | 2 +-
.../Surround/Query/OrQuery.cs | 2 +-
.../Surround/Query/SrndBooleanQuery.cs | 8 ++++----
.../TestApiConsistency.cs | 12 ++++++------
9 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
index 5a9d0c1..9866981 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
@@ -91,7 +91,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
protected virtual SrndQuery GetFieldsQuery(
- SrndQuery q, IEnumerable<string> fieldNames)
+ SrndQuery q, IList<string> fieldNames)
{
/* FIXME: check acceptable subquery: at least one subquery should not be
* a fields query.
@@ -99,17 +99,17 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
return new FieldsQuery(q, fieldNames, fieldOperator);
}
- protected virtual SrndQuery GetOrQuery(IEnumerable<SrndQuery> queries, bool infix, Token orToken)
+ protected virtual SrndQuery GetOrQuery(IList<SrndQuery> queries, bool infix, Token orToken)
{
return new OrQuery(queries, infix, orToken.Image);
}
- protected virtual SrndQuery GetAndQuery(IEnumerable<SrndQuery> queries, bool infix, Token andToken)
+ protected virtual SrndQuery GetAndQuery(IList<SrndQuery> queries, bool infix, Token andToken)
{
return new AndQuery(queries, infix, andToken.Image);
}
- protected virtual SrndQuery GetNotQuery(IEnumerable<SrndQuery> queries, Token notToken)
+ protected virtual SrndQuery GetNotQuery(IList<SrndQuery> queries, Token notToken)
{
return new NotQuery(queries, notToken.Image);
}
@@ -132,7 +132,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
protected virtual SrndQuery GetDistanceQuery(
- IEnumerable<SrndQuery> queries,
+ IList<SrndQuery> queries,
bool infix,
Token dToken,
bool ordered)
@@ -195,14 +195,14 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
public SrndQuery FieldsQuery()
{
SrndQuery q;
- IEnumerable<string> fieldNames;
+ IList<string> fieldNames;
fieldNames = OptionalFields();
q = OrQuery();
{ if (true) return (fieldNames == null) ? q : GetFieldsQuery(q, fieldNames); }
throw new Exception("Missing return statement in function");
}
- public IEnumerable<string> OptionalFields()
+ public IList<string> OptionalFields()
{
Token fieldName;
IList<string> fieldNames = null;
@@ -429,7 +429,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
public SrndQuery PrefixOperatorQuery()
{
Token oprt;
- IEnumerable<SrndQuery> queries;
+ IList<SrndQuery> queries;
switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
{
case RegexpToken.OR:
@@ -464,7 +464,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
throw new Exception("Missing return statement in function");
}
- public IEnumerable<SrndQuery> FieldsQueryList()
+ public IList<SrndQuery> FieldsQueryList()
{
SrndQuery q;
IList<SrndQuery> queries = new List<SrndQuery>();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/AndQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/AndQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/AndQuery.cs
index cb53f6c..c792029 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/AndQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/AndQuery.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
/// </summary>
public class AndQuery : ComposedQuery
{
- public AndQuery(IEnumerable<SrndQuery> queries, bool inf, string opName)
+ public AndQuery(IList<SrndQuery> queries, bool inf, string opName)
: base(queries, inf, opName)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
index e35780d..5e6c4ac 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
@@ -27,16 +27,16 @@ namespace Lucene.Net.QueryParsers.Surround.Query
/// </summary>
public abstract class ComposedQuery : SrndQuery
{
- public ComposedQuery(IEnumerable<SrndQuery> qs, bool operatorInfix, string opName)
+ public ComposedQuery(IList<SrndQuery> qs, bool operatorInfix, string opName)
{
Recompose(qs);
this.operatorInfix = operatorInfix;
this.m_opName = opName;
}
- protected virtual void Recompose(IEnumerable<SrndQuery> queries)
+ protected virtual void Recompose(IList<SrndQuery> queries)
{
- if (queries.Count() < 2) throw new InvalidOperationException("Too few subqueries");
+ if (queries.Count < 2) throw new InvalidOperationException("Too few subqueries");
this.m_queries = new List<SrndQuery>(queries);
}
@@ -57,7 +57,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
private bool operatorInfix;
public virtual bool IsOperatorInfix { get { return operatorInfix; } } /* else prefix operator */
- public virtual IEnumerable<Search.Query> MakeLuceneSubQueriesField(string fn, BasicQueryFactory qf)
+ public virtual IList<Search.Query> MakeLuceneSubQueriesField(string fn, BasicQueryFactory qf)
{
List<Search.Query> luceneSubQueries = new List<Search.Query>();
IEnumerator<SrndQuery> sqi = GetSubQueriesEnumerator();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
index 5169343..9489a64 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/DistanceQuery.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
public class DistanceQuery : ComposedQuery, IDistanceSubQuery
{
public DistanceQuery(
- IEnumerable<SrndQuery> queries,
+ IList<SrndQuery> queries,
bool infix,
int opDistance,
string opName,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
index c6c648c..6cfe78b 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
@@ -27,14 +27,14 @@ namespace Lucene.Net.QueryParsers.Surround.Query
public class FieldsQuery : SrndQuery /* mostly untested */
{
private SrndQuery q;
- private IEnumerable<string> fieldNames;
+ private IList<string> fieldNames;
private readonly char fieldOp;
private readonly string orOperatorName = "OR"; /* for expanded queries, not normally visible */
- public FieldsQuery(SrndQuery q, IEnumerable<string> fieldNames, char fieldOp)
+ public FieldsQuery(SrndQuery q, IList<string> fieldNames, char fieldOp)
{
this.q = q;
- this.fieldNames = new List<string>(fieldNames);
+ this.fieldNames = fieldNames;
this.fieldOp = fieldOp;
}
@@ -54,7 +54,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
public virtual Search.Query MakeLuceneQueryNoBoost(BasicQueryFactory qf)
{
- if (fieldNames.Count() == 1)
+ if (fieldNames.Count == 1)
{ /* single field name: no new queries needed */
return q.MakeLuceneQueryFieldNoBoost(fieldNames.FirstOrDefault(), qf);
}
@@ -79,7 +79,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
return MakeLuceneQueryNoBoost(qf); /* use this.fieldNames instead of fieldName */
}
- public virtual IEnumerable<string> FieldNames { get { return fieldNames; } }
+ public virtual IList<string> FieldNames { get { return fieldNames; } }
public virtual char FieldOperator { get { return fieldOp; } }
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/NotQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/NotQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/NotQuery.cs
index 0820198..64a0633 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/NotQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/NotQuery.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
/// </summary>
public class NotQuery : ComposedQuery
{
- public NotQuery(IEnumerable<SrndQuery> queries, string opName)
+ public NotQuery(IList<SrndQuery> queries, string opName)
: base(queries, true /* infix */, opName)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/OrQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/OrQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/OrQuery.cs
index d164740..30b883e 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/OrQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/OrQuery.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
/// </summary>
public class OrQuery : ComposedQuery, IDistanceSubQuery
{
- public OrQuery(IEnumerable<SrndQuery> queries, bool infix, string opName)
+ public OrQuery(IList<SrndQuery> queries, bool infix, string opName)
: base(queries, infix, opName)
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
index 49bbd9e..25b21c3 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndBooleanQuery.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
{
public static void AddQueriesToBoolean(
BooleanQuery bq,
- IEnumerable<Search.Query> queries,
+ IList<Search.Query> queries,
Occur occur)
{
foreach (var query in queries)
@@ -36,12 +36,12 @@ namespace Lucene.Net.QueryParsers.Surround.Query
}
public static Search.Query MakeBooleanQuery(
- IEnumerable<Search.Query> queries,
+ IList<Search.Query> queries,
Occur occur)
{
- if (queries.Count() <= 1)
+ if (queries.Count <= 1)
{
- throw new InvalidOperationException("Too few subqueries: " + queries.Count());
+ throw new InvalidOperationException("Too few subqueries: " + queries.Count);
}
BooleanQuery bq = new BooleanQuery();
AddQueriesToBoolean(bq, queries, occur);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deff1771/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs b/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
index b28ace3..26b0896 100644
--- a/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
@@ -103,12 +103,12 @@ namespace Lucene.Net.QueryParsers
// LUCENENET NOTE: This test is only for identifying members who were changed from
// ICollection, IList or ISet to IEnumerable during the port (that should be changed back)
- //[Test, LuceneNetSpecific]
- //[TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
- //public override void TestForMembersAcceptingOrReturningIEnumerable(Type typeFromTargetAssembly)
- //{
- // base.TestForMembersAcceptingOrReturningIEnumerable(typeFromTargetAssembly);
- //}
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForMembersAcceptingOrReturningIEnumerable(Type typeFromTargetAssembly)
+ {
+ base.TestForMembersAcceptingOrReturningIEnumerable(typeFromTargetAssembly);
+ }
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]