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/01/25 03:43:45 UTC
[01/50] [abbrv] lucenenet git commit:
Lucene.Net.TestFramework.Analysis.LookaheadTokenFilter: renamed End > end
because of naming conflict with method
Repository: lucenenet
Updated Branches:
refs/heads/api-work [created] 2315d0d41
Lucene.Net.TestFramework.Analysis.LookaheadTokenFilter: renamed End > end because of naming conflict with method
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/62edcef3
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/62edcef3
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/62edcef3
Branch: refs/heads/api-work
Commit: 62edcef360d6076a5eeb094598bb62eaacebf34c
Parents: 35f1a4d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 01:40:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:44 2017 +0700
----------------------------------------------------------------------
.../Analysis/LookaheadTokenFilter.cs | 10 +++++-----
.../Analysis/MockGraphTokenFilter.cs | 2 +-
.../Analysis/MockRandomLookaheadTokenFilter.cs | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62edcef3/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
index ee840bb..e3a4252 100644
--- a/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Analysis
protected internal int OutputPos;
// True if we hit end from our input:
- protected internal bool End;
+ protected internal bool end;
private bool TokenPending;
private bool InsertPending;
@@ -173,7 +173,7 @@ namespace Lucene.Net.Analysis
{
Console.WriteLine("LTF.peekToken inputPos=" + InputPos + " outputPos=" + OutputPos + " tokenPending=" + TokenPending);
}
- Debug.Assert(!End);
+ Debug.Assert(!end);
Debug.Assert(InputPos == -1 || OutputPos <= InputPos);
if (TokenPending)
{
@@ -223,7 +223,7 @@ namespace Lucene.Net.Analysis
}
else
{
- End = true;
+ end = true;
}
return gotToken;
@@ -288,7 +288,7 @@ namespace Lucene.Net.Analysis
TokenPending = false;
return true;
}
- else if (End || !PeekToken())
+ else if (end || !PeekToken())
{
if (DEBUG)
{
@@ -368,7 +368,7 @@ namespace Lucene.Net.Analysis
InputPos = -1;
OutputPos = 0;
TokenPending = false;
- End = false;
+ end = false;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62edcef3/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
index 5db031e..f9d40fa 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Analysis
// Look ahead as needed until we figure out the right
// endOffset:
- while (!End && posEndData.EndOffset == -1 && InputPos <= (OutputPos + posLength))
+ while (!end && posEndData.EndOffset == -1 && InputPos <= (OutputPos + posLength))
{
if (!PeekToken())
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62edcef3/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
index c4d68ce..9dba8d3 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Analysis
protected internal override void AfterPosition()
{
- if (!End && random.Next(4) == 2)
+ if (!end && random.Next(4) == 2)
{
PeekToken();
}
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis
Console.WriteLine("\n" + Thread.CurrentThread.Name + ": MRLTF.incrToken");
}
- if (!End)
+ if (!end)
{
while (true)
{
[09/50] [abbrv] lucenenet git commit:
Lucene.Net.TestFramework.Index.BaseTermVectorsFormatTestCase: added new
keyword to static Equals method
Posted by ni...@apache.org.
Lucene.Net.TestFramework.Index.BaseTermVectorsFormatTestCase: added new keyword to static Equals method
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a1408ddc
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a1408ddc
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a1408ddc
Branch: refs/heads/api-work
Commit: a1408ddc00c2e28b141cc127c421e1c4f75b09ab
Parents: d46c001
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 01:47:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:45 2017 +0700
----------------------------------------------------------------------
.../Index/BaseTermVectorsFormatTestCase.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a1408ddc/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index 817e928..e51fa0f 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -502,7 +502,7 @@ namespace Lucene.Net.Index
}
}
- protected internal static bool Equals(object o1, object o2)
+ new protected internal static bool Equals(object o1, object o2)
{
if (o1 == null)
{
[23/50] [abbrv] lucenenet git commit: Lucene.Net.Tests.Core.Support
(TestByteBuffer + TestLongBuffer): Removed x != x and y != y comparisons
(nonsense in .NET)
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Support (TestByteBuffer + TestLongBuffer): Removed x != x and y != y comparisons (nonsense in .NET)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9aab47d7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9aab47d7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9aab47d7
Branch: refs/heads/api-work
Commit: 9aab47d7655c2d6cabdf4e6b674368be3480f17f
Parents: 3bd0c90
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:24:43 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs | 2 +-
src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9aab47d7/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs b/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
index d9cec07..322645a 100644
--- a/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
@@ -461,7 +461,7 @@ namespace Lucene.Net.Support
fail("Incorrect results for ByteBuffer.compareTo",
xb, yb, x, y);
}
- if (xb.equals(yb) != ((x == y) || ((x != x) && (y != y))))
+ if (xb.equals(yb) != ((x == y) /*|| ((x != x) && (y != y))*/))
{
fail("Incorrect results for ByteBuffer.equals",
xb, yb, x, y);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9aab47d7/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs b/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
index 3df1596..7055211 100644
--- a/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
@@ -344,7 +344,7 @@ namespace Lucene.Net.Support
fail("Incorrect results for LongBuffer.compareTo",
xb, yb, x, y);
}
- if (xb.equals(yb) != ((x == y) || (x != x) && (y != y)))
+ if (xb.equals(yb) != ((x == y) /*|| (x != x) && (y != y)*/))
{
fail("Incorrect results for LongBuffer.equals",
xb, yb, x, y);
[32/50] [abbrv] lucenenet git commit:
Lucene.Net.Queries.CommonTermsQuery: Removed check for null on highFreqOccur
and lowFreqOccur, since enumerations cannot be null in .NET
Posted by ni...@apache.org.
Lucene.Net.Queries.CommonTermsQuery: Removed check for null on highFreqOccur and lowFreqOccur, since enumerations cannot be null in .NET
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/994233c1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/994233c1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/994233c1
Branch: refs/heads/api-work
Commit: 994233c108c2d81e5ed853d326606c04dee0dea9
Parents: 3980448
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:48:39 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/CommonTermsQuery.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/994233c1/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index 70781b8..892f936 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -389,9 +389,9 @@ namespace Lucene.Net.Queries
int result = base.GetHashCode();
result = prime * result + (disableCoord ? 1231 : 1237);
result = prime * result + Number.FloatToIntBits(highFreqBoost);
- result = prime * result + ((highFreqOccur == null) ? 0 : highFreqOccur.GetHashCode());
+ result = prime * result + /*((highFreqOccur == null) ? 0 :*/ highFreqOccur.GetHashCode()/*)*/;
result = prime * result + Number.FloatToIntBits(lowFreqBoost);
- result = prime * result + ((lowFreqOccur == null) ? 0 : lowFreqOccur.GetHashCode());
+ result = prime * result + /*((lowFreqOccur == null) ? 0 :*/ lowFreqOccur.GetHashCode()/*)*/;
result = prime * result + Number.FloatToIntBits(maxTermFrequency);
result = prime * result + Number.FloatToIntBits(LowFreqMinimumNumberShouldMatch);
result = prime * result + Number.FloatToIntBits(HighFreqMinimumNumberShouldMatch);
[20/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestIndexConcurrentMergeScheduler.FailOnlyOnFlush:
added new keyword to DoFail because it conflicts with a field of the same
name in the base class
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestIndexConcurrentMergeScheduler.FailOnlyOnFlush: added new keyword to DoFail because it conflicts with a field of the same name in the base class
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c1c68dce
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c1c68dce
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c1c68dce
Branch: refs/heads/api-work
Commit: c1c68dce0cfc43021cd4ffc2ec6bcffbf71370f8
Parents: 1e11611
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 04:46:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c1c68dce/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
index 30bf6b7..401b1fd 100644
--- a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Index
this.OuterInstance = outerInstance;
}
- internal bool DoFail;
+ new internal bool DoFail;
internal bool HitExc;
public override void SetDoFail()
[16/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestNRTThreads: added override keyword to SetUp
method
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestNRTThreads: added override keyword to SetUp method
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/974fd48c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/974fd48c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/974fd48c
Branch: refs/heads/api-work
Commit: 974fd48ce8f530accf23906e8cdeabcf6eb6d975
Parents: 99119dd
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:09:35 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/974fd48c/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs b/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs
index acb603d..f6815cb 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Index
private bool UseNonNrtReaders = true;
[SetUp]
- public virtual void SetUp()
+ public override void SetUp()
{
base.SetUp();
UseNonNrtReaders = Random().NextBoolean();
[04/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Support.C5.HashBag: commented explicit compiler
warnings
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Support.C5.HashBag: commented explicit compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6ef38077
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6ef38077
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6ef38077
Branch: refs/heads/api-work
Commit: 6ef38077a48e0ad94dea8547eab0112d4e922791
Parents: a781c2c
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:02:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:45 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Support/C5/HashBag.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6ef38077/src/Lucene.Net.Tests/core/Support/C5/HashBag.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/C5/HashBag.cs b/src/Lucene.Net.Tests/core/Support/C5/HashBag.cs
index 55a261f..288198a 100644
--- a/src/Lucene.Net.Tests/core/Support/C5/HashBag.cs
+++ b/src/Lucene.Net.Tests/core/Support/C5/HashBag.cs
@@ -299,7 +299,7 @@ namespace Lucene.Net.Support.C5
/// <param name="items">The items to remove.</param>
public virtual void RemoveAll(SCG.IEnumerable<T> items)
{
-#warning Improve if items is a counting bag
+//#warning Improve if items is a counting bag
updatecheck();
bool mustRaise = (ActiveEvents & (EventTypeEnum.Changed | EventTypeEnum.Removed)) != 0;
RaiseForRemoveAllHandler raiseHandler = mustRaise ? new RaiseForRemoveAllHandler(this) : null;
@@ -388,7 +388,7 @@ namespace Lucene.Net.Support.C5
{
int removed = p.Value - res.ContainsCount(p.Key);
if (removed > 0)
-#warning We could send bag events here easily using a CircularQueue of (should?)
+//#warning We could send bag events here easily using a CircularQueue of (should?)
for (int i = 0; i < removed; i++)
wasRemoved.Enqueue(p.Key);
}
@@ -574,7 +574,7 @@ namespace Lucene.Net.Support.C5
public virtual void AddAll(SCG.IEnumerable<T> items)
{
updatecheck();
-#warning We could easily raise bag events
+//#warning We could easily raise bag events
bool mustRaiseAdded = (ActiveEvents & EventTypeEnum.Added) != 0;
CircularQueue<T> wasAdded = mustRaiseAdded ? new CircularQueue<T>() : null;
bool wasChanged = false;
[15/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Analysis.TrivialLookaheadFilter: added new keyword on
private variables because they conflict with protected variables of base
class.
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Analysis.TrivialLookaheadFilter: added new keyword on private variables because they conflict with protected variables of base class.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5e39a91c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5e39a91c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5e39a91c
Branch: refs/heads/api-work
Commit: 5e39a91c7fa44f1f2fd3f64c88d8470103133337
Parents: 974fd48
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:14:49 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5e39a91c/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs b/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs
index e449938..b422026 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs
@@ -26,8 +26,8 @@ namespace Lucene.Net.Analysis
public sealed class TrivialLookaheadFilter : LookaheadTokenFilter<TestPosition>
{
private readonly ICharTermAttribute TermAtt;
- private readonly IPositionIncrementAttribute PosIncAtt;
- private readonly IOffsetAttribute OffsetAtt;
+ new private readonly IPositionIncrementAttribute PosIncAtt;
+ new private readonly IOffsetAttribute OffsetAtt;
private int InsertUpto;
[12/50] [abbrv] lucenenet git commit: BUG:
Lucene.Net.Tests.Core.Search.Payloads.TestPayloadTermQuery: Similarity not
being set right in CheckHits.CheckHitCollector() because it was using the
local field with the same name. Changed field name to camelCas
Posted by ni...@apache.org.
BUG: Lucene.Net.Tests.Core.Search.Payloads.TestPayloadTermQuery: Similarity not being set right in CheckHits.CheckHitCollector() because it was using the local field with the same name. Changed field name to camelCase to fix.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/295c9e57
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/295c9e57
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/295c9e57
Branch: refs/heads/api-work
Commit: 295c9e571400da2263e253552e7fde6a9c64d5d4
Parents: bde76bf
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 04:33:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/IndexWriterConfig.cs | 2 +-
.../core/Search/Payloads/TestPayloadTermQuery.cs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/295c9e57/src/Lucene.Net.Core/Index/IndexWriterConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexWriterConfig.cs b/src/Lucene.Net.Core/Index/IndexWriterConfig.cs
index 8c93ba8..99f3a11 100644
--- a/src/Lucene.Net.Core/Index/IndexWriterConfig.cs
+++ b/src/Lucene.Net.Core/Index/IndexWriterConfig.cs
@@ -275,7 +275,7 @@ namespace Lucene.Net.Index
///
/// <p>Only takes effect when IndexWriter is first created.
/// </summary>
- public IndexWriterConfig SetSimilarity(Similarity similarity)
+ public IndexWriterConfig SetSimilarity(Similarity similarity) // LUCENENET TODO: Make this (and other setters on this class) a property setter? It would make it consistent with IndexSearcher and make it more .NET like
{
if (similarity == null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/295c9e57/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 1a877fc..2c4a220 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search.Payloads
{
private static IndexSearcher Searcher;
private static IndexReader Reader;
- private static readonly Similarity Similarity = new BoostingSimilarity();
+ private static readonly Similarity similarity = new BoostingSimilarity();
private static readonly byte[] PayloadField = { 1 };
private static readonly byte[] PayloadMultiField1 = { 2 };
private static readonly byte[] PayloadMultiField2 = { 4 };
@@ -123,7 +123,7 @@ namespace Lucene.Net.Search.Payloads
public void BeforeClass()
{
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(Similarity).SetMergePolicy(NewLogMergePolicy()));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(similarity).SetMergePolicy(NewLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++)
{
@@ -139,7 +139,7 @@ namespace Lucene.Net.Search.Payloads
writer.Dispose();
Searcher = NewSearcher(Reader);
- Searcher.Similarity = Similarity;
+ Searcher.Similarity = similarity;
}
[TestFixtureTearDown]
[38/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Join.TestJoinUtil.CollectorAnonymousInnerClassHelper6:
removed unused context variable and constructor parameter
Posted by ni...@apache.org.
Lucene.Net.Tests.Join.TestJoinUtil.CollectorAnonymousInnerClassHelper6: removed unused context variable and constructor parameter
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9aa8d66b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9aa8d66b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9aa8d66b
Branch: refs/heads/api-work
Commit: 9aa8d66b1ea976075ceb378c77f5aa340689ac54
Parents: b022d30
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:33:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9aa8d66b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
index cfa02c5..5abdec0 100644
--- a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
+++ b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
@@ -748,7 +748,7 @@ namespace Lucene.Net.Tests.Join
else
{
toSearcher.Search(new MatchAllDocsQuery(),
- new CollectorAnonymousInnerClassHelper6(this, context, toField, joinValueToJoinScores,
+ new CollectorAnonymousInnerClassHelper6(this, toField, joinValueToJoinScores,
docToJoinScore));
}
queryVals[uniqueRandomValue] = docToJoinScore;
@@ -939,7 +939,6 @@ namespace Lucene.Net.Tests.Join
{
private readonly TestJoinUtil OuterInstance;
- private IndexIterationContext Context;
private string ToField;
private IDictionary<BytesRef, JoinScore> JoinValueToJoinScores;
private IDictionary<int, JoinScore> DocToJoinScore;
@@ -949,7 +948,7 @@ namespace Lucene.Net.Tests.Join
private readonly BytesRef spare = new BytesRef();
public CollectorAnonymousInnerClassHelper6(TestJoinUtil testJoinUtil,
- IndexIterationContext context, string toField,
+ string toField,
IDictionary<BytesRef, JoinScore> joinValueToJoinScores,
IDictionary<int, JoinScore> docToJoinScore)
{
[37/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Highlighter.VectorHighlight.FastVectorHighlighterTest.AnalyzerWrapperAnonymousHelper:
suppressed obsolete warning for constructor,
removed TODO about building the same class
Posted by ni...@apache.org.
Lucene.Net.Tests.Highlighter.VectorHighlight.FastVectorHighlighterTest.AnalyzerWrapperAnonymousHelper: suppressed obsolete warning for constructor, removed TODO about building the same class
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b022d303
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b022d303
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b022d303
Branch: refs/heads/api-work
Commit: b022d303c9a4c6e2b14fada28025ede5d27978b7
Parents: 0326cc9
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:26:08 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
.../VectorHighlight/FastVectorHighlighterTest.cs | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b022d303/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
index d9fbf1a..7eea1ae 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
@@ -597,15 +597,6 @@ namespace Lucene.Net.Search.VectorHighlight
Analyzer analyzer = new AnalyzerWrapperAnonymousHelper();
- // LUCENENET TODO: anonymous
- // Analyzer analyzer = new AnalyzerWrapper()
- // {
- // public Analyzer getWrappedAnalyzer(String fieldName)
- //{
- // return fieldAnalyzers.Get(fieldName);
- //}
- // };
-
Directory dir = NewDirectory();
IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
writer.AddDocument(doc);
@@ -654,6 +645,7 @@ namespace Lucene.Net.Search.VectorHighlight
{
IDictionary<String, Analyzer> fieldAnalyzers = new SortedDictionary<String, Analyzer>();
+#pragma warning disable 612, 618 // LUCENENET NOTE: Class calls obsolete (default) constructor
public AnalyzerWrapperAnonymousHelper()
{
fieldAnalyzers.Put("field", new MockAnalyzer(Random(), MockTokenizer.WHITESPACE, true, MockTokenFilter.ENGLISH_STOPSET));
@@ -664,6 +656,7 @@ namespace Lucene.Net.Search.VectorHighlight
fieldAnalyzers.Put("field_sliced", fieldAnalyzers["field"]);
fieldAnalyzers.Put("field_der_red", fieldAnalyzers["field"]); // This is required even though we provide a token stream
}
+#pragma warning restore 612, 618
protected override Analyzer GetWrappedAnalyzer(string fieldName)
{
return fieldAnalyzers[fieldName];
[10/50] [abbrv] lucenenet git commit: Lucene.Net.Tests.Core.Support
(TestByteBuffer + TestLongBuffer): commented unused v variables
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Support (TestByteBuffer + TestLongBuffer): commented unused v variables
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/096a3174
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/096a3174
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/096a3174
Branch: refs/heads/api-work
Commit: 096a31746c5b809b5ce327014a81ca5dd6416d31
Parents: a1408dd
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 01:51:15 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:45 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs | 10 +++++-----
src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/096a3174/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs b/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
index 3a0855d..d9cec07 100644
--- a/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestByteBuffer.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Support
private static void relGet(ByteBuffer b)
{
int n = b.Capacity;
- byte v;
+ //byte v; // LUCENENET: Not used
for (int i = 0; i < n; i++)
ck(b, (long)b.Get(), (long)((byte)Ic(i)));
b.Rewind();
@@ -32,7 +32,7 @@ namespace Lucene.Net.Support
private static void relGet(ByteBuffer b, int start)
{
int n = b.Remaining;
- byte v;
+ //byte v; // LUCENENET: Not used
for (int i = start; i < n; i++)
ck(b, (long)b.Get(), (long)((byte)Ic(i)));
b.Rewind();
@@ -41,7 +41,7 @@ namespace Lucene.Net.Support
private static void absGet(ByteBuffer b)
{
int n = b.Capacity;
- byte v;
+ //byte v; // LUCENENET: Not used
for (int i = 0; i < n; i++)
ck(b, (long)b.Get(), (long)((byte)Ic(i)));
b.Rewind();
@@ -126,7 +126,7 @@ namespace Lucene.Net.Support
{
int n = bs.Length;
int p = b.Position;
- byte v;
+ //byte v; // LUCENENET: Not used
if (b.Order == ByteOrder.BIG_ENDIAN)
{
for (int i = 0; i < n; i++)
@@ -382,7 +382,7 @@ namespace Lucene.Net.Support
b.Put(unchecked((byte)sbyte.MaxValue));
b.Put(unchecked((byte)sbyte.MinValue));
- byte v;
+ //byte v; // LUCENENET: Not used
b.Flip();
ck(b, b.Get(), 0);
ck(b, b.Get(), unchecked((byte)-1));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/096a3174/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs b/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
index e31d35e..3df1596 100644
--- a/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestLongBuffer.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Support
private static void relGet(LongBuffer b)
{
int n = b.Capacity;
- long v;
+ //long v; // LUCENENET: Not used
for (int i = 0; i < n; i++)
ck(b, (long)b.Get(), (long)((long)Ic(i)));
b.Rewind();
@@ -31,7 +31,7 @@ namespace Lucene.Net.Support
private static void relGet(LongBuffer b, int start)
{
int n = b.Remaining;
- long v;
+ //long v; // LUCENENET: Not used
for (int i = start; i < n; i++)
ck(b, (long)b.Get(), (long)((long)Ic(i)));
b.Rewind();
@@ -40,7 +40,7 @@ namespace Lucene.Net.Support
private static void absGet(LongBuffer b)
{
int n = b.Capacity;
- long v;
+ //long v; // LUCENENET: Not used
for (int i = 0; i < n; i++)
ck(b, (long)b.Get(), (long)((long)Ic(i)));
b.Rewind();
@@ -265,7 +265,7 @@ namespace Lucene.Net.Support
b.Put(long.MaxValue);
b.Put(long.MinValue);
- long v;
+ //long v; // LUCENENET: Not used
b.Flip();
ck(b, b.Get(), 0);
ck(b, b.Get(), (long)-1);
[02/50] [abbrv] lucenenet git commit:
Lucene.Net.TestFramework.Analysis.MockGraphTokenFilter: added new keyword to
DEBUG field because of conflict with inherited field.
Posted by ni...@apache.org.
Lucene.Net.TestFramework.Analysis.MockGraphTokenFilter: added new keyword to DEBUG field because of conflict with inherited field.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/35f1a4d5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/35f1a4d5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/35f1a4d5
Branch: refs/heads/api-work
Commit: 35f1a4d56d3f82b2416e835036b97cd54d6451f7
Parents: 7a9be36
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 01:38:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:44 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/35f1a4d5/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
index cfba67b..5db031e 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Analysis
public sealed class MockGraphTokenFilter : LookaheadTokenFilter<LookaheadTokenFilter.Position>
{
- private static bool DEBUG = false;
+ new private static bool DEBUG = false;
private readonly ICharTermAttribute TermAtt;
[14/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Util.TestPriorityQueue: added new keyword to Less and
Greater classes because they conflict with members of the NUnit Assert class
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Util.TestPriorityQueue: added new keyword to Less and Greater classes because they conflict with members of the NUnit Assert class
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/bde76bf4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/bde76bf4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/bde76bf4
Branch: refs/heads/api-work
Commit: bde76bf46eedfc0d64886e09f7f67d8682024bbd
Parents: 5e39a91
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:18:00 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bde76bf4/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs b/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
index fe88289..d87d08c 100644
--- a/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
@@ -182,7 +182,7 @@ namespace Lucene.Net.Util
}
}
- private class Less : IComparer<int?>
+ new private class Less : IComparer<int?>
{
public int Compare(int? a, int? b)
{
@@ -192,7 +192,7 @@ namespace Lucene.Net.Util
}
}
- private class Greater : IComparer<int?>
+ new private class Greater : IComparer<int?>
{
public int Compare(int? a, int? b)
{
[24/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Index.TestDirectoryReaderReopen.KeepAllCommits: made
non-generic (as it was originally) to prevent collisions with the generic
closing type of its methods.
Posted by ni...@apache.org.
Lucene.Net.Tests.Index.TestDirectoryReaderReopen.KeepAllCommits: made non-generic (as it was originally) to prevent collisions with the generic closing type of its methods.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5f25653f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5f25653f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5f25653f
Branch: refs/heads/api-work
Commit: 5f25653fd934fab7e35b16c93e08a42511423449
Parents: c0c42f9
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:49:40 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5f25653f/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
index 2e1c4ef..bb52f58 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
@@ -684,8 +684,7 @@ namespace Lucene.Net.Index
protected internal abstract void ModifyIndex(int i);
}
- internal class KeepAllCommits<T> : IndexDeletionPolicy
- where T : IndexCommit
+ internal class KeepAllCommits : IndexDeletionPolicy
{
public override void OnInit<T>(IList<T> commits)
{
@@ -700,7 +699,7 @@ namespace Lucene.Net.Index
public virtual void TestReopenOnCommit()
{
Directory dir = NewDirectory();
- IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(new KeepAllCommits<IndexCommit>()).SetMaxBufferedDocs(-1).SetMergePolicy(NewLogMergePolicy(10)));
+ IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(new KeepAllCommits()).SetMaxBufferedDocs(-1).SetMergePolicy(NewLogMergePolicy(10)));
for (int i = 0; i < 4; i++)
{
Document doc = new Document();
[18/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.BinaryTokenStream.IByteTermAttribute: Added new
keyword to BytesRef property because it hides a property with the same name
in the base interface
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.BinaryTokenStream.IByteTermAttribute: Added new keyword to BytesRef property because it hides a property with the same name in the base interface
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3bd0c902
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3bd0c902
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3bd0c902
Branch: refs/heads/api-work
Commit: 3bd0c902f7f1f69cdbccf59c0f6ae2b77f4d1c9b
Parents: c19abfe
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:09:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/BinaryTokenStream.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3bd0c902/src/Lucene.Net.Tests/core/Index/BinaryTokenStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/BinaryTokenStream.cs b/src/Lucene.Net.Tests/core/Index/BinaryTokenStream.cs
index a78cdf8..cc1ead2 100644
--- a/src/Lucene.Net.Tests/core/Index/BinaryTokenStream.cs
+++ b/src/Lucene.Net.Tests/core/Index/BinaryTokenStream.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Index
public interface IByteTermAttribute : ITermToBytesRefAttribute
{
- BytesRef BytesRef { set; }
+ new BytesRef BytesRef { get; set; }
}
public class ByteTermAttribute : Attribute, IByteTermAttribute
[27/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestIndexWriterExceptions: added new keyword to
DoFail because it conflicts with a field of the same name in the base class
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestIndexWriterExceptions: added new keyword to DoFail because it conflicts with a field of the same name in the base class
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1e116111
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1e116111
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1e116111
Branch: refs/heads/api-work
Commit: 1e11611151755ebffa2d9eff08bad3a3bd422323
Parents: e682342
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 04:45:09 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1e116111/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index ff7bd8a..5d45b7d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -702,7 +702,7 @@ namespace Lucene.Net.Index
private class FailOnlyOnFlush : MockDirectoryWrapper.Failure
{
- internal bool DoFail = false;
+ new internal bool DoFail = false;
internal int Count;
public override void SetDoFail()
[36/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Queries.TestCustomScoreQuery.CustomScoreProviderAnonymousInnerClassHelper:
Removed unnecessary context variable (using the one in the base class)
Posted by ni...@apache.org.
Lucene.Net.Tests.Queries.TestCustomScoreQuery.CustomScoreProviderAnonymousInnerClassHelper: Removed unnecessary context variable (using the one in the base class)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/75eeb851
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/75eeb851
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/75eeb851
Branch: refs/heads/api-work
Commit: 75eeb851ae2a4694136ef3402953594b251e3e6d
Parents: aa9e48a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:40:04 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/75eeb851/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
index c2debc8..e18a41f 100644
--- a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
@@ -192,13 +192,11 @@ namespace Lucene.Net.Tests.Queries
{
private readonly CustomExternalQuery outerInstance;
- private AtomicReaderContext context;
private FieldCache.Ints values;
public CustomScoreProviderAnonymousInnerClassHelper(CustomExternalQuery outerInstance, AtomicReaderContext context, FieldCache.Ints values) : base(context)
{
this.outerInstance = outerInstance;
- this.context = context;
this.values = values;
}
[26/50] [abbrv] lucenenet git commit: BUG:
Lucene.Net.Tests.Core.Index.TestTransactions: Class qualifier missing on
DoFail variable in RandomFailure class was causing the failure not to happen.
Test is now (correctly) failing because of an unhandled exce
Posted by ni...@apache.org.
BUG: Lucene.Net.Tests.Core.Index.TestTransactions: Class qualifier missing on DoFail variable in RandomFailure class was causing the failure not to happen. Test is now (correctly) failing because of an unhandled exception somewhere.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/49fa531b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/49fa531b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/49fa531b
Branch: refs/heads/api-work
Commit: 49fa531bbafe2f81c58f7ccb3e744b7733b1be13
Parents: 5f25653
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:04:57 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestTransactions.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/49fa531b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTransactions.cs b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
index 24f539f..627b21c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTransactions.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Index
public override void Eval(MockDirectoryWrapper dir)
{
- if (DoFail && Random().Next() % 10 <= 3)
+ if (TestTransactions.DoFail && Random().Next() % 10 <= 3)
{
throw new IOException("now failing randomly but on purpose");
}
[41/50] [abbrv] lucenenet git commit: Lucene.Net.Codecs: suppressed
obsolete warnings
Posted by ni...@apache.org.
Lucene.Net.Codecs: suppressed obsolete warnings
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0df5a83e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0df5a83e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0df5a83e
Branch: refs/heads/api-work
Commit: 0df5a83e18599e8ad9c78eabee7e7718279a0bad
Parents: dcb41d8
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:31:00 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Codecs/Appending/AppendingPostingsFormat.cs | 2 ++
src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs | 4 +++-
src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs | 2 ++
src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs | 2 ++
src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs | 2 ++
5 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0df5a83e/src/Lucene.Net.Codecs/Appending/AppendingPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Appending/AppendingPostingsFormat.cs b/src/Lucene.Net.Codecs/Appending/AppendingPostingsFormat.cs
index ff427dc..3270383 100644
--- a/src/Lucene.Net.Codecs/Appending/AppendingPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Appending/AppendingPostingsFormat.cs
@@ -38,6 +38,7 @@ namespace Lucene.Net.Codecs.Appending
public override FieldsProducer FieldsProducer(SegmentReadState state)
{
+#pragma warning disable 612, 618
using (var postings = new Lucene40PostingsReader(state.Directory, state.FieldInfos,
state.SegmentInfo,
state.Context, state.SegmentSuffix))
@@ -53,6 +54,7 @@ namespace Lucene.Net.Codecs.Appending
return ret;
}
+#pragma warning restore 612, 618
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0df5a83e/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
index facbf59..94e3f0e 100644
--- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
@@ -162,9 +162,11 @@ namespace Lucene.Net.Codecs.Bloom
}
else
{
+#pragma warning disable 612, 618
CodecUtil.CheckEOF(bloomIn);
+#pragma warning restore 612, 618
}
-
+
IOUtils.Close(bloomIn);
success = true;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0df5a83e/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
index 2e41329..4cddc93 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
@@ -78,7 +78,9 @@ namespace Lucene.Net.Codecs.Memory
}
else
{
+#pragma warning disable 612, 618
CodecUtil.CheckEOF(@in);
+#pragma warning restore 612, 618
}
success = true;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0df5a83e/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
index bd369f1..9e60be7 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
@@ -97,7 +97,9 @@ namespace Lucene.Net.Codecs.Memory
}
else
{
+#pragma warning disable 612, 618
CodecUtil.CheckEOF(indexIn);
+#pragma warning restore 612, 618
}
success = true;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0df5a83e/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
index eaaf884..2f9b219 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
@@ -91,7 +91,9 @@ namespace Lucene.Net.Codecs.Memory
}
else
{
+#pragma warning disable 612, 618
CodecUtil.CheckEOF(@in);
+#pragma warning restore 612, 618
}
ramBytesUsed = new AtomicLong(RamUsageEstimator.ShallowSizeOfInstance(this.GetType()));
success = true;
[43/50] [abbrv] lucenenet git commit:
Lucene.Net.Expressions.JS.JavascriptParser: commented unused variables
Posted by ni...@apache.org.
Lucene.Net.Expressions.JS.JavascriptParser: commented unused variables
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/baa865a9
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/baa865a9
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/baa865a9
Branch: refs/heads/api-work
Commit: baa865a9a1261b948639ac6460679797ee719ee0
Parents: 883d941
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:24:23 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
.../JS/JavascriptParser.cs | 33 ++++++++++----------
1 file changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/baa865a9/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/JS/JavascriptParser.cs b/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
index 9844fab..5b77351 100644
--- a/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
+++ b/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
@@ -363,7 +363,7 @@ namespace Lucene.Net.Expressions.JS
CommonTree root = null;
IToken EOF2 = null;
AstParserRuleReturnScope<ITree, IToken> conditional1;
- CommonTree EOF2_tree = null;
+ //CommonTree EOF2_tree = null; // LUCENENET NOTE: Not used
try
{
{
@@ -404,7 +404,7 @@ namespace Lucene.Net.Expressions.JS
AstParserRuleReturnScope<ITree, IToken> conditional5;
AstParserRuleReturnScope<ITree, IToken> conditional7;
CommonTree AT_COND_QUE4_tree;
- CommonTree AT_COLON6_tree = null;
+ //CommonTree AT_COLON6_tree = null; // LUCENENET NOTE: Not used
try
{
{
@@ -798,7 +798,7 @@ namespace Lucene.Net.Expressions.JS
public AstParserRuleReturnScope<ITree, IToken> Equality()
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
- CommonTree set24_tree = null;
+ //CommonTree set24_tree = null; // LUCENENET NOTE: Not used
try
{
CommonTree root = null;
@@ -876,7 +876,7 @@ namespace Lucene.Net.Expressions.JS
public AstParserRuleReturnScope<ITree, IToken> Relational()
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
- CommonTree set27_tree = null;
+ //CommonTree set27_tree = null; // LUCENENET NOTE: Not used
try
{
CommonTree root = null;
@@ -954,7 +954,7 @@ namespace Lucene.Net.Expressions.JS
public AstParserRuleReturnScope<ITree, IToken> Shift()
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
- CommonTree set30_tree = null;
+ //CommonTree set30_tree = null; // LUCENENET NOTE: Not used
try
{
CommonTree root = null;
@@ -1032,7 +1032,7 @@ namespace Lucene.Net.Expressions.JS
public AstParserRuleReturnScope<ITree, IToken> Additive()
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
- CommonTree set33_tree = null;
+ //CommonTree set33_tree = null; // LUCENENET NOTE: Not used
try
{
CommonTree root = null;
@@ -1109,7 +1109,7 @@ namespace Lucene.Net.Expressions.JS
public AstParserRuleReturnScope<ITree, IToken> Multiplicative()
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
- CommonTree set36_tree = null;
+ //CommonTree set36_tree = null; // LUCENENET NOTE: Not used
try
{
CommonTree root = null;
@@ -1189,7 +1189,7 @@ namespace Lucene.Net.Expressions.JS
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
CommonTree root = null;
- CommonTree AT_ADD39_tree = null;
+ //CommonTree AT_ADD39_tree = null; // LUCENENET NOTE: Not used
try
{
// src/java/org/apache/lucene/expressions/js/Javascript.g:299:5: ( postfix | AT_ADD ! unary | unary_operator ^ unary )
@@ -1289,7 +1289,7 @@ namespace Lucene.Net.Expressions.JS
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
CommonTree root = null;
- CommonTree AT_SUBTRACT43_tree = null;
+ //CommonTree AT_SUBTRACT43_tree = null; // LUCENENET NOTE: Not used
RewriteRuleTokenStream stream_AT_SUBTRACT = new RewriteRuleTokenStream(adaptor, "token AT_SUBTRACT"
);
try
@@ -1393,7 +1393,7 @@ namespace Lucene.Net.Expressions.JS
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
CommonTree root = null;
- CommonTree NAMESPACE_ID47_tree = null;
+ //CommonTree NAMESPACE_ID47_tree = null; // LUCENENET NOTE: Not used
var streamNamespaceId = new RewriteRuleTokenStream(adaptor, "token NAMESPACE_ID");
var streamArguments = new RewriteRuleSubtreeStream(adaptor, "rule arguments");
try
@@ -1527,8 +1527,8 @@ namespace Lucene.Net.Expressions.JS
IToken AT_LPAREN51 = null;
IToken AT_RPAREN53 = null;
CommonTree NAMESPACE_ID49_tree = null;
- CommonTree AT_LPAREN51_tree = null;
- CommonTree AT_RPAREN53_tree = null;
+ //CommonTree AT_LPAREN51_tree = null; // LUCENENET NOTE: Not used
+ //CommonTree AT_RPAREN53_tree = null; // LUCENENET NOTE: Not used
try
{
// src/java/org/apache/lucene/expressions/js/Javascript.g:316:5: ( NAMESPACE_ID | numeric | AT_LPAREN ! conditional AT_RPAREN !)
@@ -1623,9 +1623,9 @@ namespace Lucene.Net.Expressions.JS
IToken AT_LPAREN54 = null;
IToken AT_COMMA56 = null;
IToken AT_RPAREN58 = null;
- CommonTree AT_LPAREN54_tree = null;
- CommonTree AT_COMMA56_tree = null;
- CommonTree AT_RPAREN58_tree = null;
+ //CommonTree AT_LPAREN54_tree = null; // LUCENENET NOTE: Not used
+ //CommonTree AT_COMMA56_tree = null; // LUCENENET NOTE: Not used
+ //CommonTree AT_RPAREN58_tree = null; // LUCENENET NOTE: Not used
try
{
{
@@ -1708,7 +1708,8 @@ namespace Lucene.Net.Expressions.JS
public AstParserRuleReturnScope<ITree, IToken> Numeric()
{
var retval = new AstParserRuleReturnScope<ITree, IToken> { Start = input.LT(1) };
- CommonTree set59_tree = null;
+
+ //CommonTree set59_tree = null; // LUCENENET NOTE: Not used
try
{
CommonTree root = null;
[17/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestCompoundFile: Changed explicit long
declaration from 'l' to 'L' "for clarity"
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestCompoundFile: Changed explicit long declaration from 'l' to 'L' "for clarity"
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/99119dd4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/99119dd4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/99119dd4
Branch: refs/heads/api-work
Commit: 99119dd4023247e7d8968e86239a9016d8a88387
Parents: 8902ace
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:05:30 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99119dd4/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
index 179ffcf..c291379 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
@@ -124,7 +124,7 @@ namespace Lucene.Net.Index
AssertSameStreams(msg + ", seek(0)", expected, actual, point);
// seek to middle
- point = expected.Length / 2l;
+ point = expected.Length / 2L;
AssertSameStreams(msg + ", seek(mid)", expected, actual, point);
// seek to end - 2
[49/50] [abbrv] lucenenet git commit: Removed references to NUnit
2.6.3 (they were causing conflicts). Updated Ignore attribute with a reason
in TestWorstCaseTestBehavior.
Posted by ni...@apache.org.
Removed references to NUnit 2.6.3 (they were causing conflicts). Updated Ignore attribute with a reason in TestWorstCaseTestBehavior.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5d8d81a8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5d8d81a8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5d8d81a8
Branch: refs/heads/api-work
Commit: 5d8d81a83091743a998ea73e0fa63f9ea619a1d2
Parents: eee04c4
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 10:02:09 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 10:02:09 2017 +0700
----------------------------------------------------------------------
.../Lucene.Net.TestFramework.csproj | 3 ---
.../Lucene.Net.Tests.Analysis.Common.csproj | 4 ----
.../Lucene.Net.Tests.Analysis.Stempel.csproj | 4 ----
.../Lucene.Net.Tests.Classification.csproj | 4 ----
.../Lucene.Net.Tests.Codecs.csproj | 3 ---
.../Lucene.Net.Tests.Expressions.csproj | 4 ----
.../Lucene.Net.Tests.Facet.csproj | 3 ---
.../Lucene.Net.Tests.Grouping.csproj | 4 ----
src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj | 4 ----
.../Lucene.Net.Tests.Memory.csproj | 4 ----
src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj | 4 ----
.../Lucene.Net.Tests.Queries.csproj | 3 ---
.../Lucene.Net.Tests.QueryParser.csproj | 3 ---
.../Lucene.Net.Tests.Suggest.csproj | 4 ----
src/Lucene.Net.Tests/Lucene.Net.Tests.csproj | 3 ---
src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs | 12 ++++++------
16 files changed, 6 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index c7010dc..24dfb53 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -42,9 +42,6 @@
<DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index a500e8f..2d0d85b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -41,10 +41,6 @@
<HintPath>..\..\packages\ICU4NET-ICU4C55.1-bin32.1.0.0\lib\net45\ICU4NETExtension.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
index ee7fb9c..93faaa7 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
index 50a2281..d302a0f 100644
--- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
+++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
index 31efd73..16c1db9 100644
--- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
+++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
@@ -30,9 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
index 8e26363..2fc503d 100644
--- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
+++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
index 709fd35..650ff85 100644
--- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
+++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
@@ -33,9 +33,6 @@
<DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY;FEATURE_THREADINTERRUPTEDEXCEPTION</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
index 9016669..5551b2b 100644
--- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
+++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
index 394e255..5451857 100644
--- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
+++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
index 0879369..568504c 100644
--- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
+++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
index 1da0f0c..e086eea 100644
--- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
+++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
index 71f9ff2..afb5db7 100644
--- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
+++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
@@ -30,9 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
index c3ef905..61c0e43 100644
--- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
+++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
@@ -30,9 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
index 7da9ec3..92e9afd 100644
--- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
+++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
@@ -33,10 +33,6 @@
<DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
index 5e8b740..eaf36a9 100644
--- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
+++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
@@ -40,9 +40,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d8d81a8/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs b/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
index 709990f..531c7d9 100644
--- a/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
+++ b/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net
public class TestWorstCaseTestBehavior : LuceneTestCase
{
- [Ignore]
+ [Ignore("Ignored in Lucene")]
[Test]
public virtual void TestThreadLeak()
{
@@ -64,7 +64,7 @@ namespace Lucene.Net
}
}
- [Ignore]
+ [Ignore("Ignored in Lucene")]
[Test]
public virtual void TestLaaaaaargeOutput()
{
@@ -83,7 +83,7 @@ namespace Lucene.Net
}
- [Ignore]
+ [Ignore("Ignored in Lucene")]
[Test]
public virtual void TestProgressiveOutput()
{
@@ -97,7 +97,7 @@ namespace Lucene.Net
}
}
- [Ignore]
+ [Ignore("Ignored in Lucene")]
[Test]
public virtual void TestUncaughtException()
{
@@ -121,7 +121,7 @@ namespace Lucene.Net
}
}
- [Ignore]
+ [Ignore("Ignored in Lucene")]
[Test, Timeout(500)]
public virtual void TestTimeout()
{
@@ -129,7 +129,7 @@ namespace Lucene.Net
}
- [Ignore]
+ [Ignore("Ignored in Lucene")]
[Test, Timeout(1000)]
public virtual void TestZombie()
{
[33/50] [abbrv] lucenenet git commit:
Lucene.Net.Classification.Utils.DataSplitterTest: suppressed warning about
unused exception variable
Posted by ni...@apache.org.
Lucene.Net.Classification.Utils.DataSplitterTest: suppressed warning about unused exception variable
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/aaff5823
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/aaff5823
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/aaff5823
Branch: refs/heads/api-work
Commit: aaff58233d6f801c957f040229923bbca90d1ea9
Parents: f55556a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:13:18 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aaff5823/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
index 765e262..4dc0a69 100644
--- a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
+++ b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs
@@ -136,7 +136,9 @@ namespace Lucene.Net.Classification
if (reader != null)
reader.Dispose();
}
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
// do nothing
}
[35/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Grouping.DistinctValuesCollectorTest: Commented unused
fields (that were also unused in Lucene)
Posted by ni...@apache.org.
Lucene.Net.Tests.Grouping.DistinctValuesCollectorTest: Commented unused fields (that were also unused in Lucene)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0326cc9c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0326cc9c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0326cc9c
Branch: refs/heads/api-work
Commit: 0326cc9cec40e26adafafd4bf20bba38f6e3117f
Parents: aaff582
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:23:02 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0326cc9c/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
index 3f9e7d1..c481373 100644
--- a/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
@@ -40,9 +40,9 @@ namespace Lucene.Net.Search.Grouping
private readonly static NullComparer nullComparer = new NullComparer();
private readonly string groupField = "author";
- private readonly string dvGroupField = "author_dv";
+ //private readonly string dvGroupField = "author_dv"; // LUCENENET NOTE: Not used in Lucene
private readonly string countField = "publisher";
- private readonly string dvCountField = "publisher_dv";
+ //private readonly string dvCountField = "publisher_dv"; // LUCENENET NOTE: Not used in Lucene
internal class ComparerAnonymousHelper1 : IComparer<AbstractDistinctValuesCollector.IGroupCount<IComparable>>
{
[39/50] [abbrv] lucenenet git commit: Lucene.Net.Tests.Queries:
Suppressed unused variable warnings about exception variables and obsolete
warnings
Posted by ni...@apache.org.
Lucene.Net.Tests.Queries: Suppressed unused variable warnings about exception variables and obsolete warnings
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/aa9e48ae
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/aa9e48ae
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/aa9e48ae
Branch: refs/heads/api-work
Commit: aa9e48ae547f0c3e68198a020269a24f16f91dc2
Parents: 9aa8d66
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:38:41 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs | 6 ++++++
src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs | 2 ++
src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs | 4 ++++
src/Lucene.Net.Tests.Queries/TermFilterTest.cs | 4 ++++
4 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aa9e48ae/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
index 7f529d8..aa0b481 100644
--- a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
+++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
@@ -142,7 +142,9 @@ namespace Lucene.Net.Tests.Queries
query.Add(null);
Fail(@"null values are not supported");
}
+#pragma warning disable 168
catch (ArgumentException ex)
+#pragma warning restore 168
{
}
}
@@ -285,7 +287,9 @@ namespace Lucene.Net.Tests.Queries
new CommonTermsQuery(Occur.MUST_NOT, RandomOccur(random), Random().NextFloat());
Fail(@"MUST_NOT is not supproted");
}
+#pragma warning disable 168
catch (ArgumentException ex)
+#pragma warning restore 168
{
}
@@ -294,7 +298,9 @@ namespace Lucene.Net.Tests.Queries
new CommonTermsQuery(RandomOccur(random), Occur.MUST_NOT, Random().NextFloat());
Fail(@"MUST_NOT is not supproted");
}
+#pragma warning disable 168
catch (ArgumentException ex)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aa9e48ae/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 b06d52c..2fd778a 100644
--- a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
@@ -29,8 +29,10 @@ namespace Lucene.Net.Tests.Queries.Function
protected internal const string INT_FIELD = "iii";
protected internal const string FLOAT_FIELD = "fff";
+#pragma warning disable 612, 618
protected internal ValueSource BYTE_VALUESOURCE = new ByteFieldSource(INT_FIELD);
protected internal ValueSource SHORT_VALUESOURCE = new ShortFieldSource(INT_FIELD);
+#pragma warning restore 612, 618
protected internal ValueSource INT_VALUESOURCE = new IntFieldSource(INT_FIELD);
protected internal ValueSource INT_AS_FLOAT_VALUESOURCE = new FloatFieldSource(INT_FIELD);
protected internal ValueSource FLOAT_VALUESOURCE = new FloatFieldSource(FLOAT_FIELD);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aa9e48ae/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs b/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
index 8b91a40..35ce6a0 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestValueSources.cs
@@ -94,7 +94,9 @@ namespace Lucene.Net.Tests.Queries.Function
[Test]
public void TestByte()
{
+#pragma warning disable 612, 618
AssertHits(new FunctionQuery(new ByteFieldSource("byte")), new[] { 5f, 12f });
+#pragma warning restore 612, 618
}
[Test]
@@ -262,7 +264,9 @@ namespace Lucene.Net.Tests.Queries.Function
[Test]
public void TestShort()
{
+#pragma warning disable 612, 618
AssertHits(new FunctionQuery(new ShortFieldSource("short")), new[] { 945f, 123f });
+#pragma warning restore 612, 618
}
[Test]
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aa9e48ae/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
index e273518..9169e46 100644
--- a/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
+++ b/src/Lucene.Net.Tests.Queries/TermFilterTest.cs
@@ -144,7 +144,9 @@ namespace Lucene.Net.Tests.Queries
new TermFilter(null);
Fail(@"must fail - no term!");
}
+#pragma warning disable 168
catch (ArgumentException e)
+#pragma warning restore 168
{
}
@@ -153,7 +155,9 @@ namespace Lucene.Net.Tests.Queries
new TermFilter(new Term(null));
Fail(@"must fail - no field!");
}
+#pragma warning disable 168
catch (ArgumentException e)
+#pragma warning restore 168
{
}
}
[06/50] [abbrv] lucenenet git commit: Lucene.Net.Tests: suppressed
obsolete warnings
Posted by ni...@apache.org.
Lucene.Net.Tests: suppressed obsolete warnings
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/15efa51c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/15efa51c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/15efa51c
Branch: refs/heads/api-work
Commit: 15efa51c31ac7898aab7c08faa64de627e2a8a68
Parents: 86686bf
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 02:58:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:45 2017 +0700
----------------------------------------------------------------------
.../core/Codecs/Lucene3x/TestSurrogates.cs | 2 ++
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 2 ++
.../core/Document/TestDocument.cs | 2 ++
.../core/Index/TestBackwardsCompatibility3x.cs | 2 ++
.../core/Index/TestBagOfPostings.cs | 2 ++
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 4 ++++
.../core/Index/TestDirectoryReader.cs | 4 ++++
.../core/Index/TestDocValuesWithThreads.cs | 2 ++
.../core/Index/TestIndexWriterUnicode.cs | 2 ++
.../core/Index/TestIndexableField.cs | 2 ++
.../core/Index/TestMultiFields.cs | 2 ++
src/Lucene.Net.Tests/core/Index/TestPayloads.cs | 6 +++++
.../core/Index/TestStoredFieldsFormat.cs | 2 ++
.../core/Index/TestTermVectorsFormat.cs | 2 ++
.../core/Search/Spans/TestBasics.cs | 10 ++++++++
.../TestControlledRealTimeReopenThread.cs | 6 ++++-
.../core/Search/TestFieldCache.cs | 6 +++++
.../core/Search/TestFieldCacheRangeFilter.cs | 5 ++++
.../core/Search/TestSearchAfter.cs | 25 +++++++++++++++++++-
src/Lucene.Net.Tests/core/Search/TestSort.cs | 16 +++++++++++++
.../core/Search/TestSortDocValues.cs | 8 +++++++
.../core/Util/TestBytesRefArray.cs | 2 ++
.../core/Util/TestBytesRefHash.cs | 2 ++
src/Lucene.Net.Tests/core/Util/TestCharsRef.cs | 2 ++
.../core/Util/TestFieldCacheSanityChecker.cs | 5 +++-
.../core/Util/TestOfflineSorter.cs | 2 ++
src/Lucene.Net.Tests/core/Util/TestVersion.cs | 2 ++
27 files changed, 124 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 fee2e0d..e24025d 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -105,7 +105,9 @@ namespace Lucene.Net.Codecs.Lucene3x
private sealed class SortTermAsUTF16Comparer : IComparer<Term>
{
+#pragma warning disable 612, 618
private static readonly IComparer<BytesRef> LegacyComparer = BytesRef.UTF8SortedAsUTF16Comparer;
+#pragma warning restore 612, 618
public int Compare(Term term1, Term term2)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 ce40e9d..dd48238 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -50,6 +50,7 @@ namespace Lucene.Net.Codecs.Lucene3x
using TestUtil = Lucene.Net.Util.TestUtil;
using TopDocs = Lucene.Net.Search.TopDocs;
+#pragma warning disable 612, 618
[TestFixture]
public class TestTermInfosReaderIndex : LuceneTestCase
{
@@ -230,4 +231,5 @@ namespace Lucene.Net.Codecs.Lucene3x
}
}
}
+#pragma warning restore 612, 618
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index 555ce87..0f30dc4 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -363,6 +363,7 @@ namespace Lucene.Net.Documents
RandomIndexWriter w = new RandomIndexWriter(Random(), dir, Similarity, TimeZone);
Documents.Document doc = new Documents.Document();
+#pragma warning disable 612, 618
doc.Add(new Field("stored", "abc", Field.Store.YES, Field.Index.NO));
doc.Add(new Field("stored_indexed", "abc xyz", Field.Store.YES, Field.Index.NOT_ANALYZED));
doc.Add(new Field("stored_tokenized", "abc xyz", Field.Store.YES, Field.Index.ANALYZED));
@@ -375,6 +376,7 @@ namespace Lucene.Net.Documents
doc.Add(new Field("tv_pos", "abc xyz", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS));
doc.Add(new Field("tv_off", "abc xyz", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_OFFSETS));
doc.Add(new Field("tv_pos_off", "abc xyz", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+#pragma warning restore 612, 618
w.AddDocument(doc);
IndexReader r = w.Reader;
w.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 0911dc0..50e8b43 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -239,7 +239,9 @@ namespace Lucene.Net.Index
MemoryStream bos = new MemoryStream(1024);
CheckIndex checker = new CheckIndex(dir);
+#pragma warning disable 612, 618
checker.InfoStream = new StreamWriter(bos.ToString(), false, IOUtils.CHARSET_UTF_8);
+#pragma warning restore 612, 618
CheckIndex.Status indexStatus = checker.DoCheckIndex();
Assert.IsFalse(indexStatus.Clean);
Assert.IsTrue(bos.ToString().Contains(typeof(IndexFormatTooOldException).Name));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs b/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
index 246a6fb..607961b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
@@ -110,8 +110,10 @@ namespace Lucene.Net.Index
AtomicReader air = (AtomicReader)ir.Leaves[0].Reader;
Terms terms = air.Terms("field");
// numTerms-1 because there cannot be a term 0 with 0 postings:
+#pragma warning disable 612, 618
Assert.AreEqual(numTerms - 1, air.Fields.UniqueTermCount);
if (iwc.Codec is Lucene3xCodec == false)
+#pragma warning restore 612, 618
{
Assert.AreEqual(numTerms - 1, terms.Count);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 acc5093..4247869 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -630,7 +630,9 @@ namespace Lucene.Net.Index
{
FieldData field = Fields[Random().Next(Fields.Length)];
TermsEnum termsEnum = TermsDict.Terms(field.FieldInfo.Name).Iterator(null);
+#pragma warning disable 612, 618
if (Si.Codec is Lucene3xCodec)
+#pragma warning restore 612, 618
{
// code below expects unicode sort order
continue;
@@ -849,7 +851,9 @@ namespace Lucene.Net.Index
Array.Sort(fields);
foreach (FieldData field in fields)
{
+#pragma warning disable 612, 618
if (!allowPreFlex && codec is Lucene3xCodec)
+#pragma warning restore 612, 618
{
// code below expects unicode sort order
continue;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 edbf47f..39a094d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -857,7 +857,9 @@ namespace Lucene.Net.Index
DirectoryReader r = DirectoryReader.Open(dir);
AtomicReader r1 = GetOnlySegmentReader(r);
+#pragma warning disable 612, 618
Assert.AreEqual(36, r1.Fields.UniqueTermCount);
+#pragma warning restore 612, 618
writer.AddDocument(doc);
writer.Commit();
DirectoryReader r2 = DirectoryReader.OpenIfChanged(r);
@@ -866,7 +868,9 @@ namespace Lucene.Net.Index
foreach (AtomicReaderContext s in r2.Leaves)
{
+#pragma warning disable 612, 618
Assert.AreEqual(36, ((AtomicReader)s.Reader).Fields.UniqueTermCount);
+#pragma warning restore 612, 618
}
r2.Dispose();
writer.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs b/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
index b12e94e..8d0ea97 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocValuesWithThreads.cs
@@ -139,6 +139,7 @@ namespace Lucene.Net.Index
int docID = ThreadRandom.Next(NumDocs);
switch (ThreadRandom.Next(6))
{
+#pragma warning disable 612, 618
case 0:
Assert.AreEqual((long)(sbyte)Numbers[docID], FieldCache.DEFAULT.GetBytes(Ar, "number", false).Get(docID));
break;
@@ -146,6 +147,7 @@ namespace Lucene.Net.Index
case 1:
Assert.AreEqual((long)(short)Numbers[docID], FieldCache.DEFAULT.GetShorts(Ar, "number", false).Get(docID));
break;
+#pragma warning restore 612, 618
case 2:
Assert.AreEqual((long)(int)Numbers[docID], FieldCache.DEFAULT.GetInts(Ar, "number", false).Get(docID));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
index 8ad2d4f..0e4862b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
@@ -203,7 +203,9 @@ namespace Lucene.Net.Index
UnicodeUtil.UTF16toUTF8(buffer, 0, 20, utf8);
if (!hasIllegal)
{
+#pragma warning disable 612, 618
var b = (new string(buffer, 0, 20)).GetBytes(IOUtils.CHARSET_UTF_8);
+#pragma warning restore 612, 618
Assert.AreEqual(b.Length, utf8.Length);
for (int i = 0; i < b.Length; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index 17ab39f..68986a0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -108,7 +108,9 @@ namespace Lucene.Net.Index
{
get
{
+#pragma warning disable 612, 618
if (Codec.Default is Lucene3xCodec)
+#pragma warning restore 612, 618
{
return false; // 3.x doesnt support
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestMultiFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestMultiFields.cs b/src/Lucene.Net.Tests/core/Index/TestMultiFields.cs
index b90d1ae..0d70862 100644
--- a/src/Lucene.Net.Tests/core/Index/TestMultiFields.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestMultiFields.cs
@@ -110,7 +110,9 @@ namespace Lucene.Net.Index
if (VERBOSE)
{
List<BytesRef> termsList = new List<BytesRef>(uniqueTerms);
+#pragma warning disable 612, 618
termsList.Sort(BytesRef.UTF8SortedAsUTF16Comparer);
+#pragma warning restore 612, 618
Console.WriteLine("TEST: terms in UTF16 order:");
foreach (BytesRef b in termsList)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
index 40a1ccf..6278405 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
@@ -78,7 +78,9 @@ namespace Lucene.Net.Index
// enabled in only some documents
d.Add(NewTextField("f3", "this field has payloads in some docs", Field.Store.NO));
// only add payload data for field f2
+#pragma warning disable 612, 618
analyzer.SetPayloadData("f2", "somedata".GetBytes(IOUtils.CHARSET_UTF_8), 0, 1);
+#pragma warning restore 612, 618
writer.AddDocument(d);
// flush
writer.Dispose();
@@ -100,8 +102,10 @@ namespace Lucene.Net.Index
d.Add(NewTextField("f2", "this field has payloads in all docs", Field.Store.NO));
d.Add(NewTextField("f3", "this field has payloads in some docs", Field.Store.NO));
// add payload data for field f2 and f3
+#pragma warning disable 612, 618
analyzer.SetPayloadData("f2", "somedata".GetBytes(IOUtils.CHARSET_UTF_8), 0, 1);
analyzer.SetPayloadData("f3", "somedata".GetBytes(IOUtils.CHARSET_UTF_8), 0, 3);
+#pragma warning restore 612, 618
writer.AddDocument(d);
// force merge
@@ -293,7 +297,9 @@ namespace Lucene.Net.Index
reader.Dispose();
}
+#pragma warning disable 612, 618
internal static readonly Encoding Utf8 = IOUtils.CHARSET_UTF_8;
+#pragma warning restore 612, 618
private void GenerateRandomData(byte[] data)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
index 88b9090..9c551f3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
@@ -42,7 +42,9 @@ namespace Lucene.Net.Index
[Test]
public override void TestWriteReadMerge()
{
+#pragma warning disable 612, 618
AssumeFalse("impersonation isnt good enough", Codec is Lucene3xCodec);
+#pragma warning restore 612, 618
// this test tries to switch up between the codec and another codec.
// for 3.x: we currently cannot take an index with existing 4.x segments
// and merge into newly formed 3.x segments.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
index dac8fa8..b189e41 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
@@ -42,7 +42,9 @@ namespace Lucene.Net.Index
protected override IEnumerable<Options> ValidOptions()
{
+#pragma warning disable 612, 618
if (Codec is Lucene3xCodec)
+#pragma warning restore 612, 618
{
// payloads are not supported on vectors in 3.x indexes
return ValidOptions(Options.NONE, Options.POSITIONS_AND_OFFSETS);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 35f5dd8..daaa766 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -74,7 +74,9 @@ namespace Lucene.Net.Search.Spans
{
if (m_input.IncrementToken())
{
+#pragma warning disable 612, 618
PayloadAttr.Payload = new BytesRef(("pos: " + Pos).GetBytes(IOUtils.CHARSET_UTF_8));
+#pragma warning restore 612, 618
Pos++;
return true;
}
@@ -418,7 +420,9 @@ namespace Lucene.Net.Search.Spans
public virtual void TestSpanPayloadCheck()
{
SpanTermQuery term1 = new SpanTermQuery(new Term("field", "five"));
+#pragma warning disable 612, 618
BytesRef pay = new BytesRef(("pos: " + 5).GetBytes(IOUtils.CHARSET_UTF_8));
+#pragma warning restore 612, 618
SpanQuery query = new SpanPayloadCheckQuery(term1, new List<byte[]>() { pay.Bytes });
CheckHits(query, new int[] { 1125, 1135, 1145, 1155, 1165, 1175, 1185, 1195, 1225, 1235, 1245, 1255, 1265, 1275, 1285, 1295, 1325, 1335, 1345, 1355, 1365, 1375, 1385, 1395, 1425, 1435, 1445, 1455, 1465, 1475, 1485, 1495, 1525, 1535, 1545, 1555, 1565, 1575, 1585, 1595, 1625, 1635, 1645, 1655, 1665, 1675, 1685, 1695, 1725, 1735, 1745, 1755, 1765, 1775, 1785, 1795, 1825, 1835, 1845, 1855, 1865, 1875, 1885, 1895, 1925, 1935, 1945, 1955, 1965, 1975, 1985, 1995 });
Assert.IsTrue(Searcher.Explain(query, 1125).Value > 0.0f);
@@ -432,8 +436,10 @@ namespace Lucene.Net.Search.Spans
clauses[0] = term1;
clauses[1] = term2;
snq = new SpanNearQuery(clauses, 0, true);
+#pragma warning disable 612, 618
pay = new BytesRef(("pos: " + 0).GetBytes(IOUtils.CHARSET_UTF_8));
pay2 = new BytesRef(("pos: " + 1).GetBytes(IOUtils.CHARSET_UTF_8));
+#pragma warning restore 612, 618
list = new List<byte[]>();
list.Add(pay.Bytes);
list.Add(pay2.Bytes);
@@ -444,9 +450,11 @@ namespace Lucene.Net.Search.Spans
clauses[1] = term2;
clauses[2] = new SpanTermQuery(new Term("field", "five"));
snq = new SpanNearQuery(clauses, 0, true);
+#pragma warning disable 612, 618
pay = new BytesRef(("pos: " + 0).GetBytes(IOUtils.CHARSET_UTF_8));
pay2 = new BytesRef(("pos: " + 1).GetBytes(IOUtils.CHARSET_UTF_8));
BytesRef pay3 = new BytesRef(("pos: " + 2).GetBytes(IOUtils.CHARSET_UTF_8));
+#pragma warning restore 612, 618
list = new List<byte[]>();
list.Add(pay.Bytes);
list.Add(pay2.Bytes);
@@ -476,10 +484,12 @@ namespace Lucene.Net.Search.Spans
CheckHits(query, new int[] { 1103, 1203, 1303, 1403, 1503, 1603, 1703, 1803, 1903 });
var payloads = new List<byte[]>();
+#pragma warning disable 612, 618
BytesRef pay = new BytesRef(("pos: " + 0).GetBytes(IOUtils.CHARSET_UTF_8));
BytesRef pay2 = new BytesRef(("pos: " + 1).GetBytes(IOUtils.CHARSET_UTF_8));
BytesRef pay3 = new BytesRef(("pos: " + 3).GetBytes(IOUtils.CHARSET_UTF_8));
BytesRef pay4 = new BytesRef(("pos: " + 4).GetBytes(IOUtils.CHARSET_UTF_8));
+#pragma warning restore 612, 618
payloads.Add(pay.Bytes);
payloads.Add(pay2.Bytes);
payloads.Add(pay3.Bytes);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
index 174ca9f..d447b9e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
@@ -642,7 +642,11 @@ namespace Lucene.Net.Search
SnapshotDeletionPolicy sdp = new SnapshotDeletionPolicy(new KeepOnlyLastCommitDeletionPolicy());
Directory dir = new NRTCachingDirectory(NewFSDirectory(CreateTempDir("nrt")), 5, 128);
- IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_46, new MockAnalyzer(Random()));
+ IndexWriterConfig config = new IndexWriterConfig(
+#pragma warning disable 612, 618
+ Version.LUCENE_46,
+#pragma warning restore 612, 618
+ new MockAnalyzer(Random()));
config.SetIndexDeletionPolicy(sdp);
config.SetOpenMode(OpenMode.CREATE_OR_APPEND);
IndexWriter iw = new IndexWriter(dir, config);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/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 7051455..afde736 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -217,6 +217,7 @@ namespace Lucene.Net.Search
Assert.IsTrue(longs.Get(i) == (long.MaxValue - i), longs.Get(i) + " does not equal: " + (long.MaxValue - i) + " i=" + i);
}
+#pragma warning disable 612, 618
FieldCache.Bytes bytes = cache.GetBytes(Reader, "theByte", Random().NextBoolean());
Assert.AreSame(bytes, cache.GetBytes(Reader, "theByte", Random().NextBoolean()), "Second request to cache return same array");
Assert.AreSame(bytes, cache.GetBytes(Reader, "theByte", FieldCache.DEFAULT_BYTE_PARSER, Random().NextBoolean()), "Second request with explicit parser return same array");
@@ -232,6 +233,7 @@ namespace Lucene.Net.Search
{
Assert.IsTrue(shorts.Get(i) == (short)(short.MaxValue - i), shorts.Get(i) + " does not equal: " + (short.MaxValue - i));
}
+#pragma warning restore 612, 618
FieldCache.Ints ints = cache.GetInts(Reader, "theInt", Random().NextBoolean());
Assert.AreSame(ints, cache.GetInts(Reader, "theInt", Random().NextBoolean()), "Second request to cache return same array");
@@ -831,11 +833,13 @@ namespace Lucene.Net.Search
cache.PurgeAllCaches();
Assert.AreEqual(0, cache.GetCacheEntries().Length);
+#pragma warning disable 612, 618
Bytes bytes = cache.GetBytes(ar, "bogusbytes", true);
Assert.AreEqual(0, bytes.Get(0));
Shorts shorts = cache.GetShorts(ar, "bogusshorts", true);
Assert.AreEqual(0, shorts.Get(0));
+#pragma warning restore 612, 618
Ints ints = cache.GetInts(ar, "bogusints", true);
Assert.AreEqual(0, ints.Get(0));
@@ -898,11 +902,13 @@ namespace Lucene.Net.Search
cache.PurgeAllCaches();
Assert.AreEqual(0, cache.GetCacheEntries().Length);
+#pragma warning disable 612, 618
Bytes bytes = cache.GetBytes(ar, "bogusbytes", true);
Assert.AreEqual(0, bytes.Get(0));
Shorts shorts = cache.GetShorts(ar, "bogusshorts", true);
Assert.AreEqual(0, shorts.Get(0));
+#pragma warning restore 612, 618
Ints ints = cache.GetInts(ar, "bogusints", true);
Assert.AreEqual(0, ints.Get(0));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
index f0e44a8..a1d1e50 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
@@ -232,6 +232,7 @@ namespace Lucene.Net.Search
ScoreDoc[] result;
Query q = new TermQuery(new Term("body", "body"));
+#pragma warning disable 612, 618
// test id, bounded on both ends
result = search.Search(q, FieldCacheRangeFilter.NewShortRange("id", minIdO, maxIdO, T, T), numDocs).ScoreDocs;
Assert.AreEqual(numDocs, result.Length, "find all");
@@ -303,6 +304,7 @@ namespace Lucene.Net.Search
Assert.AreEqual(0, result.Length, "overflow special case");
result = search.Search(q, FieldCacheRangeFilter.NewShortRange("id", maxIdO, minIdO, T, T), numDocs).ScoreDocs;
Assert.AreEqual(0, result.Length, "inverse range");
+#pragma warning restore 612, 618
}
[Test]
@@ -573,6 +575,7 @@ namespace Lucene.Net.Search
ScoreDoc[] result;
Query q = new TermQuery(new Term("body", "body"));
+#pragma warning disable 612, 618
result = search.Search(q, FieldCacheRangeFilter.NewByteRange("id", (sbyte?)-20, (sbyte?)20, T, T), 100).ScoreDocs;
Assert.AreEqual(40, result.Length, "find all");
@@ -587,6 +590,8 @@ namespace Lucene.Net.Search
result = search.Search(q, FieldCacheRangeFilter.NewByteRange("id", (sbyte?)-20, (sbyte?)-10, T, T), 100).ScoreDocs;
Assert.AreEqual(11, result.Length, "find all");
+#pragma warning restore 612, 618
+
reader.Dispose();
dir.Dispose();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
index 2a4caa6..d460d91 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
@@ -67,7 +67,30 @@ namespace Lucene.Net.Search
{
base.SetUp();
- AllSortFields = new List<SortField>(Arrays.AsList(new SortField[] { new SortField("byte", SortFieldType.BYTE, false), new SortField("short", SortFieldType.SHORT, false), new SortField("int", SortFieldType.INT, false), new SortField("long", SortFieldType.LONG, false), new SortField("float", SortFieldType.FLOAT, false), new SortField("double", SortFieldType.DOUBLE, false), new SortField("bytes", SortFieldType.STRING, false), new SortField("bytesval", SortFieldType.STRING_VAL, false), new SortField("byte", SortFieldType.BYTE, true), new SortField("short", SortFieldType.SHORT, true), new SortField("int", SortFieldType.INT, true), new SortField("long", SortFieldType.LONG, true), new SortField("float", SortFieldType.FLOAT, true), new SortField("double", SortFieldType.DOUBLE, true), new SortField("bytes", SortFieldType.STRING, true), new SortField("bytesval", SortFieldType.STRING_VAL, true), SortField.FIELD_SCORE, SortField.FIELD_DOC }));
+ AllSortFields = new List<SortField>(Arrays.AsList(new SortField[] {
+#pragma warning disable 612,618
+ new SortField("byte", SortFieldType.BYTE, false),
+ new SortField("short", SortFieldType.SHORT, false),
+#pragma warning restore 612,618
+ new SortField("int", SortFieldType.INT, false),
+ new SortField("long", SortFieldType.LONG, false),
+ new SortField("float", SortFieldType.FLOAT, false),
+ new SortField("double", SortFieldType.DOUBLE, false),
+ new SortField("bytes", SortFieldType.STRING, false),
+ new SortField("bytesval", SortFieldType.STRING_VAL, false),
+#pragma warning disable 612,618
+ new SortField("byte", SortFieldType.BYTE, true),
+ new SortField("short", SortFieldType.SHORT, true),
+#pragma warning restore 612,618
+ new SortField("int", SortFieldType.INT, true),
+ new SortField("long", SortFieldType.LONG, true),
+ new SortField("float", SortFieldType.FLOAT, true),
+ new SortField("double", SortFieldType.DOUBLE, true),
+ new SortField("bytes", SortFieldType.STRING, true),
+ new SortField("bytesval", SortFieldType.STRING_VAL, true),
+ SortField.FIELD_SCORE,
+ SortField.FIELD_DOC
+ }));
if (SupportsDocValues)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Search/TestSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSort.cs b/src/Lucene.Net.Tests/core/Search/TestSort.cs
index 382b530..e8b076c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSort.cs
@@ -552,7 +552,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.BYTE));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -584,7 +586,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.BYTE));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -616,7 +620,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
SortField sortField = new SortField("value", SortFieldType.BYTE);
+#pragma warning restore 612, 618
sortField.MissingValue = sbyte.MaxValue;
Sort sort = new Sort(sortField);
@@ -651,7 +657,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.BYTE, true));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -684,7 +692,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.SHORT));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -716,7 +726,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.SHORT));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -748,7 +760,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
SortField sortField = new SortField("value", SortFieldType.SHORT);
+#pragma warning restore 612, 618
sortField.MissingValue = short.MaxValue;
Sort sort = new Sort(sortField);
@@ -783,7 +797,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.SHORT, true));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
index 299965d..04146e0 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSortDocValues.cs
@@ -272,7 +272,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.BYTE));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -309,7 +311,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.BYTE, true));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -346,7 +350,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.SHORT));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
@@ -383,7 +389,9 @@ namespace Lucene.Net.Search
writer.Dispose();
IndexSearcher searcher = NewSearcher(ir);
+#pragma warning disable 612, 618
Sort sort = new Sort(new SortField("value", SortFieldType.SHORT, true));
+#pragma warning restore 612, 618
TopDocs td = searcher.Search(new MatchAllDocsQuery(), 10, sort);
Assert.AreEqual(3, td.TotalHits);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Util/TestBytesRefArray.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestBytesRefArray.cs b/src/Lucene.Net.Tests/core/Util/TestBytesRefArray.cs
index 0e50d8d..dde2b9e 100644
--- a/src/Lucene.Net.Tests/core/Util/TestBytesRefArray.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestBytesRefArray.cs
@@ -98,7 +98,9 @@ namespace Lucene.Net.Util
}
stringList.Sort();
+#pragma warning disable 612, 618
IBytesRefIterator iter = list.GetIterator(BytesRef.UTF8SortedAsUTF16Comparer);
+#pragma warning restore 612, 618
int a = 0;
while ((spare = iter.Next()) != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs b/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs
index d56b63f..696a011 100644
--- a/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs
@@ -214,7 +214,9 @@ namespace Lucene.Net.Util
}
// We use the UTF-16 comparer here, because we need to be able to
// compare to native String.CompareTo() [UTF-16]:
+#pragma warning disable 612, 618
int[] sort = Hash.Sort(BytesRef.UTF8SortedAsUTF16Comparer);
+#pragma warning restore 612, 618
Assert.IsTrue(strings.Count < sort.Length);
int i = 0;
BytesRef scratch = new BytesRef();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs b/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
index dda066f..2c22167 100644
--- a/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
@@ -41,7 +41,9 @@ namespace Lucene.Net.Util
}
Array.Sort(utf8);
+#pragma warning disable 612, 618
Array.Sort(utf16, CharsRef.UTF16SortedAsUTF8Comparer);
+#pragma warning restore 612, 618
for (int i = 0; i < numStrings; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs b/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs
index fb65337..ab2a4e2 100644
--- a/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestFieldCacheSanityChecker.cs
@@ -149,7 +149,9 @@ namespace Lucene.Net.Util
cache.GetInts(ReaderX, "theInt", FieldCache.DEFAULT_INT_PARSER, false);
cache.GetTerms(ReaderX, "theInt", false);
+#pragma warning disable 612, 618
cache.GetBytes(ReaderX, "theByte", false);
+#pragma warning restore 612, 618
// // //
@@ -172,8 +174,9 @@ namespace Lucene.Net.Util
cache.GetTerms(ReaderA, "theInt", false);
cache.GetTerms(ReaderB, "theInt", false);
cache.GetTerms(ReaderX, "theInt", false);
-
+#pragma warning disable 612, 618
cache.GetBytes(ReaderX, "theByte", false);
+#pragma warning restore 612, 618
// // //
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
index 022bfd3..2d32203 100644
--- a/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
@@ -72,7 +72,9 @@ namespace Lucene.Net.Util
[Test]
public virtual void TestSingleLine()
{
+#pragma warning disable 612, 618
CheckSort(new OfflineSorter(), new byte[][] { "Single line only.".GetBytes(IOUtils.CHARSET_UTF_8) });
+#pragma warning restore 612, 618
}
#if !NETSTANDARD
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/15efa51c/src/Lucene.Net.Tests/core/Util/TestVersion.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestVersion.cs b/src/Lucene.Net.Tests/core/Util/TestVersion.cs
index 91a3da1..bff6757 100644
--- a/src/Lucene.Net.Tests/core/Util/TestVersion.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestVersion.cs
@@ -22,6 +22,7 @@ using System.Reflection;
namespace Lucene.Net.Util
{
+#pragma warning disable 612, 618
[TestFixture]
public class TestVersion : LuceneTestCase
{
@@ -78,4 +79,5 @@ namespace Lucene.Net.Util
Assert.AreEqual(mainVersionParsed, values[values.Length - 2], "Constant one before last must be the same as the parsed LUCENE_MAIN_VERSION (without alpha/beta) constant: " + mainVersionWithoutAlphaBeta);
}
}
+#pragma warning restore 612, 618
}
\ No newline at end of file
[05/50] [abbrv] lucenenet git commit: Lucene.Net.Tests.Core
(Index.TestFieldsReader.FaultyFSDirectory +
Store.TestBufferedIndexInput.MockFSDirectory): added Obsolete attribute to
FileExists() because it overrides an obsolete member
Posted by ni...@apache.org.
Lucene.Net.Tests.Core (Index.TestFieldsReader.FaultyFSDirectory + Store.TestBufferedIndexInput.MockFSDirectory): added Obsolete attribute to FileExists() because it overrides an obsolete member
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a781c2c9
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a781c2c9
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a781c2c9
Branch: refs/heads/api-work
Commit: a781c2c9b6fbc35615099b20236ae5ebdf100f1b
Parents: 15efa51
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:01:12 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:45 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs | 1 +
src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a781c2c9/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 5025f45..bcc259c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -133,6 +133,7 @@ namespace Lucene.Net.Index
return FsDir.ListAll();
}
+ [Obsolete("this method will be removed in 5.0")]
public override bool FileExists(string name)
{
return FsDir.FileExists(name);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a781c2c9/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
index c82ab20..79f6f5b 100644
--- a/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
@@ -376,6 +376,7 @@ namespace Lucene.Net.Store
Dir.DeleteFile(name);
}
+ [Obsolete("this method will be removed in 5.0")]
public override bool FileExists(string name)
{
return Dir.FileExists(name);
[34/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestTermVectorsReader.TestPositionReader():
commented unused terms variable
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestTermVectorsReader.TestPositionReader(): commented unused terms variable
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f55556ac
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f55556ac
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f55556ac
Branch: refs/heads/api-work
Commit: f55556ac4d893f5bd62c01cc685929e076898bc3
Parents: 49fa531
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:11:39 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f55556ac/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
index e0442c5..cb39326 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
@@ -299,7 +299,7 @@ namespace Lucene.Net.Index
public virtual void TestPositionReader()
{
TermVectorsReader reader = Codec.Default.TermVectorsFormat.VectorsReader(Dir, Seg.Info, FieldInfos, NewIOContext(Random()));
- BytesRef[] terms;
+ //BytesRef[] terms; // LUCENENET NOTE: Not used in Lucene
Terms vector = reader.Get(0).Terms(TestFields[0]);
Assert.IsNotNull(vector);
Assert.AreEqual(TestTerms.Length, vector.Count);
[45/50] [abbrv] lucenenet git commit:
Lucene.Net.Classification.Utils.DatasetSplitter: suppressed obsolete warnings
about LUCENE_CURRENT
Posted by ni...@apache.org.
Lucene.Net.Classification.Utils.DatasetSplitter: suppressed obsolete warnings about LUCENE_CURRENT
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/adf7c159
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/adf7c159
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/adf7c159
Branch: refs/heads/api-work
Commit: adf7c1597153257d60b88cd0e3dedeb86e5dbd21
Parents: aabeb67
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:40:01 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Classification/Utils/DatasetSplitter.cs | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/adf7c159/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs b/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
index f7c2f35..0ee0993 100644
--- a/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
+++ b/src/Lucene.Net.Classification/Utils/DatasetSplitter.cs
@@ -59,10 +59,12 @@ namespace Lucene.Net.Classification.Utils
*/
public void Split(AtomicReader originalIndex, Directory trainingIndex, Directory testIndex, Directory crossValidationIndex, Analyzer analyzer, params string[] fieldNames)
{
+#pragma warning disable 612, 618
// create IWs for train / test / cv IDXs
IndexWriter testWriter = new IndexWriter(testIndex, new IndexWriterConfig(Util.LuceneVersion.LUCENE_CURRENT, analyzer));
IndexWriter cvWriter = new IndexWriter(crossValidationIndex, new IndexWriterConfig(Util.LuceneVersion.LUCENE_CURRENT, analyzer));
IndexWriter trainingWriter = new IndexWriter(trainingIndex, new IndexWriterConfig(Util.LuceneVersion.LUCENE_CURRENT, analyzer));
+#pragma warning restore 612, 618
try
{
[22/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestTransactionRollback: Made
RollbackDeletionPolicy, DeleteLastCommitPolicy,
and KeepAllDeletionPolicy classes non-generic as they were in Lucene. The
generic closing type name was collid
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestTransactionRollback: Made RollbackDeletionPolicy, DeleteLastCommitPolicy, and KeepAllDeletionPolicy classes non-generic as they were in Lucene. The generic closing type name was colliding with the name used on their methods.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9c9cba2b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9c9cba2b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9c9cba2b
Branch: refs/heads/api-work
Commit: 9c9cba2bf4ef21db1291cabf447fdbb8a535270b
Parents: 9aab47d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:41:12 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
.../core/Index/TestTransactionRollback.cs | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9c9cba2b/src/Lucene.Net.Tests/core/Index/TestTransactionRollback.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTransactionRollback.cs b/src/Lucene.Net.Tests/core/Index/TestTransactionRollback.cs
index cc43640..0ff979a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTransactionRollback.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTransactionRollback.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Index
throw new Exception("Couldn't find commit point " + id);
}
- IndexWriter w = new IndexWriter(Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(new RollbackDeletionPolicy<IndexCommit>(this, id)).SetIndexCommit(last));
+ IndexWriter w = new IndexWriter(Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(new RollbackDeletionPolicy(this, id)).SetIndexCommit(last));
IDictionary<string, string> data = new Dictionary<string, string>();
data["index"] = "Rolled back to 1-" + id;
w.CommitData = data;
@@ -139,7 +139,7 @@ namespace Lucene.Net.Index
Dir = NewDirectory();
//Build index, of records 1 to 100, committing after each batch of 10
- IndexDeletionPolicy sdp = new KeepAllDeletionPolicy<IndexCommit>(this);
+ IndexDeletionPolicy sdp = new KeepAllDeletionPolicy(this);
IndexWriter w = new IndexWriter(Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(sdp));
for (int currentRecordId = 1; currentRecordId <= 100; currentRecordId++)
@@ -168,8 +168,7 @@ namespace Lucene.Net.Index
}
// Rolls back to previous commit point
- internal class RollbackDeletionPolicy<T> : IndexDeletionPolicy
- where T : IndexCommit
+ internal class RollbackDeletionPolicy : IndexDeletionPolicy
{
private readonly TestTransactionRollback OuterInstance;
@@ -217,8 +216,7 @@ namespace Lucene.Net.Index
}
}
- internal class DeleteLastCommitPolicy<T> : IndexDeletionPolicy
- where T : IndexCommit
+ internal class DeleteLastCommitPolicy : IndexDeletionPolicy
{
private readonly TestTransactionRollback OuterInstance;
@@ -244,7 +242,7 @@ namespace Lucene.Net.Index
{
// Unless you specify a prior commit point, rollback
// should not work:
- (new IndexWriter(Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(new DeleteLastCommitPolicy<IndexCommit>(this)))).Dispose();
+ (new IndexWriter(Dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random())).SetIndexDeletionPolicy(new DeleteLastCommitPolicy(this)))).Dispose();
IndexReader r = DirectoryReader.Open(Dir);
Assert.AreEqual(100, r.NumDocs);
r.Dispose();
@@ -252,8 +250,7 @@ namespace Lucene.Net.Index
}
// Keeps all commit points (used to build index)
- internal class KeepAllDeletionPolicy<T> : IndexDeletionPolicy
- where T : IndexCommit
+ internal class KeepAllDeletionPolicy : IndexDeletionPolicy
{
private readonly TestTransactionRollback OuterInstance;
[40/50] [abbrv] lucenenet git commit: Lucene.Net.Expressions.JS
(JavascriptLexer + JavascriptParser): removed unreachable break statements
and commented unreferenced labels
Posted by ni...@apache.org.
Lucene.Net.Expressions.JS (JavascriptLexer + JavascriptParser): removed unreachable break statements and commented unreferenced labels
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/883d9412
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/883d9412
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/883d9412
Branch: refs/heads/api-work
Commit: 883d94122ced9a9007ccba0d6845ca9af8907b9d
Parents: c56db65
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:18:04 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
.../JS/JavascriptLexer.cs | 54 +++++++++-----------
.../JS/JavascriptParser.cs | 52 ++++++++-----------
2 files changed, 43 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/883d9412/src/Lucene.Net.Expressions/JS/JavascriptLexer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/JS/JavascriptLexer.cs b/src/Lucene.Net.Expressions/JS/JavascriptLexer.cs
index c17b36d..0646355 100644
--- a/src/Lucene.Net.Expressions/JS/JavascriptLexer.cs
+++ b/src/Lucene.Net.Expressions/JS/JavascriptLexer.cs
@@ -774,10 +774,9 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop1_break;
- break;
}
}
-loop1_continue: ;
+//loop1_continue: ; // LUCENENET NOTE: Not used
}
loop1_break: ;
}
@@ -843,10 +842,9 @@ loop1_break: ;
default:
{
goto loop2_break;
- break;
}
}
-loop2_continue: ;
+//loop2_continue: ; // LUCENENET NOTE: Not used
}
loop2_break: ;
}
@@ -909,9 +907,9 @@ loop2_break: ;
}
}
cnt3++;
-loop3_continue: ;
- }
-loop3_break: ;
+ //loop3_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop3_break: ;
Skip();
}
state.type = _type;
@@ -972,14 +970,11 @@ loop3_break: ;
default:
{
goto loop4_break;
- break;
}
}
- loop4_continue:
- ;
- }
- loop4_break:
- ;
+ //loop4_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop4_break: ;
// src/java/org/apache/lucene/expressions/js/Javascript.g:347:43: ( EXPONENT )?
int alt5 = 2;
int LA5_0 = input.LA(1);
@@ -1042,11 +1037,9 @@ loop3_break: ;
}
}
cnt6++;
- loop6_continue:
- ;
- }
- loop6_break:
- ;
+ //loop6_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop6_break: ;
// src/java/org/apache/lucene/expressions/js/Javascript.g:348:28: ( EXPONENT )?
int alt7 = 2;
int LA7_0 = input.LA(1);
@@ -1150,9 +1143,9 @@ loop3_break: ;
}
}
cnt10++;
-loop10_continue: ;
- }
-loop10_break: ;
+ //loop10_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop10_break: ;
}
state.type = _type;
state.channel = _channel;
@@ -1269,9 +1262,9 @@ loop10_break: ;
}
}
cnt12++;
-loop12_continue: ;
- }
-loop12_break: ;
+ //loop12_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop12_break: ;
}
state.type = _type;
state.channel = _channel;
@@ -1351,12 +1344,11 @@ loop12_break: ;
default:
{
goto loop13_break;
- break;
}
}
-loop13_continue: ;
- }
-loop13_break: ;
+ //loop13_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop13_break: ;
break;
}
}
@@ -1451,9 +1443,9 @@ loop13_break: ;
}
}
cnt16++;
-loop16_continue: ;
- }
-loop16_break: ;
+ //loop16_continue: ; // LUCENENET NOTE: Not used
+ }
+ loop16_break: ;
}
}
finally
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/883d9412/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/JS/JavascriptParser.cs b/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
index a96a9e6..9844fab 100644
--- a/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
+++ b/src/Lucene.Net.Expressions/JS/JavascriptParser.cs
@@ -345,7 +345,6 @@ namespace Lucene.Net.Expressions.JS
default:
{
return "'" + token.Text + "'";
- break;
}
}
}
@@ -506,10 +505,9 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop2_break;
- break;
}
}
- loop2_continue: ;
+ //loop2_continue: ; // LUCENENET NOTE: Not used
}
loop2_break: ;
}
@@ -577,10 +575,9 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop3_break;
- break;
}
}
- loop3_continue: ;
+ //loop3_continue: ; // LUCENENET NOTE: Not used
}
loop3_break: ;
}
@@ -643,12 +640,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop4_break;
- break;
}
}
- loop4_continue: ;
+ //loop4_continue: ; // LUCENENET NOTE: Not used
}
- loop4_break: ;
+ loop4_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -709,12 +705,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop5_break;
- break;
}
}
- loop5_continue: ;
+ //loop5_continue: ; // LUCENENET NOTE: Not used
}
- loop5_break: ;
+ loop5_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -777,12 +772,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop6_break;
- break;
}
}
- loop6_continue: ;
+ //loop6_continue: ; // LUCENENET NOTE: Not used
}
- loop6_break: ;
+ loop6_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -854,12 +848,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop7_break;
- break;
}
}
- loop7_continue: ;
+ //loop7_continue: ; // LUCENENET NOTE: Not used
}
- loop7_break: ;
+ loop7_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -933,12 +926,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop8_break;
- break;
}
}
- loop8_continue: ;
+ //loop8_continue: ; // LUCENENET NOTE: Not used
}
- loop8_break: ;
+ loop8_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -1012,12 +1004,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop9_break;
- break;
}
}
- loop9_continue: ;
+ //loop9_continue: ; // LUCENENET NOTE: Not used
}
- loop9_break: ;
+ loop9_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -1091,12 +1082,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop10_break;
- break;
}
}
- loop10_continue: ;
+ //loop10_continue: ; // LUCENENET NOTE: Not used
}
- loop10_break: ;
+ loop10_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -1170,12 +1160,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop11_break;
- break;
}
}
- loop11_continue: ;
+ //loop11_continue: ; // LUCENENET NOTE: Not used
}
- loop11_break: ;
+ loop11_break: ;
}
retval.Stop = input.LT(-1);
retval.Tree = (CommonTree)adaptor.RulePostProcessing(root);
@@ -1687,12 +1676,11 @@ namespace Lucene.Net.Expressions.JS
default:
{
goto loop16_break;
- break;
}
}
- loop16_continue: ;
+ //loop16_continue: ; // LUCENENET NOTE: Not used
}
- loop16_break: ;
+ loop16_break: ;
break;
}
}
[31/50] [abbrv] lucenenet git commit: BUG:
Lucene.Net.Memory.MemoryIndex.AddField(): changed throw statement to throw
Exception rather than the original IOException
Posted by ni...@apache.org.
BUG: Lucene.Net.Memory.MemoryIndex.AddField(): changed throw statement to throw Exception rather than the original IOException
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c56db65e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c56db65e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c56db65e
Branch: refs/heads/api-work
Commit: c56db65ef82bffdf133efe2f0ece48b680e14cbb
Parents: 994233c
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:54:29 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Memory/MemoryIndex.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c56db65e/src/Lucene.Net.Memory/MemoryIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Memory/MemoryIndex.cs b/src/Lucene.Net.Memory/MemoryIndex.cs
index 11b0e58..45635da 100644
--- a/src/Lucene.Net.Memory/MemoryIndex.cs
+++ b/src/Lucene.Net.Memory/MemoryIndex.cs
@@ -253,7 +253,7 @@ namespace Lucene.Net.Index.Memory
}
catch (IOException ex)
{
- throw;
+ throw new Exception(ex.Message, ex);
}
AddField(fieldName, stream, 1.0f, analyzer.GetPositionIncrementGap(fieldName), analyzer.GetOffsetGap(fieldName));
[50/50] [abbrv] lucenenet git commit: Lucene.Net.Core.Util.BytesRef:
Removed validation on setting Bytes property to non-null because some tests
actually set it to null
Posted by ni...@apache.org.
Lucene.Net.Core.Util.BytesRef: Removed validation on setting Bytes property to non-null because some tests actually set it to null
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2315d0d4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2315d0d4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2315d0d4
Branch: refs/heads/api-work
Commit: 2315d0d410b6196109d1634396ee8c0d7a766a3f
Parents: 5d8d81a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 10:09:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 10:09:05 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Util/BytesRef.cs | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2315d0d4/src/Lucene.Net.Core/Util/BytesRef.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/BytesRef.cs b/src/Lucene.Net.Core/Util/BytesRef.cs
index c50cbe9..ee1a704 100644
--- a/src/Lucene.Net.Core/Util/BytesRef.cs
+++ b/src/Lucene.Net.Core/Util/BytesRef.cs
@@ -48,14 +48,7 @@ namespace Lucene.Net.Util
public byte[] Bytes
{
get { return bytes; }
- set
- {
- if (value == null)
- {
- throw new ArgumentNullException("bytes may never be set to null");
- }
- bytes = value;
- }
+ set { bytes = value; } // LUCENENET NOTE: Although the comments state this cannot be null, some of the tests depend on setting it to null!
}
private byte[] bytes;
[21/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Codecs.Lucene41.TestBlockPostingsFormat3: Added new
keyword to RandomBits class because it hides a class in LuceneTestCase with
the same name
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Codecs.Lucene41.TestBlockPostingsFormat3: Added new keyword to RandomBits class because it hides a class in LuceneTestCase with the same name
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c19abfe5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c19abfe5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c19abfe5
Branch: refs/heads/api-work
Commit: c19abfe5431a70f2c5c8ad6285ab46300e7e7df8
Parents: 9f3fa7a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:06:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
.../core/Codecs/Lucene41/TestBlockPostingsFormat3.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c19abfe5/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
index afeb5c1..f9cdc88 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
@@ -541,7 +541,7 @@ namespace Lucene.Net.Codecs.Lucene41
}
}
- private class RandomBits : IBits
+ new private class RandomBits : IBits
{
internal FixedBitSet Bits;
[25/50] [abbrv] lucenenet git commit: Lucene.Net.Tests.Core
(Index.TestLongPostings + Search.TestMultiPhraseQuery): suppressed warnings
due to unreachable execution paths. A boolean variable is being used as a
switch to test one condition vs another, but
Posted by ni...@apache.org.
Lucene.Net.Tests.Core (Index.TestLongPostings + Search.TestMultiPhraseQuery): suppressed warnings due to unreachable execution paths. A boolean variable is being used as a switch to test one condition vs another, but the compiler complains because the boolean is hard-coded true.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c0c42f9e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c0c42f9e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c0c42f9e
Branch: refs/heads/api-work
Commit: c0c42f9ed3d54bf2cc0037f59698d9f64f6902ae
Parents: 9c9cba2
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:47:01 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestLongPostings.cs | 2 ++
src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c0c42f9e/src/Lucene.Net.Tests/core/Index/TestLongPostings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/core/Index/TestLongPostings.cs
index 72ed0ae..b871d39 100644
--- a/src/Lucene.Net.Tests/core/Index/TestLongPostings.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestLongPostings.cs
@@ -403,7 +403,9 @@ namespace Lucene.Net.Index
}
else
{
+#pragma warning disable 162
r = DirectoryReader.Open(dir);
+#pragma warning restore 162
}
/*
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c0c42f9e/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
index 556a7fd..8b2f669 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
@@ -436,8 +436,10 @@ namespace Lucene.Net.Search
}
else
{
+#pragma warning disable 162
mpq.Add(new Term[] { new Term("field", "a") }, 0);
mpq.Add(new Term[] { new Term("field", "b"), new Term("field", "c") }, 0);
+#pragma warning restore 162
}
TopDocs hits = s.Search(mpq, 2);
Assert.AreEqual(2, hits.TotalHits);
[19/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.TestConcurrentMergeScheduler.ConcurrentMergeSchedulerAnonymousInnerClassHelper:
renamed MaxMergeCount camelCase because of a conflict with a property with
the same name
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.TestConcurrentMergeScheduler.ConcurrentMergeSchedulerAnonymousInnerClassHelper: renamed MaxMergeCount camelCase because of a conflict with a property with the same name
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9f3fa7a8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9f3fa7a8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9f3fa7a8
Branch: refs/heads/api-work
Commit: 9f3fa7a821bea13348de97e4de9324dced95b4a9
Parents: c1c68dc
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:00:24 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
.../core/Index/TestConcurrentMergeScheduler.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9f3fa7a8/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
index 401b1fd..1cde70b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
@@ -327,7 +327,7 @@ namespace Lucene.Net.Index
{
private readonly TestConcurrentMergeScheduler OuterInstance;
- private int MaxMergeCount;
+ private int maxMergeCount;
private CountdownEvent EnoughMergesWaiting;
private AtomicInteger RunningMergeCount;
private AtomicBoolean Failed;
@@ -335,7 +335,7 @@ namespace Lucene.Net.Index
public ConcurrentMergeSchedulerAnonymousInnerClassHelper(TestConcurrentMergeScheduler outerInstance, int maxMergeCount, CountdownEvent enoughMergesWaiting, AtomicInteger runningMergeCount, AtomicBoolean failed)
{
this.OuterInstance = outerInstance;
- this.MaxMergeCount = maxMergeCount;
+ this.maxMergeCount = maxMergeCount;
this.EnoughMergesWaiting = enoughMergesWaiting;
this.RunningMergeCount = runningMergeCount;
this.Failed = failed;
@@ -350,7 +350,7 @@ namespace Lucene.Net.Index
int count = RunningMergeCount.IncrementAndGet();
try
{
- Assert.IsTrue(count <= MaxMergeCount, "count=" + count + " vs maxMergeCount=" + MaxMergeCount);
+ Assert.IsTrue(count <= maxMergeCount, "count=" + count + " vs maxMergeCount=" + maxMergeCount);
EnoughMergesWaiting.Signal();
// Stall this merge until we see exactly
[48/50] [abbrv] lucenenet git commit:
Lucene.Net.Analysis.Common.Analysis.Th.ThaiWordBreaker: removed unused
variable WordBoundaries
Posted by ni...@apache.org.
Lucene.Net.Analysis.Common.Analysis.Th.ThaiWordBreaker: removed unused variable WordBoundaries
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/84c5f096
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/84c5f096
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/84c5f096
Branch: refs/heads/api-work
Commit: 84c5f096fa93ce6b22c4dbc74cc7a1e48a00a38e
Parents: c6b5c8e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:44:34 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/84c5f096/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
index de75885..1eedc44 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
@@ -139,7 +139,6 @@ namespace Lucene.Net.Analysis.Th
{
private readonly Locale locale;
private IEnumerator<Boundary> wordBreaker;
- private Boundary[] WordBoundaries;
private int currentIndex;
private string text;
private readonly IList<int> transitions = new List<int>();
[47/50] [abbrv] lucenenet git commit:
Lucene.Net.Codecs.Memory.DirectDocValuesProducer: suppressed warnings about
unassigned fields
Posted by ni...@apache.org.
Lucene.Net.Codecs.Memory.DirectDocValuesProducer: suppressed warnings about unassigned fields
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/aabeb679
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/aabeb679
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/aabeb679
Branch: refs/heads/api-work
Commit: aabeb67923da69e2b799d7337dc54d30d1cba117
Parents: 0df5a83
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:39:19 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aabeb679/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
index 4cddc93..1605cfd 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
@@ -621,7 +621,9 @@ namespace Lucene.Net.Codecs.Memory
internal long missingOffset;
internal long missingBytes;
internal byte byteWidth;
+#pragma warning disable 649 // LUCENENET NOTE: Never assigned
internal int packedIntsVersion;
+#pragma warning restore 649
}
internal class BinaryEntry
@@ -631,10 +633,12 @@ namespace Lucene.Net.Codecs.Memory
internal long missingBytes;
internal int count;
internal int numBytes;
+#pragma warning disable 649 // LUCENENET NOTE: Never assigned
internal int minLength;
internal int maxLength;
internal int packedIntsVersion;
internal int blockSize;
+#pragma warning restore 649
}
internal class SortedEntry
@@ -652,8 +656,10 @@ namespace Lucene.Net.Codecs.Memory
internal class FSTEntry
{
+#pragma warning disable 649 // LUCENENET NOTE: Never assigned
internal long offset;
internal long numOrds;
+#pragma warning restore 649
}
}
}
\ No newline at end of file
[30/50] [abbrv] lucenenet git commit: Lucene.Net.Tests.Spatial:
suppressed warnings about unused exception variables
Posted by ni...@apache.org.
Lucene.Net.Tests.Spatial: suppressed warnings about unused exception variables
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/39804487
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/39804487
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/39804487
Branch: refs/heads/api-work
Commit: 39804487185b0b6e333ee7b2650896380d04a93a
Parents: ff89b05
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:45:39 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Spatial/Query/SpatialArgsParserTest.cs | 4 ++++
src/Lucene.Net.Tests.Spatial/QueryEqualsHashCodeTest.cs | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/39804487/src/Lucene.Net.Tests.Spatial/Query/SpatialArgsParserTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/Query/SpatialArgsParserTest.cs b/src/Lucene.Net.Tests.Spatial/Query/SpatialArgsParserTest.cs
index ee2f9a2..aa96302 100644
--- a/src/Lucene.Net.Tests.Spatial/Query/SpatialArgsParserTest.cs
+++ b/src/Lucene.Net.Tests.Spatial/Query/SpatialArgsParserTest.cs
@@ -52,7 +52,9 @@ namespace Lucene.Net.Spatial.Queries
parser.Parse(SpatialOperation.IsDisjointTo + "[ ]", ctx);
fail("spatial operations need args");
}
+#pragma warning disable 168
catch (Exception ex)
+#pragma warning restore 168
{//expected
}
@@ -61,7 +63,9 @@ namespace Lucene.Net.Spatial.Queries
parser.Parse("XXXX(Envelope(-10, 10, 20, -20))", ctx);
fail("unknown operation!");
}
+#pragma warning disable 168
catch (Exception ex)
+#pragma warning restore 168
{//expected
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/39804487/src/Lucene.Net.Tests.Spatial/QueryEqualsHashCodeTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/QueryEqualsHashCodeTest.cs b/src/Lucene.Net.Tests.Spatial/QueryEqualsHashCodeTest.cs
index 33417b5..68a67ae 100644
--- a/src/Lucene.Net.Tests.Spatial/QueryEqualsHashCodeTest.cs
+++ b/src/Lucene.Net.Tests.Spatial/QueryEqualsHashCodeTest.cs
@@ -113,7 +113,9 @@ namespace Lucene.Net.Spatial
{
first = generator.gen(args1);
}
+#pragma warning disable 168
catch (NotSupportedException e)
+#pragma warning restore 168
{
return;
}
[44/50] [abbrv] lucenenet git commit:
Lucene.Net.Analysis.Common.Analysis.Util.AbstractAnalysisFactory: commented
code in AssureMatchVersion() because luceneMatchVersion can never be null in
.NET
Posted by ni...@apache.org.
Lucene.Net.Analysis.Common.Analysis.Util.AbstractAnalysisFactory: commented code in AssureMatchVersion() because luceneMatchVersion can never be null in .NET
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/eee04c44
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/eee04c44
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/eee04c44
Branch: refs/heads/api-work
Commit: eee04c44226262b6c795cb525006450022f36d5e
Parents: 84c5f09
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:47:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
.../Analysis/Util/AbstractAnalysisFactory.cs | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/eee04c44/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
index 9871646..d123f37 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
@@ -81,10 +81,13 @@ namespace Lucene.Net.Analysis.Util
/// </summary>
protected internal void AssureMatchVersion()
{
- if (luceneMatchVersion == null)
- {
- throw new System.ArgumentException("Configuration Error: Factory '" + this.GetType().FullName + "' needs a 'luceneMatchVersion' parameter");
- }
+ // LUCENENET NOTE: since luceneMatchVersion can never be null in .NET,
+ // this method effectively does nothing. However, leaving it in place because
+ // it is used throughout Lucene.
+ //if (luceneMatchVersion == null)
+ //{
+ // throw new System.ArgumentException("Configuration Error: Factory '" + this.GetType().FullName + "' needs a 'luceneMatchVersion' parameter");
+ //}
}
public LuceneVersion LuceneMatchVersion
[07/50] [abbrv] lucenenet git commit: Lucene.Net.Tests: suppressed
warnings about unused variables on caught exceptions
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 6534aa9..7051455 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -614,7 +614,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetInts(ar, "binary", false);
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -627,7 +629,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetTermsIndex(ar, "binary");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -636,7 +640,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetDocTermOrds(ar, "binary");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -645,7 +651,9 @@ namespace Lucene.Net.Search
new DocTermOrds(ar, null, "binary");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -658,7 +666,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetInts(ar, "sorted", false);
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -667,7 +677,9 @@ namespace Lucene.Net.Search
new DocTermOrds(ar, null, "sorted");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -699,7 +711,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetTerms(ar, "numeric", true);
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -708,7 +722,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetTermsIndex(ar, "numeric");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -717,7 +733,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetDocTermOrds(ar, "numeric");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -726,7 +744,9 @@ namespace Lucene.Net.Search
new DocTermOrds(ar, null, "numeric");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -741,7 +761,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetInts(ar, "sortedset", false);
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -750,7 +772,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetTerms(ar, "sortedset", true);
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -759,7 +783,9 @@ namespace Lucene.Net.Search
FieldCache.DEFAULT.GetTermsIndex(ar, "sortedset");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
@@ -768,7 +794,9 @@ namespace Lucene.Net.Search
new DocTermOrds(ar, null, "sortedset");
Assert.Fail();
}
+#pragma warning disable 168
catch (InvalidOperationException expected)
+#pragma warning restore 168
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
index a341acb..9847b9a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs
@@ -374,7 +374,9 @@ namespace Lucene.Net.Search
new FilteredQuery(null, null);
Assert.Fail("Should throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
@@ -383,7 +385,9 @@ namespace Lucene.Net.Search
new FilteredQuery(new TermQuery(new Term("field", "one")), null);
Assert.Fail("Should throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
@@ -392,7 +396,9 @@ namespace Lucene.Net.Search
new FilteredQuery(null, new PrefixFilter(new Term("field", "o")));
Assert.Fail("Should throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
index b24ca17..0ead1d4 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFuzzyQuery.cs
@@ -368,7 +368,9 @@ namespace Lucene.Net.Search
q = new FuzzyQuery(new Term("field", "t"), 3);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs b/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
index d8fef55..d5dce40 100644
--- a/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestIndexSearcher.cs
@@ -130,7 +130,9 @@ namespace Lucene.Net.Search
s.SearchAfter(new ScoreDoc(r.MaxDoc, 0.54f), new MatchAllDocsQuery(), 10);
Assert.Fail("should have hit IllegalArgumentException when searchAfter exceeds maxDoc");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
index b11db87..556a7fd 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
@@ -142,7 +142,9 @@ namespace Lucene.Net.Search
query4.Add(new Term("field2", "foobar"));
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// okay, all terms must belong to the same field
}
@@ -616,7 +618,9 @@ namespace Lucene.Net.Search
query.Slop = -2;
Assert.Fail("didn't get expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected exception
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 7b9c7ae..394bfca 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -747,7 +747,9 @@ namespace Lucene.Net.Search
query.Slop = -2;
Assert.Fail("didn't get expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected exception
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
index a0b98c7..1460f52 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
@@ -313,7 +313,9 @@ namespace Lucene.Net.Search
searcherManager.Acquire();
Assert.Fail("already closed");
}
+#pragma warning disable 168
catch (AlreadyClosedException ex)
+#pragma warning restore 168
{
// expected
}
@@ -360,7 +362,9 @@ namespace Lucene.Net.Search
}
#if !NETSTANDARD
}
+#pragma warning disable 168
catch (ThreadInterruptedException e)
+#pragma warning restore 168
{
//
}
@@ -474,7 +478,9 @@ namespace Lucene.Net.Search
// this should fail
sm.Acquire();
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
// ok
}
@@ -484,7 +490,9 @@ namespace Lucene.Net.Search
// this should fail
sm.MaybeRefresh();
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
// ok
}
@@ -550,7 +558,9 @@ namespace Lucene.Net.Search
{
new SearcherManager(dir, theEvilOne);
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
@@ -558,7 +568,9 @@ namespace Lucene.Net.Search
{
new SearcherManager(w.w, random.NextBoolean(), theEvilOne);
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestTimeLimitingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTimeLimitingCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTimeLimitingCollector.cs
index 27d44b5..f500ce2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTimeLimitingCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTimeLimitingCollector.cs
@@ -413,7 +413,9 @@ namespace Lucene.Net.Search
throw;
}
#else
+#pragma warning disable 168
catch (ThreadInterruptedException ie)
+#pragma warning restore 168
{
throw;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
index 1776390..c82ab20 100644
--- a/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs
@@ -182,7 +182,9 @@ namespace Lucene.Net.Store
CheckReadBytes(input, 11, pos);
Assert.Fail("Block read past end of file");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
/* success */
}
@@ -192,7 +194,9 @@ namespace Lucene.Net.Store
CheckReadBytes(input, 50, pos);
Assert.Fail("Block read past end of file");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
/* success */
}
@@ -202,7 +206,9 @@ namespace Lucene.Net.Store
CheckReadBytes(input, 100000, pos);
Assert.Fail("Block read past end of file");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
/* success */
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestDirectory.cs b/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
index 94161b1..c740945 100644
--- a/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
@@ -47,7 +47,9 @@ namespace Lucene.Net.Store
dir.CreateOutput("test", NewIOContext(Random()));
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (AlreadyClosedException ace)
+#pragma warning restore 168
{
}
}
@@ -139,7 +141,9 @@ namespace Lucene.Net.Store
{
using (IndexInput input = outerBDWrapper.OpenInput(file, NewIOContext(Random()))) { }
}
+#pragma warning disable 168
catch (FileNotFoundException fne)
+#pragma warning restore 168
{
}
catch (IOException e)
@@ -240,7 +244,9 @@ namespace Lucene.Net.Store
{
Assert.IsFalse(lock2.Obtain(1));
}
+#pragma warning disable 168
catch (LockObtainFailedException e)
+#pragma warning restore 168
{
// OK
}
@@ -348,7 +354,9 @@ namespace Lucene.Net.Store
var d = new SimpleFSDirectory(new DirectoryInfo(Path.Combine(path.FullName, "afile")), null);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (NoSuchDirectoryException nsde)
+#pragma warning restore 168
{
// Expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Store/TestLock.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestLock.cs b/src/Lucene.Net.Tests/core/Store/TestLock.cs
index eb29149..8067883 100644
--- a/src/Lucene.Net.Tests/core/Store/TestLock.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestLock.cs
@@ -36,7 +36,9 @@ namespace Lucene.Net.Store
@lock.Obtain(Lock.LOCK_POLL_INTERVAL);
Assert.Fail("Should have failed to obtain lock");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
Assert.AreEqual(@lock.LockAttempts, 2, "should attempt to lock more than once");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs b/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
index 912529a..ef4d2a1 100644
--- a/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestLockFactory.cs
@@ -129,7 +129,9 @@ namespace Lucene.Net.Store
writer2 = new IndexWriter(dir, (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))).SetOpenMode(OpenMode.APPEND));
Assert.Fail("Should have hit an IOException with two IndexWriters on default SingleInstanceLockFactory");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Store/TestMockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestMockDirectoryWrapper.cs b/src/Lucene.Net.Tests/core/Store/TestMockDirectoryWrapper.cs
index 6ed0b34..b14ccfb 100644
--- a/src/Lucene.Net.Tests/core/Store/TestMockDirectoryWrapper.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestMockDirectoryWrapper.cs
@@ -82,7 +82,9 @@ namespace Lucene.Net.Store
@out.WriteBytes(bytes, bytes.Length);
Assert.Fail("should have failed on disk full");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
// expected
}
@@ -102,7 +104,9 @@ namespace Lucene.Net.Store
@out.CopyBytes(new ByteArrayDataInput(bytes), bytes.Length);
Assert.Fail("should have failed on disk full");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Store/TestMultiMMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestMultiMMap.cs b/src/Lucene.Net.Tests/core/Store/TestMultiMMap.cs
index 22bec27..6e609c3 100644
--- a/src/Lucene.Net.Tests/core/Store/TestMultiMMap.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestMultiMMap.cs
@@ -75,7 +75,9 @@ namespace Lucene.Net.Store
one.ReadVInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -84,7 +86,9 @@ namespace Lucene.Net.Store
two.ReadVInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -93,7 +97,9 @@ namespace Lucene.Net.Store
three.ReadVInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -121,7 +127,9 @@ namespace Lucene.Net.Store
two.ReadVInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -150,7 +158,9 @@ namespace Lucene.Net.Store
one.ReadInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -159,7 +169,9 @@ namespace Lucene.Net.Store
two.ReadInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -168,7 +180,9 @@ namespace Lucene.Net.Store
three.ReadInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -177,7 +191,9 @@ namespace Lucene.Net.Store
four.ReadInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
@@ -207,7 +223,9 @@ namespace Lucene.Net.Store
one.ReadInt();
Assert.Fail("Must throw AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ignore)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Support/TestDataInputStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestDataInputStream.cs b/src/Lucene.Net.Tests/core/Support/TestDataInputStream.cs
index 769319d..cef37ed 100644
--- a/src/Lucene.Net.Tests/core/Support/TestDataInputStream.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestDataInputStream.cs
@@ -191,11 +191,15 @@ namespace Lucene.Net.Support
fail("DataInputStream.skipBytes does not return expected value");
}
}
+#pragma warning disable 168
catch (EndOfStreamException e)
+#pragma warning restore 168
{
fail("DataInputStream.skipBytes throws unexpected EOFException");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
Console.WriteLine("IOException is thrown - possible result");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs b/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
index ee0a0b9..709990f 100644
--- a/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
+++ b/src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs
@@ -55,7 +55,9 @@ namespace Lucene.Net
{
Thread.Sleep(10000);
}
+#pragma warning disable 168
catch (ThreadInterruptedException e)
+#pragma warning restore 168
{
// Ignore.
}
@@ -137,7 +139,9 @@ namespace Lucene.Net
{
Thread.Sleep(1000);
}
+#pragma warning disable 168
catch (ThreadInterruptedException e)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs b/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
index dd62a80..2e36a9c 100644
--- a/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
@@ -393,7 +393,9 @@ namespace Lucene.Net.Util.Fst
{
var _ = termsEnum.Ord;
}
+#pragma warning disable 168
catch (System.NotSupportedException uoe)
+#pragma warning restore 168
{
if (VERBOSE)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs
index b35a97e..8527887 100644
--- a/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs
+++ b/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs
@@ -516,7 +516,9 @@ namespace Lucene.Net.Util.Packed
{
p64 = new Packed64(INDEX, BITS);
}
+#pragma warning disable 168
catch (System.OutOfMemoryException oome)
+#pragma warning restore 168
{
// this can easily happen: we're allocating a
// long[] that needs 256-273 MB. Heap is 512 MB,
@@ -536,7 +538,9 @@ namespace Lucene.Net.Util.Packed
{
p64sb = Packed64SingleBlock.Create(INDEX, BITS);
}
+#pragma warning disable 168
catch (System.OutOfMemoryException oome)
+#pragma warning restore 168
{
// Ignore: see comment above
}
@@ -552,7 +556,9 @@ namespace Lucene.Net.Util.Packed
{
p8 = new Packed8ThreeBlocks(index);
}
+#pragma warning disable 168
catch (System.OutOfMemoryException oome)
+#pragma warning restore 168
{
// Ignore: see comment above
}
@@ -569,7 +575,9 @@ namespace Lucene.Net.Util.Packed
{
p16 = new Packed16ThreeBlocks(index);
}
+#pragma warning disable 168
catch (System.OutOfMemoryException oome)
+#pragma warning restore 168
{
// Ignore: see comment above
}
@@ -1369,7 +1377,9 @@ namespace Lucene.Net.Util.Packed
it.Next();
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
// OK
}
@@ -1406,7 +1416,9 @@ namespace Lucene.Net.Util.Packed
it2.Skip(1);
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
// OK
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs b/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs
index 3f8249e..e685091 100644
--- a/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs
+++ b/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs
@@ -68,7 +68,9 @@ namespace Lucene.Net.Util
}
}
}
+#pragma warning disable 168
catch (System.OutOfMemoryException e)
+#pragma warning restore 168
{
// Release and quit.
}
@@ -152,7 +154,9 @@ namespace Lucene.Net.Util
}
}
}
+#pragma warning disable 168
catch (System.OutOfMemoryException e)
+#pragma warning restore 168
{
// Release and quit.
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestArrayUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestArrayUtil.cs b/src/Lucene.Net.Tests/core/Util/TestArrayUtil.cs
index f7bb029..0b0c27c 100644
--- a/src/Lucene.Net.Tests/core/Util/TestArrayUtil.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestArrayUtil.cs
@@ -81,7 +81,9 @@ namespace Lucene.Net.Util
test = ArrayUtil.ParseInt("".ToCharArray());
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (FormatException e)
+#pragma warning restore 168
{
//expected
}
@@ -90,7 +92,9 @@ namespace Lucene.Net.Util
test = ArrayUtil.ParseInt("foo".ToCharArray());
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (FormatException e)
+#pragma warning restore 168
{
//expected
}
@@ -99,7 +103,9 @@ namespace Lucene.Net.Util
test = ArrayUtil.ParseInt(Convert.ToString(long.MaxValue).ToCharArray());
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (FormatException e)
+#pragma warning restore 168
{
//expected
}
@@ -108,7 +114,9 @@ namespace Lucene.Net.Util
test = ArrayUtil.ParseInt("0.34".ToCharArray());
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (FormatException e)
+#pragma warning restore 168
{
//expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestAttributeSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestAttributeSource.cs b/src/Lucene.Net.Tests/core/Util/TestAttributeSource.cs
index 6c45e34..f4a0c43 100644
--- a/src/Lucene.Net.Tests/core/Util/TestAttributeSource.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestAttributeSource.cs
@@ -80,7 +80,9 @@ namespace Lucene.Net.Util
src3.RestoreState(state);
Assert.Fail("The third instance is missing the TypeAttribute, so restoreState() should throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
@@ -145,7 +147,9 @@ namespace Lucene.Net.Util
src.AddAttribute<Token>();
Assert.Fail("Should throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
}
@@ -155,10 +159,14 @@ namespace Lucene.Net.Util
src.AddAttribute<Token>();
Assert.Fail("Should throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
}
+ // LUCENENET TODO: Finish implementation
+
/*try
{
AttributeSource src = new AttributeSource();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs b/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
index 76f3a3c..dda066f 100644
--- a/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestCharsRef.cs
@@ -159,7 +159,9 @@ namespace Lucene.Net.Util
var _ = c[-1];
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -169,7 +171,9 @@ namespace Lucene.Net.Util
var _ = c[3];
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -204,7 +208,9 @@ namespace Lucene.Net.Util
c.SubSequence(-1, 1);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -214,7 +220,9 @@ namespace Lucene.Net.Util
c.SubSequence(0, -1);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -224,7 +232,9 @@ namespace Lucene.Net.Util
c.SubSequence(0, 4);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -234,7 +244,9 @@ namespace Lucene.Net.Util
c.SubSequence(2, 1);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
// expected exception
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestIOUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestIOUtils.cs b/src/Lucene.Net.Tests/core/Util/TestIOUtils.cs
index 2682431..e15d5ac 100644
--- a/src/Lucene.Net.Tests/core/Util/TestIOUtils.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestIOUtils.cs
@@ -63,7 +63,9 @@ namespace Lucene.Net.Util
Assert.IsTrue(e1.Data.Contains("SuppressedExceptions"));
Assert.IsTrue(((List<Exception>) e1.Data["SuppressedExceptions"]).Count == 2);
}
+#pragma warning disable 168
catch (Exception e2)
+#pragma warning restore 168
{
Assert.Fail("Exception should not be thrown here");
}
@@ -78,7 +80,9 @@ namespace Lucene.Net.Util
Assert.IsTrue(e1.Data.Contains("SuppressedExceptions"));
Assert.IsTrue(((List<Exception>)e1.Data["SuppressedExceptions"]).Count == 1);
}
+#pragma warning disable 168
catch (Exception e2)
+#pragma warning restore 168
{
Assert.Fail("Exception should not be thrown here");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestNamedSPILoader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestNamedSPILoader.cs b/src/Lucene.Net.Tests/core/Util/TestNamedSPILoader.cs
index 5d42841..b9f1697 100644
--- a/src/Lucene.Net.Tests/core/Util/TestNamedSPILoader.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestNamedSPILoader.cs
@@ -43,7 +43,9 @@ namespace Lucene.Net.Util
Codec.ForName("dskfdskfsdfksdfdsf");
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs
index 9b6c329..45614c2 100644
--- a/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestNumericUtils.cs
@@ -91,7 +91,9 @@ namespace Lucene.Net.Util
NumericUtils.PrefixCodedToInt(prefixVals[i]);
Assert.Fail("decoding a prefix coded long value as int should fail");
}
+#pragma warning disable 168
catch (FormatException e)
+#pragma warning restore 168
{
// worked
}
@@ -137,7 +139,9 @@ namespace Lucene.Net.Util
NumericUtils.PrefixCodedToLong(prefixVals[i]);
Assert.Fail("decoding a prefix coded int value as long should fail");
}
+#pragma warning disable 168
catch (FormatException e)
+#pragma warning restore 168
{
// worked
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
index 3bb0c0c..022bfd3 100644
--- a/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestOfflineSorter.cs
@@ -223,7 +223,9 @@ namespace Lucene.Net.Util
OfflineSorter.BufferSize.Megabytes(2048);
Assert.Fail("max mb is 2047");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
}
@@ -232,7 +234,9 @@ namespace Lucene.Net.Util
OfflineSorter.BufferSize.Megabytes(0);
Assert.Fail("min mb is 0.5");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
}
@@ -241,7 +245,9 @@ namespace Lucene.Net.Util
OfflineSorter.BufferSize.Megabytes(-1);
Assert.Fail("min mb is 0.5");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestRamUsageEstimatorOnWildAnimals.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestRamUsageEstimatorOnWildAnimals.cs b/src/Lucene.Net.Tests/core/Util/TestRamUsageEstimatorOnWildAnimals.cs
index ad73e91..610f6cf 100644
--- a/src/Lucene.Net.Tests/core/Util/TestRamUsageEstimatorOnWildAnimals.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestRamUsageEstimatorOnWildAnimals.cs
@@ -52,7 +52,9 @@ namespace Lucene.Net.Util
RamUsageEstimator.SizeOf(first); // cause SOE or pass.
lower = mid;
}
+#pragma warning disable 168
catch (System.StackOverflowException e)
+#pragma warning restore 168
{
upper = mid;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestUnicodeUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestUnicodeUtil.cs b/src/Lucene.Net.Tests/core/Util/TestUnicodeUtil.cs
index e433f8b..ef7314e 100644
--- a/src/Lucene.Net.Tests/core/Util/TestUnicodeUtil.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestUnicodeUtil.cs
@@ -145,7 +145,9 @@ namespace Lucene.Net.Util
{
UnicodeUtil.CodePointCount(new BytesRef(bytes));
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
threwAssertion = true;
}
@@ -216,11 +218,15 @@ namespace Lucene.Net.Util
Assert.AreEqual(cpString.Substring(rs, rc), str);
continue;
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException e1)
+#pragma warning restore 168
{
// Ignored.
}
+#pragma warning disable 168
catch (System.ArgumentException e2)
+#pragma warning restore 168
{
// Ignored.
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestVirtualMethod.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestVirtualMethod.cs b/src/Lucene.Net.Tests/core/Util/TestVirtualMethod.cs
index 30c8b00..81c8325 100644
--- a/src/Lucene.Net.Tests/core/Util/TestVirtualMethod.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestVirtualMethod.cs
@@ -114,7 +114,9 @@ namespace Lucene.Net.Util
PublicTestMethod.GetImplementationDistance(typeof(LuceneTestCase));
Assert.Fail("LuceneTestCase is not a subclass and can never override publicTest(String)");
}
+#pragma warning disable 168
catch (System.ArgumentException arg)
+#pragma warning restore 168
{
// pass
}
@@ -124,7 +126,9 @@ namespace Lucene.Net.Util
new VirtualMethod(typeof(BaseTestVirtualMethod), "bogus");
Assert.Fail("Method bogus() does not exist, so IAE should be thrown");
}
+#pragma warning disable 168
catch (System.ArgumentException arg)
+#pragma warning restore 168
{
// pass
}
@@ -133,7 +137,9 @@ namespace Lucene.Net.Util
{
new VirtualMethod(typeof(TestClass2), "PublicTest", typeof(string));
}
+#pragma warning disable 168
catch (System.ArgumentException arg)
+#pragma warning restore 168
{
Assert.Fail("Method publicTest(String) is declared in TestClass2, so IAE should not be thrown");
}
@@ -144,7 +150,9 @@ namespace Lucene.Net.Util
new VirtualMethod(typeof(BaseTestVirtualMethod), "PublicTest", typeof(string));
Assert.Fail("Violating singleton status succeeded");
}
+#pragma warning disable 168
catch (System.ArgumentException arg)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Util/TestWeakIdentityMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestWeakIdentityMap.cs b/src/Lucene.Net.Tests/core/Util/TestWeakIdentityMap.cs
index 2b2c0e4..38da482 100644
--- a/src/Lucene.Net.Tests/core/Util/TestWeakIdentityMap.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestWeakIdentityMap.cs
@@ -154,7 +154,9 @@ namespace Lucene.Net.Util
size = newSize;
#if !NETSTANDARD
}
+#pragma warning disable 168
catch (ThreadInterruptedException ie)
+#pragma warning restore 168
{
}
#endif
@@ -267,7 +269,9 @@ namespace Lucene.Net.Util
size = newSize;
#if !NETSTANDARD
}
+#pragma warning disable 168
catch (ThreadInterruptedException ie)
+#pragma warning restore 168
{
}
#endif
[08/50] [abbrv] lucenenet git commit: Lucene.Net.Tests: suppressed
warnings about unused variables on caught exceptions
Posted by ni...@apache.org.
Lucene.Net.Tests: suppressed warnings about unused variables on caught exceptions
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/86686bf7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/86686bf7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/86686bf7
Branch: refs/heads/api-work
Commit: 86686bf789a6bbe8725e9386a3ccec43d971ff2b
Parents: 096a317
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 02:35:58 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:45 2017 +0700
----------------------------------------------------------------------
.../TestCharTermAttributeImpl.cs | 12 ++++++
.../TestCompressingTermVectorsFormat.cs | 4 ++
.../core/Document/TestDateTools.cs | 6 +++
.../core/Document/TestDocument.cs | 4 ++
src/Lucene.Net.Tests/core/Document/TestField.cs | 24 +++++++++++
src/Lucene.Net.Tests/core/Index/Test2BDocs.cs | 2 +
.../core/Index/TestAddIndexes.cs | 8 ++++
.../core/Index/TestBackwardsCompatibility.cs | 2 +
.../core/Index/TestBackwardsCompatibility3x.cs | 2 +
.../core/Index/TestBinaryDocValuesUpdates.cs | 6 +++
.../core/Index/TestCodecHoldsOpenFiles.cs | 4 ++
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 6 +++
.../core/Index/TestCompoundFile.cs | 10 +++++
.../core/Index/TestCrashCausesCorruptIndex.cs | 2 +
.../core/Index/TestDeletionPolicy.cs | 2 +
.../core/Index/TestDirectoryReader.cs | 16 ++++++++
.../Index/TestDocInverterPerFieldErrorInfo.cs | 2 +
.../core/Index/TestDocValuesIndexing.cs | 42 ++++++++++++++++++++
.../core/Index/TestFieldsReader.cs | 6 +++
src/Lucene.Net.Tests/core/Index/TestFlex.cs | 2 +
.../core/Index/TestIndexReaderClose.cs | 2 +
.../core/Index/TestIndexWriter.cs | 10 +++++
.../core/Index/TestIndexWriterCommit.cs | 2 +
.../core/Index/TestIndexWriterConfig.cs | 30 ++++++++++++++
.../core/Index/TestIndexWriterDelete.cs | 2 +
.../core/Index/TestIndexWriterExceptions.cs | 38 ++++++++++++++++++
.../core/Index/TestIndexWriterLockRelease.cs | 4 ++
.../core/Index/TestIndexWriterMergePolicy.cs | 2 +
.../core/Index/TestIndexWriterMerging.cs | 4 ++
.../core/Index/TestIndexWriterNRTIsCurrent.cs | 2 +
.../core/Index/TestIndexWriterOnDiskFull.cs | 2 +
.../core/Index/TestIndexWriterReader.cs | 6 +++
.../core/Index/TestNumericDocValuesUpdates.cs | 6 +++
.../core/Index/TestParallelAtomicReader.cs | 8 ++++
.../core/Index/TestParallelCompositeReader.cs | 18 +++++++++
.../core/Index/TestPayloadsOnVectors.cs | 2 +
.../TestPersistentSnapshotDeletionPolicy.cs | 2 +
.../core/Index/TestPostingsOffsets.cs | 6 +++
.../core/Index/TestReaderClosed.cs | 2 +
.../core/Index/TestSegmentReader.cs | 8 ++++
.../core/Index/TestSegmentTermEnum.cs | 2 +
.../core/Index/TestSnapshotDeletionPolicy.cs | 2 +
.../core/Index/TestTieredMergePolicy.cs | 6 +++
.../core/Index/TestTwoPhaseCommitTool.cs | 2 +
.../core/Search/MultiCollectorTest.cs | 2 +
.../core/Search/TestBooleanQuery.cs | 2 +
.../core/Search/TestCachingCollector.cs | 4 ++
.../TestControlledRealTimeReopenThread.cs | 4 ++
.../core/Search/TestFieldCache.cs | 28 +++++++++++++
.../core/Search/TestFilteredQuery.cs | 6 +++
.../core/Search/TestFuzzyQuery.cs | 2 +
.../core/Search/TestIndexSearcher.cs | 2 +
.../core/Search/TestMultiPhraseQuery.cs | 4 ++
.../core/Search/TestPhraseQuery.cs | 2 +
.../core/Search/TestSearcherManager.cs | 12 ++++++
.../core/Search/TestTimeLimitingCollector.cs | 2 +
.../core/Store/TestBufferedIndexInput.cs | 6 +++
.../core/Store/TestDirectory.cs | 8 ++++
src/Lucene.Net.Tests/core/Store/TestLock.cs | 2 +
.../core/Store/TestLockFactory.cs | 2 +
.../core/Store/TestMockDirectoryWrapper.cs | 4 ++
.../core/Store/TestMultiMMap.cs | 18 +++++++++
.../core/Support/TestDataInputStream.cs | 4 ++
.../core/TestWorstCaseTestBehavior.cs | 4 ++
src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs | 2 +
.../core/Util/Packed/TestPackedInts.cs | 12 ++++++
.../core/Util/StressRamUsageEstimator.cs | 4 ++
src/Lucene.Net.Tests/core/Util/TestArrayUtil.cs | 8 ++++
.../core/Util/TestAttributeSource.cs | 8 ++++
src/Lucene.Net.Tests/core/Util/TestCharsRef.cs | 12 ++++++
src/Lucene.Net.Tests/core/Util/TestIOUtils.cs | 4 ++
.../core/Util/TestNamedSPILoader.cs | 2 +
.../core/Util/TestNumericUtils.cs | 4 ++
.../core/Util/TestOfflineSorter.cs | 6 +++
.../Util/TestRamUsageEstimatorOnWildAnimals.cs | 2 +
.../core/Util/TestUnicodeUtil.cs | 6 +++
.../core/Util/TestVirtualMethod.cs | 8 ++++
.../core/Util/TestWeakIdentityMap.cs | 4 ++
78 files changed, 530 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Analysis/Tokenattributes/TestCharTermAttributeImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/Tokenattributes/TestCharTermAttributeImpl.cs b/src/Lucene.Net.Tests/core/Analysis/Tokenattributes/TestCharTermAttributeImpl.cs
index 504967e..6501d0c 100644
--- a/src/Lucene.Net.Tests/core/Analysis/Tokenattributes/TestCharTermAttributeImpl.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/Tokenattributes/TestCharTermAttributeImpl.cs
@@ -228,7 +228,9 @@ namespace Lucene.Net.Analysis.TokenAttributes
t.Append((ICharSequence)t2, 1, 5);
Assert.Fail("Should throw ArgumentOutOfRangeException");
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException iobe)
+#pragma warning restore 168
{
}
@@ -237,7 +239,9 @@ namespace Lucene.Net.Analysis.TokenAttributes
t.Append((ICharSequence)t2, 1, 0);
Assert.Fail("Should throw ArgumentOutOfRangeException");
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException iobe)
+#pragma warning restore 168
{
}
@@ -251,7 +255,9 @@ namespace Lucene.Net.Analysis.TokenAttributes
t.Append((string)t2.ToString(), 1, 5);
Assert.Fail("Should throw IndexOutOfBoundsException");
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException iobe)
+#pragma warning restore 168
{
}
@@ -260,7 +266,9 @@ namespace Lucene.Net.Analysis.TokenAttributes
t.Append((string)t2.ToString(), 1, 0);
Assert.Fail("Should throw IndexOutOfBoundsException");
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException iobe)
+#pragma warning restore 168
{
}
@@ -274,7 +282,9 @@ namespace Lucene.Net.Analysis.TokenAttributes
t.Append((char[])t2.ToString().ToCharArray(), 1, 5);
Assert.Fail("Should throw IndexOutOfBoundsException");
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException iobe)
+#pragma warning restore 168
{
}
@@ -283,7 +293,9 @@ namespace Lucene.Net.Analysis.TokenAttributes
t.Append((char[])t2.ToString().ToCharArray(), 1, 0);
Assert.Fail("Should throw IndexOutOfBoundsException");
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException iobe)
+#pragma warning restore 168
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
index 978fcb7..a5b5181 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
@@ -67,7 +67,9 @@ namespace Lucene.Net.Codecs.Compressing
var _ = termsEnum.Ord;
Assert.Fail();
}
+#pragma warning disable 168
catch (System.NotSupportedException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -77,7 +79,9 @@ namespace Lucene.Net.Codecs.Compressing
termsEnum.SeekExact(0);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.NotSupportedException expected)
+#pragma warning restore 168
{
// expected exception
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Document/TestDateTools.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDateTools.cs b/src/Lucene.Net.Tests/core/Document/TestDateTools.cs
index d4d24cb..8a4d823 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDateTools.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDateTools.cs
@@ -45,7 +45,9 @@ namespace Lucene.Net.Documents
d = DateTools.StringToDate("97"); // no date
Assert.Fail();
} // expected exception
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
}
try
@@ -53,7 +55,9 @@ namespace Lucene.Net.Documents
d = DateTools.StringToDate("200401011235009999"); // no date
Assert.Fail();
} // expected exception
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
}
try
@@ -61,7 +65,9 @@ namespace Lucene.Net.Documents
d = DateTools.StringToDate("aaaa"); // no date
Assert.Fail();
} // expected exception
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index 465542f..555ce87 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -149,7 +149,9 @@ namespace Lucene.Net.Documents
new Field("name", "value", new FieldType());
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -162,7 +164,9 @@ namespace Lucene.Net.Documents
new Field("name", "value", ft2);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Document/TestField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestField.cs b/src/Lucene.Net.Tests/core/Document/TestField.cs
index 7469bd3..105384c 100644
--- a/src/Lucene.Net.Tests/core/Document/TestField.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestField.cs
@@ -441,7 +441,9 @@ namespace Lucene.Net.Documents
f.SetByteValue((byte)10);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -454,7 +456,9 @@ namespace Lucene.Net.Documents
f.SetBytesValue(new byte[] { 5, 5 });
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -467,7 +471,9 @@ namespace Lucene.Net.Documents
f.SetBytesValue(new BytesRef("bogus"));
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -480,7 +486,9 @@ namespace Lucene.Net.Documents
f.SetDoubleValue(double.MaxValue);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -493,7 +501,9 @@ namespace Lucene.Net.Documents
f.SetInt32Value(int.MaxValue);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -506,7 +516,9 @@ namespace Lucene.Net.Documents
f.SetInt64Value(long.MaxValue);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -519,7 +531,9 @@ namespace Lucene.Net.Documents
f.SetSingleValue(float.MaxValue);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -532,7 +546,9 @@ namespace Lucene.Net.Documents
f.SetReaderValue(new StringReader("BOO!"));
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -545,7 +561,9 @@ namespace Lucene.Net.Documents
f.SetInt16Value(short.MaxValue);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -558,7 +576,9 @@ namespace Lucene.Net.Documents
f.SetStringValue("BOO!");
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -571,7 +591,9 @@ namespace Lucene.Net.Documents
f.SetTokenStream(new CannedTokenStream(new Token("foo", 0, 3)));
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -584,7 +606,9 @@ namespace Lucene.Net.Documents
f.Boost = 5.0f;
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 7bf3749..ba1f2a7 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
@@ -69,7 +69,9 @@ namespace Lucene.Net.Index
new MultiReader(subReaders);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
index 14fb692..3b8bbda 100644
--- a/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestAddIndexes.cs
@@ -305,7 +305,9 @@ namespace Lucene.Net.Index
writer.AddIndexes(aux, dir);
Assert.IsTrue(false);
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
Assert.AreEqual(100, writer.MaxDoc);
}
@@ -1232,7 +1234,9 @@ namespace Lucene.Net.Index
w.AddIndexes(toAdd);
Assert.Fail("no such codec");
}
+#pragma warning disable 168
catch (System.ArgumentException ex)
+#pragma warning restore 168
{
// expected
}
@@ -1252,7 +1256,9 @@ namespace Lucene.Net.Index
DirectoryReader.Open(toAdd);
Assert.Fail("no such codec");
}
+#pragma warning disable 168
catch (System.ArgumentException ex)
+#pragma warning restore 168
{
// expected
}
@@ -1375,7 +1381,9 @@ namespace Lucene.Net.Index
w2.AddIndexes(src);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (LockObtainFailedException lofe)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 0b0f803..0ca5bf9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -264,7 +264,9 @@ namespace Lucene.Net.Index
reader = DirectoryReader.Open(dir);
Assert.Fail("DirectoryReader.open should not pass for " + UnsupportedNames[i]);
}
+#pragma warning disable 168
catch (IndexFormatTooOldException e)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 9e3296e..0911dc0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -192,7 +192,9 @@ namespace Lucene.Net.Index
reader = DirectoryReader.Open(dir);
Assert.Fail("DirectoryReader.open should not pass for " + UnsupportedNames[i]);
}
+#pragma warning disable 168
catch (IndexFormatTooOldException e)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
index 3075753..266b436 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
@@ -632,7 +632,9 @@ namespace Lucene.Net.Index
writer.UpdateBinaryDocValue(new Term("key", "doc"), "bdv", ToBytes(17L));
Assert.Fail("should not have allowed creating new fields through update");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -642,7 +644,9 @@ namespace Lucene.Net.Index
writer.UpdateBinaryDocValue(new Term("key", "doc"), "foo", ToBytes(17L));
Assert.Fail("should not have allowed updating an existing field to binary-dv");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -1169,7 +1173,9 @@ namespace Lucene.Net.Index
writer.Dispose();
Assert.Fail("should not have succeeded to update a segment written with an old Codec");
}
+#pragma warning disable 168
catch (System.NotSupportedException e)
+#pragma warning restore 168
{
writer.Rollback();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs b/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
index 6d07587..66622af 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecHoldsOpenFiles.cs
@@ -54,7 +54,9 @@ namespace Lucene.Net.Index
{
d.DeleteFile(fileName);
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// ignore: this means codec (correctly) is holding
// the file open
@@ -93,7 +95,9 @@ namespace Lucene.Net.Index
{
d.DeleteFile(fileName);
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// ignore: this means codec (correctly) is holding
// the file open
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 2d73c59..acc5093 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -673,7 +673,9 @@ namespace Lucene.Net.Index
termsEnum.SeekExact(idx);
success = true;
}
+#pragma warning disable 168
catch (System.NotSupportedException uoe)
+#pragma warning restore 168
{
// ok -- skip it
}
@@ -724,7 +726,9 @@ namespace Lucene.Net.Index
Assert.AreEqual(field.Terms[i].Docs.Length, termsEnum.DocFreq);
Assert.IsTrue(termsEnum.Term.BytesEquals(new BytesRef(field.Terms[i].Text2)));
}
+#pragma warning disable 168
catch (System.NotSupportedException uoe)
+#pragma warning restore 168
{
}
}
@@ -908,7 +912,9 @@ namespace Lucene.Net.Index
writer.Dispose();
Assert.Fail("should not have succeeded to impersonate an old format!");
}
+#pragma warning disable 168
catch (System.NotSupportedException e)
+#pragma warning restore 168
{
writer.Rollback();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
index e74eebe..179ffcf 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCompoundFile.cs
@@ -296,7 +296,9 @@ namespace Lucene.Net.Index
{
Demo_FSIndexInputBug(Dir, "test");
}
+#pragma warning disable 168
catch (ObjectDisposedException ode)
+#pragma warning restore 168
{
// expected
}
@@ -334,7 +336,9 @@ namespace Lucene.Net.Index
@in.ReadByte();
Assert.Fail("expected readByte() to throw exception");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -564,7 +568,9 @@ namespace Lucene.Net.Index
cr.OpenInput("bogus", NewIOContext(Random()));
Assert.Fail("File not found");
}
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
/* success */
//System.out.println("SUCCESS: File Not Found: " + e);
@@ -588,7 +594,9 @@ namespace Lucene.Net.Index
@is.ReadByte();
Assert.Fail("Single byte read past end of file");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
/* success */
//System.out.println("SUCCESS: single byte read past end of file: " + e);
@@ -600,7 +608,9 @@ namespace Lucene.Net.Index
@is.ReadBytes(b, 0, 50);
Assert.Fail("Block read past end of file");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
/* success */
//System.out.println("SUCCESS: block read past end of file: " + e);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestCrashCausesCorruptIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCrashCausesCorruptIndex.cs b/src/Lucene.Net.Tests/core/Index/TestCrashCausesCorruptIndex.cs
index c941359..e53c933 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCrashCausesCorruptIndex.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCrashCausesCorruptIndex.cs
@@ -84,7 +84,9 @@ namespace Lucene.Net.Index
indexWriter.Commit();
Assert.Fail("should have hit CrashingException");
}
+#pragma warning disable 168
catch (CrashingException e)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestDeletionPolicy.cs
index a96d141..faaa659 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDeletionPolicy.cs
@@ -331,7 +331,9 @@ namespace Lucene.Net.Index
Assert.IsTrue(lastDeleteTime - modTime <= leeway, "commit point was older than " + SECONDS + " seconds (" + (lastDeleteTime - modTime) + " msec) but did not get deleted ");
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
// OK
break;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 3ecc6e9..edbf47f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -480,7 +480,9 @@ namespace Lucene.Net.Index
DirectoryReader.Open(dir);
Assert.Fail("expected FileNotFoundException/NoSuchFileException");
}
+#pragma warning disable 168
catch (System.IO.FileNotFoundException /*| NoSuchFileException*/ e)
+#pragma warning restore 168
{
// expected
}
@@ -493,7 +495,9 @@ namespace Lucene.Net.Index
DirectoryReader.Open(dir);
Assert.Fail("expected FileNotFoundException/NoSuchFileException");
}
+#pragma warning disable 168
catch (System.IO.FileNotFoundException /*| NoSuchFileException*/ e)
+#pragma warning restore 168
{
// expected
}
@@ -766,7 +770,9 @@ namespace Lucene.Net.Index
DirectoryReader.Open(dir);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (NoSuchDirectoryException nsde)
+#pragma warning restore 168
{
// expected
}
@@ -886,7 +892,9 @@ namespace Lucene.Net.Index
r.DocFreq(new Term("field", "f"));
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
@@ -910,7 +918,9 @@ namespace Lucene.Net.Index
ctx.Reader.DocFreq(new Term("field", "f"));
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
@@ -1139,7 +1149,9 @@ namespace Lucene.Net.Index
r.Document(1);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -1284,7 +1296,9 @@ namespace Lucene.Net.Index
r.DocFreq(new Term("field", "f"));
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
@@ -1298,7 +1312,9 @@ namespace Lucene.Net.Index
r.DocFreq(new Term("field", "f"));
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs b/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
index c4f525c..0e498c8 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
@@ -131,7 +131,9 @@ namespace Lucene.Net.Index
{
writer.AddDocument(doc);
}
+#pragma warning disable 168
catch (BadNews badNews)
+#pragma warning restore 168
{
Assert.Fail("Unwanted exception");
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
index 623e4b7..063aad9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocValuesIndexing.cs
@@ -110,7 +110,9 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -142,7 +144,9 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -174,7 +178,9 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -269,7 +275,9 @@ namespace Lucene.Net.Index
{
w.AddDocument(doc);
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -293,7 +301,9 @@ namespace Lucene.Net.Index
{
w.AddDocument(doc);
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -319,7 +329,9 @@ namespace Lucene.Net.Index
iwriter.AddDocument(doc);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -346,7 +358,9 @@ namespace Lucene.Net.Index
iwriter.AddDocument(doc);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -373,7 +387,9 @@ namespace Lucene.Net.Index
iwriter.AddDocument(doc);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -402,7 +418,9 @@ namespace Lucene.Net.Index
iwriter.AddDocument(doc);
Assert.Fail("did not get expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -431,7 +449,9 @@ namespace Lucene.Net.Index
iwriter.AddDocument(doc);
Assert.Fail("did not get expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
@@ -456,7 +476,9 @@ namespace Lucene.Net.Index
{
w.AddDocument(doc);
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -572,7 +594,9 @@ namespace Lucene.Net.Index
StartingGun.Wait();
w.AddDocument(Doc);
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
HitExc.Set(true);
@@ -606,7 +630,9 @@ namespace Lucene.Net.Index
{
w.AddIndexes(dir2);
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -616,7 +642,9 @@ namespace Lucene.Net.Index
{
w.AddIndexes(new IndexReader[] { r });
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -643,7 +671,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -670,7 +700,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -773,7 +805,9 @@ namespace Lucene.Net.Index
writer.AddIndexes(dir);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -805,7 +839,9 @@ namespace Lucene.Net.Index
writer.AddIndexes(readers);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -837,7 +873,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -869,7 +907,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -929,7 +969,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail("should not have succeeded to add a field with different DV type than what already exists");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
writer.Rollback();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/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 365abf6..5025f45 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -213,7 +213,9 @@ namespace Lucene.Net.Index
{
i.Seek(FilePointer);
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
throw new Exception();
}
@@ -251,7 +253,9 @@ namespace Lucene.Net.Index
{
reader.Document(i);
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// expected
exc = true;
@@ -260,7 +264,9 @@ namespace Lucene.Net.Index
{
reader.Document(i);
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// expected
exc = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestFlex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlex.cs b/src/Lucene.Net.Tests/core/Index/TestFlex.cs
index db3d464..30fdf7b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlex.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlex.cs
@@ -86,7 +86,9 @@ namespace Lucene.Net.Index
{
Assert.AreEqual(0, terms.Ord);
}
+#pragma warning disable 168
catch (System.NotSupportedException uoe)
+#pragma warning restore 168
{
// ok -- codec is not required to support this op
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs b/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs
index 49ad850..6767adf 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs
@@ -90,7 +90,9 @@ namespace Lucene.Net.Index
var aaa = reader.Fields;
Assert.Fail("we are closed");
}
+#pragma warning disable 168
catch (AlreadyClosedException ex)
+#pragma warning restore 168
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index df572e3..5810adf 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -250,7 +250,9 @@ namespace Lucene.Net.Index
AddDoc(writer);
Assert.Fail("did not hit AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
// expected
}
@@ -1012,7 +1014,9 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iea)
+#pragma warning restore 168
{
// expected
}
@@ -1963,7 +1967,9 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
Assert.Fail("should have hit exception");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// expected
}
@@ -2111,7 +2117,9 @@ namespace Lucene.Net.Index
new RandomIndexWriter(Random(), d, NewIndexWriterConfig(TEST_VERSION_CURRENT, null).SetWriteLockTimeout(100));
Assert.Fail("should not be able to create another writer");
}
+#pragma warning disable 168
catch (LockObtainFailedException lofe)
+#pragma warning restore 168
{
// expected
}
@@ -2169,7 +2177,9 @@ namespace Lucene.Net.Index
w.Dispose();
Assert.Fail("should have hit exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
index 1222087..4cd35f2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
@@ -560,7 +560,9 @@ namespace Lucene.Net.Index
DirectoryReader.ListCommits(dir);
Assert.Fail("listCommits should have thrown an exception over empty index");
}
+#pragma warning disable 168
catch (IndexNotFoundException e)
+#pragma warning restore 168
{
// that's expected !
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterConfig.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterConfig.cs
index ba521bc..3dcb3ff 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterConfig.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterConfig.cs
@@ -168,7 +168,9 @@ namespace Lucene.Net.Index
Assert.IsNotNull(new RandomIndexWriter(Random(), dir, conf));
Assert.Fail("should have hit AlreadySetException");
}
+#pragma warning disable 168
catch (SetOnce<IndexWriter>.AlreadySetException e)
+#pragma warning restore 168
{
// expected
}
@@ -179,7 +181,9 @@ namespace Lucene.Net.Index
Assert.IsNotNull(new RandomIndexWriter(Random(), dir, (IndexWriterConfig)conf.Clone()));
Assert.Fail("should have hit AlreadySetException");
}
+#pragma warning disable 168
catch (SetOnce<IndexWriter>.AlreadySetException e)
+#pragma warning restore 168
{
// expected
}
@@ -311,7 +315,9 @@ namespace Lucene.Net.Index
conf.SetIndexDeletionPolicy(null);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -329,7 +335,9 @@ namespace Lucene.Net.Index
conf.SetMergeScheduler(null);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -344,7 +352,9 @@ namespace Lucene.Net.Index
conf.SetSimilarity(null);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -358,7 +368,9 @@ namespace Lucene.Net.Index
conf.SetIndexingChain(null);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -368,7 +380,9 @@ namespace Lucene.Net.Index
conf.SetMaxBufferedDeleteTerms(0);
Assert.Fail("should not have succeeded to set maxBufferedDeleteTerms to 0");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -378,7 +392,9 @@ namespace Lucene.Net.Index
conf.SetMaxBufferedDocs(1);
Assert.Fail("should not have succeeded to set maxBufferedDocs to 1");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -391,7 +407,9 @@ namespace Lucene.Net.Index
conf.SetMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH);
Assert.Fail("should not have succeeded to disable maxBufferedDocs when ramBufferSizeMB is disabled as well");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -403,7 +421,9 @@ namespace Lucene.Net.Index
conf.SetRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH);
Assert.Fail("should not have succeeded to disable ramBufferSizeMB when maxBufferedDocs is disabled as well");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -414,7 +434,9 @@ namespace Lucene.Net.Index
conf.SetReaderTermsIndexDivisor(0);
Assert.Fail("should not have succeeded to set termsIndexDivisor to 0");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -426,7 +448,9 @@ namespace Lucene.Net.Index
conf.SetReaderTermsIndexDivisor(-2);
Assert.Fail("should not have succeeded to set termsIndexDivisor to < -1");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -436,7 +460,9 @@ namespace Lucene.Net.Index
conf.SetRAMPerThreadHardLimitMB(2048);
Assert.Fail("should not have succeeded to set RAMPerThreadHardLimitMB to >= 2048");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -446,7 +472,9 @@ namespace Lucene.Net.Index
conf.SetRAMPerThreadHardLimitMB(0);
Assert.Fail("should not have succeeded to set RAMPerThreadHardLimitMB to 0");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// this is expected
}
@@ -460,7 +488,9 @@ namespace Lucene.Net.Index
conf.SetMergePolicy(null);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
index b3ff7e7..d5a57b7 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs
@@ -908,7 +908,9 @@ namespace Lucene.Net.Index
}
modifier.Commit();
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// expected
failed = true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
index 0b6ec29..ff7bd8a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs
@@ -493,7 +493,9 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (Exception re)
+#pragma warning restore 168
{
// expected
}
@@ -520,7 +522,9 @@ namespace Lucene.Net.Index
w.AddDocument(crashDoc, analyzer);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// expected
}
@@ -613,7 +617,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
}
@@ -746,7 +752,9 @@ namespace Lucene.Net.Index
{
writer.AddDocument(doc);
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// only one flush should fail:
Assert.IsFalse(hitError);
@@ -1018,7 +1026,9 @@ namespace Lucene.Net.Index
Writer.AddDocument(doc);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
}
@@ -1103,7 +1113,9 @@ namespace Lucene.Net.Index
{
writer.Commit();
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// expected
}
@@ -1179,11 +1191,15 @@ namespace Lucene.Net.Index
w.Dispose();
Assert.Fail();
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
Assert.Fail("expected only RuntimeException");
}
+#pragma warning disable 168
catch (Exception re)
+#pragma warning restore 168
{
// Expected
}
@@ -1251,7 +1267,9 @@ namespace Lucene.Net.Index
writer.Dispose();
Assert.Fail("OutOfMemoryError expected");
}
+#pragma warning disable 168
catch (System.OutOfMemoryException expected)
+#pragma warning restore 168
{
}
@@ -1319,7 +1337,9 @@ namespace Lucene.Net.Index
w.Rollback();
Assert.Fail("did not hit intentional RuntimeException");
}
+#pragma warning disable 168
catch (Exception re)
+#pragma warning restore 168
{
// expected
}
@@ -1421,7 +1441,9 @@ namespace Lucene.Net.Index
reader = DirectoryReader.Open(dir);
Assert.Fail("reader did not hit IOException on opening a corrupt index");
}
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
}
if (reader != null)
@@ -1478,7 +1500,9 @@ namespace Lucene.Net.Index
reader = DirectoryReader.Open(dir);
Assert.Fail("reader did not hit IOException on opening a corrupt index");
}
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
}
if (reader != null)
@@ -1537,7 +1561,9 @@ namespace Lucene.Net.Index
{
reader = DirectoryReader.Open(dir);
}
+#pragma warning disable 168
catch (Exception e)
+#pragma warning restore 168
{
Assert.Fail("reader failed to open on a crashed index");
}
@@ -1851,7 +1877,9 @@ namespace Lucene.Net.Index
new IndexWriter(d, NewIndexWriterConfig(TEST_VERSION_CURRENT, null));
Assert.Fail("should have gotten a UOE");
}
+#pragma warning disable 168
catch (System.NotSupportedException expected)
+#pragma warning restore 168
{
}
@@ -1877,7 +1905,9 @@ namespace Lucene.Net.Index
iw.AddDocument(doc);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected exception
}
@@ -1926,7 +1956,9 @@ namespace Lucene.Net.Index
iw.AddDocument(list);
Assert.Fail("didn't get any exception, boost silently discarded");
}
+#pragma warning disable 168
catch (System.NotSupportedException expected)
+#pragma warning restore 168
{
// expected
}
@@ -2022,12 +2054,16 @@ namespace Lucene.Net.Index
{
iw = new IndexWriter(dir, iwc);
}
+#pragma warning disable 168
catch (CorruptIndexException ex)
+#pragma warning restore 168
{
// Exceptions are fine - we are running out of file handlers here
continue;
}
+#pragma warning disable 168
catch (FileNotFoundException/* | NoSuchFileException*/ ex)
+#pragma warning restore 168
{
continue;
}
@@ -2496,7 +2532,9 @@ namespace Lucene.Net.Index
{
iw.Rollback();
}
+#pragma warning disable 168
catch (MockDirectoryWrapper.FakeIOException expected)
+#pragma warning restore 168
{
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterLockRelease.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterLockRelease.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterLockRelease.cs
index 91bdf41..c0705f0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterLockRelease.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterLockRelease.cs
@@ -41,13 +41,17 @@ namespace Lucene.Net.Index
{
new IndexWriter(dir, (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))).SetOpenMode(OpenMode.APPEND));
}
+#pragma warning disable 168
catch (FileNotFoundException /*| NoSuchFileException*/ e)
+#pragma warning restore 168
{
try
{
new IndexWriter(dir, (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))).SetOpenMode(OpenMode.APPEND));
}
+#pragma warning disable 168
catch (FileNotFoundException /*| NoSuchFileException*/ e1)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterMergePolicy.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterMergePolicy.cs
index 33a767a..a6b95d7 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterMergePolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterMergePolicy.cs
@@ -298,7 +298,9 @@ namespace Lucene.Net.Index
lmp.MaxCFSSegmentSizeMB = -2.0;
Assert.Fail("Didn't throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
index 223c231..879418b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterMerging.cs
@@ -458,12 +458,16 @@ namespace Lucene.Net.Index
{
FinalWriter.AddDocument(Doc);
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
done = true;
break;
}
+#pragma warning disable 168
catch (System.NullReferenceException e)
+#pragma warning restore 168
{
done = true;
break;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterNRTIsCurrent.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterNRTIsCurrent.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterNRTIsCurrent.cs
index 8346eda..3866d4d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterNRTIsCurrent.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterNRTIsCurrent.cs
@@ -170,7 +170,9 @@ namespace Lucene.Net.Index
{
currentReader.DecRef();
}
+#pragma warning disable 168
catch (IOException e)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterOnDiskFull.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterOnDiskFull.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterOnDiskFull.cs
index 483bb6d..eae0626 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterOnDiskFull.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterOnDiskFull.cs
@@ -612,7 +612,9 @@ namespace Lucene.Net.Index
w.Commit();
Assert.Fail("fake disk full IOExceptions not hit");
}
+#pragma warning disable 168
catch (IOException ioe)
+#pragma warning restore 168
{
// expected
Assert.IsTrue(ftdm.DidFail1 || ftdm.DidFail2);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
index 4d149bd..4748ea0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterReader.cs
@@ -844,7 +844,9 @@ namespace Lucene.Net.Index
DirectoryReader.OpenIfChanged(r);
Assert.Fail("failed to hit AlreadyClosedException");
}
+#pragma warning disable 168
catch (AlreadyClosedException ace)
+#pragma warning restore 168
{
// expected
}
@@ -1267,7 +1269,9 @@ namespace Lucene.Net.Index
TestUtil.Docs(Random(), r, "f", new BytesRef("val"), null, null, DocsEnum.FLAG_NONE);
Assert.Fail("should have failed to seek since terms index was not loaded.");
}
+#pragma warning disable 168
catch (InvalidOperationException e)
+#pragma warning restore 168
{
// expected - we didn't load the term index
}
@@ -1345,7 +1349,9 @@ namespace Lucene.Net.Index
{
writer.Reader.Dispose();
}
+#pragma warning disable 168
catch (FakeIOException e)
+#pragma warning restore 168
{
// expected
if (VERBOSE)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
index 7fdf1bd..4bff40a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
@@ -590,7 +590,9 @@ namespace Lucene.Net.Index
writer.UpdateNumericDocValue(new Term("key", "doc"), "ndv", 17L);
Assert.Fail("should not have allowed creating new fields through update");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -600,7 +602,9 @@ namespace Lucene.Net.Index
writer.UpdateNumericDocValue(new Term("key", "doc"), "foo", 17L);
Assert.Fail("should not have allowed updating an existing field to numeric-dv");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
@@ -1088,7 +1092,9 @@ namespace Lucene.Net.Index
writer.Dispose();
Assert.Fail("should not have succeeded to update a segment written with an old Codec");
}
+#pragma warning disable 168
catch (System.NotSupportedException e)
+#pragma warning restore 168
{
writer.Rollback();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestParallelAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestParallelAtomicReader.cs b/src/Lucene.Net.Tests/core/Index/TestParallelAtomicReader.cs
index b46e583..c6e896a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestParallelAtomicReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestParallelAtomicReader.cs
@@ -146,7 +146,9 @@ namespace Lucene.Net.Index
pr.Document(0);
Assert.Fail("ParallelAtomicReader should be already closed because inner reader was closed!");
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
// pass
}
@@ -179,7 +181,9 @@ namespace Lucene.Net.Index
new ParallelAtomicReader(ir1, ir2);
Assert.Fail("didn't get exptected exception: indexes don't have same number of documents");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -189,7 +193,9 @@ namespace Lucene.Net.Index
new ParallelAtomicReader(Random().NextBoolean(), new AtomicReader[] { ir1, ir2 }, new AtomicReader[] { ir1, ir2 });
Assert.Fail("didn't get expected exception: indexes don't have same number of documents");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -255,7 +261,9 @@ namespace Lucene.Net.Index
new ParallelAtomicReader(true, new AtomicReader[0], new AtomicReader[] { ir1 });
Assert.Fail("didn't get expected exception: need a non-empty main-reader array");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestParallelCompositeReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestParallelCompositeReader.cs b/src/Lucene.Net.Tests/core/Index/TestParallelCompositeReader.cs
index 208ba30..8b7da0e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestParallelCompositeReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestParallelCompositeReader.cs
@@ -249,7 +249,9 @@ namespace Lucene.Net.Index
psub.Document(0);
Assert.Fail("Subreader should be already closed because inner reader was closed!");
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
// pass
}
@@ -259,7 +261,9 @@ namespace Lucene.Net.Index
pr.Document(0);
Assert.Fail("ParallelCompositeReader should be already closed because inner reader was closed!");
}
+#pragma warning disable 168
catch (AlreadyClosedException e)
+#pragma warning restore 168
{
// pass
}
@@ -291,7 +295,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(ir1, ir2);
Assert.Fail("didn't get expected exception: indexes don't have same number of documents");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -300,7 +306,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(Random().NextBoolean(), ir1, ir2);
Assert.Fail("didn't get expected exception: indexes don't have same number of documents");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -327,7 +335,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(readers);
Assert.Fail("didn't get expected exception: indexes don't have same subreader structure");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -336,7 +346,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(Random().NextBoolean(), readers, readers);
Assert.Fail("didn't get expected exception: indexes don't have same subreader structure");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -363,7 +375,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(readers);
Assert.Fail("didn't get expected exception: indexes don't have same subreader structure");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -372,7 +386,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(Random().NextBoolean(), readers, readers);
Assert.Fail("didn't get expected exception: indexes don't have same subreader structure");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected exception
}
@@ -442,7 +458,9 @@ namespace Lucene.Net.Index
new ParallelCompositeReader(true, new CompositeReader[0], new CompositeReader[] { ir1 });
Assert.Fail("didn't get expected exception: need a non-empty main-reader array");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
index dbc8c10..b2dec2a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
@@ -152,7 +152,9 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
index 6d548d2..84c7a59 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
@@ -113,7 +113,9 @@ namespace Lucene.Net.Index
new PersistentSnapshotDeletionPolicy(new KeepOnlyLastCommitDeletionPolicy(), dir, OpenMode.APPEND);
Assert.Fail("did not hit expected exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
index 622a793..edf670c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
@@ -462,7 +462,9 @@ namespace Lucene.Net.Index
CheckTokens(new Token[] { MakeToken("foo", 1, -1, -1) });
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
//expected
}
@@ -476,7 +478,9 @@ namespace Lucene.Net.Index
CheckTokens(new Token[] { MakeToken("foo", 1, 1, 0) });
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
//expected
}
@@ -490,7 +494,9 @@ namespace Lucene.Net.Index
CheckTokens(new Token[] { MakeToken("foo", 1, 0, 3), MakeToken("foo", 1, 4, 7), MakeToken("foo", 0, 3, 6) });
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException expected)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestReaderClosed.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestReaderClosed.cs b/src/Lucene.Net.Tests/core/Index/TestReaderClosed.cs
index 5a102b6..99df942 100644
--- a/src/Lucene.Net.Tests/core/Index/TestReaderClosed.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestReaderClosed.cs
@@ -73,7 +73,9 @@ namespace Lucene.Net.Index
{
searcher.Search(query, 5);
}
+#pragma warning disable 168
catch (AlreadyClosedException ace)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
index 6464a52..5820321 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
@@ -234,7 +234,9 @@ namespace Lucene.Net.Index
Reader.Document(-1);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
}
@@ -243,7 +245,9 @@ namespace Lucene.Net.Index
Reader.GetTermVectors(-1);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
}
@@ -252,7 +256,9 @@ namespace Lucene.Net.Index
Reader.Document(numDocs);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
}
@@ -261,7 +267,9 @@ namespace Lucene.Net.Index
Reader.GetTermVectors(numDocs);
Assert.Fail();
}
+#pragma warning disable 168
catch (System.IndexOutOfRangeException expected)
+#pragma warning restore 168
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
index d61690d..e43bc9b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
@@ -95,7 +95,9 @@ namespace Lucene.Net.Index
{
ordB = terms.Ord;
}
+#pragma warning disable 168
catch (System.NotSupportedException uoe)
+#pragma warning restore 168
{
// ok -- codec is not required to support ord
reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
index 2d797b7..3fb56f6 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
@@ -140,7 +140,9 @@ namespace Lucene.Net.Index
dp.Snapshot();
Assert.Fail("did not hit exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs b/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
index 1338f54..793736d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
@@ -228,7 +228,9 @@ namespace Lucene.Net.Index
tmp.MaxMergedSegmentMB = -2.0;
Assert.Fail("Didn't throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
@@ -247,7 +249,9 @@ namespace Lucene.Net.Index
tmp.FloorSegmentMB = -2.0;
Assert.Fail("Didn't throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
@@ -266,7 +270,9 @@ namespace Lucene.Net.Index
tmp.MaxCFSSegmentSizeMB = -2.0;
Assert.Fail("Didn't throw IllegalArgumentException");
}
+#pragma warning disable 168
catch (System.ArgumentException iae)
+#pragma warning restore 168
{
// pass
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Index/TestTwoPhaseCommitTool.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTwoPhaseCommitTool.cs b/src/Lucene.Net.Tests/core/Index/TestTwoPhaseCommitTool.cs
index 7df33ac..58c6f3a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTwoPhaseCommitTool.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTwoPhaseCommitTool.cs
@@ -127,7 +127,9 @@ namespace Lucene.Net.Index
{
TwoPhaseCommitTool.Execute(objects);
}
+#pragma warning disable 168
catch (Exception t)
+#pragma warning restore 168
{
anyFailure = true;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/MultiCollectorTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/MultiCollectorTest.cs b/src/Lucene.Net.Tests/core/Search/MultiCollectorTest.cs
index 603a3a4..5ed25ad 100644
--- a/src/Lucene.Net.Tests/core/Search/MultiCollectorTest.cs
+++ b/src/Lucene.Net.Tests/core/Search/MultiCollectorTest.cs
@@ -66,7 +66,9 @@ namespace Lucene.Net.Search
MultiCollector.Wrap(null, null);
Assert.Fail("only null collectors should not be supported");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
index fab1f24..4e8d377 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs
@@ -79,7 +79,9 @@ namespace Lucene.Net.Search
BooleanQuery.MaxClauseCount = 0;
Assert.Fail();
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// okay
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestCachingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestCachingCollector.cs b/src/Lucene.Net.Tests/core/Search/TestCachingCollector.cs
index 8705d33..a0ed92a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestCachingCollector.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestCachingCollector.cs
@@ -163,7 +163,9 @@ namespace Lucene.Net.Search
cc.Replay(new NoOpCollector(false));
Assert.Fail("replay should fail if CachingCollector is not cached");
}
+#pragma warning disable 168
catch (InvalidOperationException e)
+#pragma warning restore 168
{
// expected
}
@@ -198,7 +200,9 @@ namespace Lucene.Net.Search
cc.Replay(new NoOpCollector(false)); // this call should fail
Assert.Fail("should have failed if an in-order Collector was given to replay(), " + "while CachingCollector was initialized with out-of-order collection");
}
+#pragma warning disable 168
catch (System.ArgumentException e)
+#pragma warning restore 168
{
// ok
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/86686bf7/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
index c2eac60..174ca9f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestControlledRealTimeReopenThread.cs
@@ -525,7 +525,9 @@ namespace Lucene.Net.Search
Latch.Wait();
}
}
+#pragma warning disable 168
catch (ThreadInterruptedException e)
+#pragma warning restore 168
{
throw;
}
@@ -548,7 +550,9 @@ namespace Lucene.Net.Search
new SearcherManager(w.w, false, theEvilOne);
Assert.Fail("didn't hit expected exception");
}
+#pragma warning disable 168
catch (InvalidOperationException ise)
+#pragma warning restore 168
{
// expected
}
[28/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Search.Payloads.TestPayloadNearQuery: renamed
Similarity camelCase to prevent naming conflict with property of the same
name.
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Search.Payloads.TestPayloadNearQuery: renamed Similarity camelCase to prevent naming conflict with property of the same name.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e6823427
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e6823427
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e6823427
Branch: refs/heads/api-work
Commit: e6823427d5b173e9646721708bbb9fa2eae2b6b2
Parents: fa79353
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 04:40:08 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
.../core/Search/Payloads/TestPayloadNearQuery.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e6823427/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 cbac374..ff8f897 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search.Payloads
private static IndexSearcher Searcher;
private static IndexReader Reader;
private static Directory Directory;
- private static BoostingSimilarity Similarity = new BoostingSimilarity();
+ private static BoostingSimilarity similarity = new BoostingSimilarity();
private static byte[] Payload2 = { 2 };
private static byte[] Payload4 = { 4 };
private static readonly Regex _whiteSpaceRegex = new Regex("[\\s]+", RegexOptions.Compiled);
@@ -118,7 +118,7 @@ namespace Lucene.Net.Search.Payloads
public void BeforeClass()
{
Directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(Similarity));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(similarity));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++)
{
@@ -132,7 +132,7 @@ namespace Lucene.Net.Search.Payloads
writer.Dispose();
Searcher = NewSearcher(Reader);
- Searcher.Similarity = Similarity;
+ Searcher.Similarity = similarity;
}
[TestFixtureTearDown]
[42/50] [abbrv] lucenenet git commit:
Lucene.Net.Codecs.Memory.DirectPostingsFormat: Commented unreferenced labels
Posted by ni...@apache.org.
Lucene.Net.Codecs.Memory.DirectPostingsFormat: Commented unreferenced labels
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/dcb41d8b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/dcb41d8b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/dcb41d8b
Branch: refs/heads/api-work
Commit: dcb41d8bb4aab8393587375e9fa564725bcbed5d
Parents: baa865a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:28:33 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dcb41d8b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
index 50c2004..343e623 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
@@ -1327,11 +1327,9 @@ namespace Lucene.Net.Codecs.Memory
// System.out.println(" beyond end; no terms will match");
// }
return;
- nextLabelContinue:
- ;
+ nextLabelContinue: ;
}
- nextLabelBreak:
- ;
+ //nextLabelBreak: ; // LUCENENET NOTE: Not used
}
int termOffset = outerInstance.termOffsets[termOrd];
@@ -1650,12 +1648,10 @@ namespace Lucene.Net.Codecs.Memory
// }
}
}
- nextTermContinue:
- ;
+ nextTermContinue: ;
}
- nextTermBreak:
- ;
+ //nextTermBreak: ; // LUCENENET NOTE: Not used
}
public override TermState GetTermState()
[03/50] [abbrv] lucenenet git commit:
Lucene.Net.TestFramework.Analysis.MockTokenizer: used new keyword on State
enum since a base class has a nested class with the same name. Added override
keyword to SetReaderTestPoint().
Posted by ni...@apache.org.
Lucene.Net.TestFramework.Analysis.MockTokenizer: used new keyword on State enum since a base class has a nested class with the same name. Added override keyword to SetReaderTestPoint().
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7a9be364
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7a9be364
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7a9be364
Branch: refs/heads/api-work
Commit: 7a9be364c2069bb7bce469f6f01b8c69675034be
Parents: d8d5c18
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 01:35:42 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:44 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7a9be364/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
index f2d47ab..8525eea 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Analysis
// TODO: "register" with LuceneTestCase to ensure all streams are closed() ?
// currently, we can only check that the lifecycle is correct if someone is reusing,
// but not for "one-offs".
- private enum State
+ new private enum State
{
SETREADER, // consumer set a reader input either via ctor or via reset(Reader)
RESET, // consumer has called reset()
@@ -314,7 +314,7 @@ namespace Lucene.Net.Analysis
StreamState = State.CLOSE;
}
- internal bool SetReaderTestPoint()
+ internal override bool SetReaderTestPoint()
{
Assert.True(!EnableChecks_Renamed || StreamState == State.CLOSE, "setReader() called in wrong state: " + StreamState);
StreamState = State.SETREADER;
[11/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Search.Spans.TestPayloadSpans: renamed Similarity
camelCase to prevent naming conflict with property of the same name.
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Search.Spans.TestPayloadSpans: renamed Similarity camelCase to prevent naming conflict with property of the same name.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/fa793538
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/fa793538
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/fa793538
Branch: refs/heads/api-work
Commit: fa793538b2e0afa1cdfae9b47a3cfc9c67b59637
Parents: 295c9e5
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 04:37:57 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
.../core/Search/Spans/TestPayloadSpans.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fa793538/src/Lucene.Net.Tests/core/Search/Spans/TestPayloadSpans.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestPayloadSpans.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestPayloadSpans.cs
index 7ba0910..a9393b4 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestPayloadSpans.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestPayloadSpans.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search.Spans
public class TestPayloadSpans : LuceneTestCase
{
private IndexSearcher Searcher_Renamed;
- private Similarity Similarity = new DefaultSimilarity();
+ private Similarity similarity = new DefaultSimilarity();
protected internal IndexReader IndexReader;
private IndexReader CloseIndexReader;
private Directory Directory;
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search.Spans
{
base.SetUp();
PayloadHelper helper = new PayloadHelper();
- Searcher_Renamed = helper.SetUp(Random(), Similarity, 1000);
+ Searcher_Renamed = helper.SetUp(Random(), similarity, 1000);
IndexReader = Searcher_Renamed.IndexReader;
}
@@ -110,7 +110,7 @@ namespace Lucene.Net.Search.Spans
SpanNotQuery snq = new SpanNotQuery(spq, new SpanTermQuery(new Term(PayloadHelper.FIELD, "two")));
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer(this)).SetSimilarity(Similarity));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer(this)).SetSimilarity(similarity));
Document doc = new Document();
doc.Add(NewTextField(PayloadHelper.FIELD, "one two three one four three", Field.Store.YES));
@@ -382,7 +382,7 @@ namespace Lucene.Net.Search.Spans
public virtual void TestPayloadSpanUtil()
{
Directory directory = NewDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer(this)).SetSimilarity(Similarity));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer(this)).SetSimilarity(similarity));
Document doc = new Document();
doc.Add(NewTextField(PayloadHelper.FIELD, "xx rr yy mm pp", Field.Store.YES));
@@ -446,7 +446,7 @@ namespace Lucene.Net.Search.Spans
{
Directory = NewDirectory();
string[] docs = new string[] { "xx rr yy mm pp", "xx yy mm rr pp", "nopayload qq ss pp np", "one two three four five six seven eight nine ten eleven", "nine one two three four five six seven eight eleven ten" };
- RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer(this)).SetSimilarity(Similarity));
+ RandomIndexWriter writer = new RandomIndexWriter(Random(), Directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer(this)).SetSimilarity(similarity));
Document doc = null;
for (int i = 0; i < docs.Length; i++)
[29/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Spatial.Prefix.SpatialOpRecursivePrefixTreeTest: Disabled
warning about unused variable indexedAtLeastOneShapePair
Posted by ni...@apache.org.
Lucene.Net.Tests.Spatial.Prefix.SpatialOpRecursivePrefixTreeTest: Disabled warning about unused variable indexedAtLeastOneShapePair
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ff89b055
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ff89b055
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ff89b055
Branch: refs/heads/api-work
Commit: ff89b055a5da10db5c2528cac5745d1712818723
Parents: 75eeb85
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 06:43:24 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:48 2017 +0700
----------------------------------------------------------------------
.../Prefix/SpatialOpRecursivePrefixTreeTest.cs | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ff89b055/src/Lucene.Net.Tests.Spatial/Prefix/SpatialOpRecursivePrefixTreeTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/Prefix/SpatialOpRecursivePrefixTreeTest.cs b/src/Lucene.Net.Tests.Spatial/Prefix/SpatialOpRecursivePrefixTreeTest.cs
index 7bf6041..60a45ae 100644
--- a/src/Lucene.Net.Tests.Spatial/Prefix/SpatialOpRecursivePrefixTreeTest.cs
+++ b/src/Lucene.Net.Tests.Spatial/Prefix/SpatialOpRecursivePrefixTreeTest.cs
@@ -219,7 +219,9 @@ namespace Lucene.Net.Spatial.Prefix
IDictionary<String, IShape> indexedShapes = new LinkedHashMap<String, IShape>();
IDictionary<String, IShape> indexedShapesGS = new LinkedHashMap<String, IShape>();//grid snapped
int numIndexedShapes = randomIntBetween(1, 6);
+#pragma warning disable 219
bool indexedAtLeastOneShapePair = false;
+#pragma warning restore 219
for (int i = 0; i < numIndexedShapes; i++)
{
String id = "" + i;
[46/50] [abbrv] lucenenet git commit:
Lucene.Net.Analysis.Common.Analysis.CharFilter.HTMLStripCharFilter: added
override keyword to Dispose() method
Posted by ni...@apache.org.
Lucene.Net.Analysis.Common.Analysis.CharFilter.HTMLStripCharFilter: added override keyword to Dispose() method
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c6b5c8e4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c6b5c8e4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c6b5c8e4
Branch: refs/heads/api-work
Commit: c6b5c8e45c8475a9b112184e7274490ef099218a
Parents: adf7c15
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 07:43:10 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:49 2017 +0700
----------------------------------------------------------------------
.../Analysis/CharFilter/HTMLStripCharFilter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c6b5c8e4/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
index 0dcec17..f8a0770 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
@@ -30893,7 +30893,7 @@ namespace Lucene.Net.Analysis.CharFilters
return i > 0 ? i : (len == 0 ? 0 : -1);
}
- protected virtual void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
[13/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.Index.TestIndexWriterWithThreads: removed duplicate
using statement
Posted by ni...@apache.org.
Lucene.Net.Tests.Core.Index.TestIndexWriterWithThreads: removed duplicate using statement
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/8902acec
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/8902acec
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/8902acec
Branch: refs/heads/api-work
Commit: 8902acec26503d40d3492f7dee5294cd677dd9eb
Parents: 6ef3807
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 03:04:30 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:46 2017 +0700
----------------------------------------------------------------------
.../core/Index/TestIndexWriterWithThreads.cs | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8902acec/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
index d4ae095..ee541be 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
@@ -1,29 +1,28 @@
+using Lucene.Net.Documents;
+using Lucene.Net.Randomized.Generators;
+using Lucene.Net.Support;
+using Lucene.Net.Util;
+using NUnit.Framework;
using System;
-using System.Diagnostics;
+using System.IO;
using System.Threading;
-using Lucene.Net.Documents;
namespace Lucene.Net.Index
{
//using Slow = Lucene.Net.Util.LuceneTestCase.Slow;
- using Lucene.Net.Randomized.Generators;
- using Lucene.Net.Support;
- using NUnit.Framework;
- using System.IO;
- using Util;
+
using AlreadyClosedException = Lucene.Net.Store.AlreadyClosedException;
using BaseDirectoryWrapper = Lucene.Net.Store.BaseDirectoryWrapper;
- using IBits = Lucene.Net.Util.IBits;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
using Document = Documents.Document;
using Field = Field;
using FieldType = FieldType;
+ using IBits = Lucene.Net.Util.IBits;
using LineFileDocs = Lucene.Net.Util.LineFileDocs;
using LockObtainFailedException = Lucene.Net.Store.LockObtainFailedException;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -46,7 +45,6 @@ namespace Lucene.Net.Index
using NumericDocValuesField = NumericDocValuesField;
using TestUtil = Lucene.Net.Util.TestUtil;
using TextField = TextField;
- using Util;
/// <summary>
/// MultiThreaded IndexWriter tests