Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 093F0200BA1 for ; Sun, 2 Oct 2016 12:16:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0814D160AEC; Sun, 2 Oct 2016 10:16:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A3141160AD8 for ; Sun, 2 Oct 2016 12:16:33 +0200 (CEST) Received: (qmail 72880 invoked by uid 500); 2 Oct 2016 10:16:32 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 72863 invoked by uid 99); 2 Oct 2016 10:16:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2016 10:16:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EFABDFF03; Sun, 2 Oct 2016 10:16:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: synhershko@apache.org To: commits@lucenenet.apache.org Date: Sun, 02 Oct 2016 10:16:32 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/49] lucenenet git commit: Setup InternalsVisibleTo Lucene.Net.Core <- Lucene.Net.Tests for testing. archived-at: Sun, 02 Oct 2016 10:16:35 -0000 Repository: lucenenet Updated Branches: refs/heads/master 1946bf82c -> e6012b5a7 Setup InternalsVisibleTo Lucene.Net.Core <- Lucene.Net.Tests for testing. Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c67366fd Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c67366fd Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c67366fd Branch: refs/heads/master Commit: c67366fd4b383c31971a8ae68b458dec7aee2d7f Parents: 859d37d Author: Shad Storhaug Authored: Mon Sep 5 21:25:35 2016 +0700 Committer: Shad Storhaug Committed: Mon Sep 5 21:25:35 2016 +0700 ---------------------------------------------------------------------- src/Lucene.Net.Core/AssemblyInfo.cs | 22 +++++++++++++------- .../core/Index/TestConcurrentMergeScheduler.cs | 4 ++-- .../core/Index/TestFieldsReader.cs | 2 +- .../core/Index/TestIndexReaderClose.cs | 2 +- .../core/Index/TestIndexWriter.cs | 4 ++-- .../core/Index/TestIndexWriterDelete.cs | 2 +- .../core/Index/TestIndexWriterExceptions.cs | 2 +- .../core/Search/JustCompileSearch.cs | 4 ++-- .../core/Search/Spans/JustCompileSearchSpans.cs | 2 +- .../core/Search/TestBooleanQuery.cs | 2 +- .../core/Search/TestDocIdSet.cs | 4 ++-- .../core/Search/TestFilteredQuery.cs | 2 +- .../core/Search/TestLiveFieldValues.cs | 2 +- .../core/Search/TestMultiTermQueryRewrites.cs | 2 +- .../core/Search/TestPrefixRandom.cs | 2 +- .../core/Search/TestQueryRescorer.cs | 6 +++--- .../core/Search/TestRegexpRandom2.cs | 2 +- .../core/Search/TestTopDocsCollector.cs | 2 +- .../core/Store/TestBufferedIndexInput.cs | 2 +- .../core/Store/TestHugeRamFile.cs | 2 +- .../core/TestMergeSchedulerExternal.cs | 6 +++--- .../core/Util/TestCloseableThreadLocal.cs | 2 +- .../core/Util/TestFilterIterator.cs | 16 +++++++------- .../core/Util/TestPriorityQueue.cs | 2 +- .../core/Util/TestRollingBuffer.cs | 2 +- 25 files changed, 53 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Core/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/AssemblyInfo.cs b/src/Lucene.Net.Core/AssemblyInfo.cs index dc4e47d..7eb9f7e 100644 --- a/src/Lucene.Net.Core/AssemblyInfo.cs +++ b/src/Lucene.Net.Core/AssemblyInfo.cs @@ -39,11 +39,17 @@ using System.Runtime.CompilerServices; [assembly: AssemblyInformationalVersionAttribute("4.8.0")] // for testing -[assembly: InternalsVisibleTo("Lucene.Net.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010075a07ce602f88e" + - "f263c7db8cb342c58ebd49ecdcc210fac874260b0213fb929ac3dcaf4f5b39744b800f99073eca" + - "72aebfac5f7284e1d5f2c82012a804a140f06d7d043d83e830cdb606a04da2ad5374cc92c0a495" + - "08437802fb4f8fb80a05e59f80afb99f4ccd0dfe44065743543c4b053b669509d29d332cd32a0c" + - "b1e97e84")] +//[assembly: InternalsVisibleTo("Lucene.Net.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010075a07ce602f88e" + +// "f263c7db8cb342c58ebd49ecdcc210fac874260b0213fb929ac3dcaf4f5b39744b800f99073eca" + +// "72aebfac5f7284e1d5f2c82012a804a140f06d7d043d83e830cdb606a04da2ad5374cc92c0a495" + +// "08437802fb4f8fb80a05e59f80afb99f4ccd0dfe44065743543c4b053b669509d29d332cd32a0c" + +// "b1e97e84")] + +// LUCENENET NOTE: For now it is not possible to use a SNK because we have unmanaged references in Analysis.Common. +// However, we still need InternalsVisibleTo in order to prevent making everything public just for the sake of testing. +// This has broad implications, though because many methods are marked "protected internal", which means other assemblies +// must update overridden methods to match. +[assembly: InternalsVisibleTo("Lucene.Net.Tests")] // // Version information for an assembly consists of the following four values: @@ -84,6 +90,6 @@ using System.Runtime.CompilerServices; // (*) Delay Signing is an advanced option - see the Microsoft .NET Framework // documentation for more information on this. // -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] -[assembly: AssemblyKeyName("")] +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] +//[assembly: AssemblyKeyName("")] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 14397b9..888a0e4 100644 --- a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs +++ b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs @@ -351,7 +351,7 @@ namespace Lucene.Net.Index this.Failed = failed; } - protected override void DoMerge(MergePolicy.OneMerge merge) + protected internal override void DoMerge(MergePolicy.OneMerge merge) { try { @@ -401,7 +401,7 @@ namespace Lucene.Net.Index SetMaxMergesAndThreads(5, 5); } - protected override void DoMerge(MergePolicy.OneMerge merge) + protected internal override void DoMerge(MergePolicy.OneMerge merge) { TotMergedBytes += merge.TotalBytesSize(); base.DoMerge(merge); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 3aa8842..fa54837 100644 --- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs +++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs @@ -185,7 +185,7 @@ namespace Lucene.Net.Index } } - protected override void ReadInternal(byte[] b, int offset, int length) + protected internal override void ReadInternal(byte[] b, int offset, int length) { SimOutage(); @delegate.Seek(FilePointer); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 1d4b7fc..038dfab 100644 --- a/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs +++ b/src/Lucene.Net.Tests/core/Index/TestIndexReaderClose.cs @@ -113,7 +113,7 @@ namespace Lucene.Net.Index this.ThrowOnClose = throwOnClose; } - protected override void DoClose() + protected internal override void DoClose() { base.DoClose(); if (ThrowOnClose) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 3627ed9..64b2348 100644 --- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs @@ -957,12 +957,12 @@ namespace Lucene.Net.Index internal bool AfterWasCalled; internal bool BeforeWasCalled; - protected override void DoAfterFlush() + protected internal override void DoAfterFlush() { AfterWasCalled = true; } - protected override void DoBeforeFlush() + protected internal override void DoBeforeFlush() { BeforeWasCalled = true; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 4d640f3..272c331 100644 --- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs +++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterDelete.cs @@ -1368,7 +1368,7 @@ namespace Lucene.Net.Index this.SawAfterFlush = sawAfterFlush; } - protected override void DoAfterFlush() + protected internal override void DoAfterFlush() { Assert.IsTrue(Closing.Get() || DocsInSegment.Get() >= 7, "only " + DocsInSegment.Get() + " in segment"); DocsInSegment.Set(0); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 56371db..fdc5489 100644 --- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs +++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterExceptions.cs @@ -2440,7 +2440,7 @@ namespace Lucene.Net.Index this.OuterInstance = outerInstance; } - protected override void HandleMergeException(Exception exc) + protected internal override void HandleMergeException(Exception exc) { // suppress only FakeIOException: if (!(exc is MockDirectoryWrapper.FakeIOException)) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs b/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs index 8859494..91604a4 100644 --- a/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs +++ b/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs @@ -201,7 +201,7 @@ namespace Lucene.Net.Search { } - protected override bool Match(int docid) + protected internal override bool Match(int docid) { throw new System.NotSupportedException(UNSUPPORTED_MSG); } @@ -214,7 +214,7 @@ namespace Lucene.Net.Search { } - protected override bool Match(int doc) + protected internal override bool Match(int doc) { throw new System.NotSupportedException(UNSUPPORTED_MSG); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/Spans/JustCompileSearchSpans.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/Spans/JustCompileSearchSpans.cs b/src/Lucene.Net.Tests/core/Search/Spans/JustCompileSearchSpans.cs index 9cc35e7..9e28b68 100644 --- a/src/Lucene.Net.Tests/core/Search/Spans/JustCompileSearchSpans.cs +++ b/src/Lucene.Net.Tests/core/Search/Spans/JustCompileSearchSpans.cs @@ -162,7 +162,7 @@ namespace Lucene.Net.Search.Spans { } - protected override bool SetFreqCurrentDoc() + protected internal override bool SetFreqCurrentDoc() { throw new System.NotSupportedException(UNSUPPORTED_MSG); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 2e3272f..b7e2582 100644 --- a/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs +++ b/src/Lucene.Net.Tests/core/Search/TestBooleanQuery.cs @@ -396,7 +396,7 @@ namespace Lucene.Net.Search this.OuterInstance = outerInstance; } - protected override void Search(IList leaves, Weight weight, Collector collector) + protected internal override void Search(IList leaves, Weight weight, Collector collector) { Assert.AreEqual(-1, collector.GetType().Name.IndexOf("OutOfOrder")); base.Search(leaves, weight, collector); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs b/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs index e322c18..3cf73b9 100644 --- a/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs +++ b/src/Lucene.Net.Tests/core/Search/TestDocIdSet.cs @@ -135,7 +135,7 @@ namespace Lucene.Net.Search this.OuterInstance = outerInstance; } - protected override bool Match(int docid) + protected internal override bool Match(int docid) { return docid % 2 == 0; //validate only even docids } @@ -244,7 +244,7 @@ namespace Lucene.Net.Search this.OuterInstance = outerInstance; } - protected override bool Match(int docid) + protected internal override bool Match(int docid) { return true; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 29eeac3..adae39e 100644 --- a/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs +++ b/src/Lucene.Net.Tests/core/Search/TestFilteredQuery.cs @@ -462,7 +462,7 @@ namespace Lucene.Net.Search { } - protected override bool UseRandomAccess(Bits bits, int firstFilterDoc) + protected internal override bool UseRandomAccess(Bits bits, int firstFilterDoc) { return true; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestLiveFieldValues.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestLiveFieldValues.cs b/src/Lucene.Net.Tests/core/Search/TestLiveFieldValues.cs index 4857fe1..c19b7ca 100644 --- a/src/Lucene.Net.Tests/core/Search/TestLiveFieldValues.cs +++ b/src/Lucene.Net.Tests/core/Search/TestLiveFieldValues.cs @@ -111,7 +111,7 @@ namespace Lucene.Net.Search { } - protected override int? LookupFromSearcher(IndexSearcher s, string id) + protected internal override int? LookupFromSearcher(IndexSearcher s, string id) { TermQuery tq = new TermQuery(new Term("id", id)); TopDocs hits = s.Search(tq, 1); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs index 2449b89..61ee69b 100644 --- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs +++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs @@ -226,7 +226,7 @@ namespace Lucene.Net.Search internal readonly IBoostAttribute boostAtt; - protected override AcceptStatus Accept(BytesRef term) + protected internal override AcceptStatus Accept(BytesRef term) { boostAtt.Boost = Convert.ToSingle(term.Utf8ToString()); return base.Accept(term); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs index 06bdf3a..3384aa8 100644 --- a/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs +++ b/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs @@ -117,7 +117,7 @@ namespace Lucene.Net.Search InitialSeekTerm = new BytesRef(""); } - protected override AcceptStatus Accept(BytesRef term) + protected internal override AcceptStatus Accept(BytesRef term) { return StringHelper.StartsWith(term, Prefix) ? AcceptStatus.YES : AcceptStatus.NO; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs index f7dfd3e..ac811ca 100644 --- a/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs +++ b/src/Lucene.Net.Tests/core/Search/TestQueryRescorer.cs @@ -174,7 +174,7 @@ namespace Lucene.Net.Search this.OuterInstance = outerInstance; } - protected override float Combine(float firstPassScore, bool secondPassMatches, float secondPassScore) + protected internal override float Combine(float firstPassScore, bool secondPassMatches, float secondPassScore) { float score = firstPassScore; if (secondPassMatches) @@ -262,7 +262,7 @@ namespace Lucene.Net.Search this.OuterInstance = outerInstance; } - protected override float Combine(float firstPassScore, bool secondPassMatches, float secondPassScore) + protected internal override float Combine(float firstPassScore, bool secondPassMatches, float secondPassScore) { float score = firstPassScore; if (secondPassMatches) @@ -403,7 +403,7 @@ namespace Lucene.Net.Search this.OuterInstance = outerInstance; } - protected override float Combine(float firstPassScore, bool secondPassMatches, float secondPassScore) + protected internal override float Combine(float firstPassScore, bool secondPassMatches, float secondPassScore) { return secondPassScore; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs b/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs index 6171c87..e09d787 100644 --- a/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs +++ b/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs @@ -150,7 +150,7 @@ namespace Lucene.Net.Search InitialSeekTerm = new BytesRef(""); } - protected override AcceptStatus Accept(BytesRef term) + protected internal override AcceptStatus Accept(BytesRef term) { UnicodeUtil.UTF8toUTF16(term.Bytes, term.Offset, term.Length, Utf16); return RunAutomaton.Run(Utf16.Chars, 0, Utf16.Length) ? AcceptStatus.YES : AcceptStatus.NO; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs index 6addfca..555b18a 100644 --- a/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs +++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsCollector.cs @@ -39,7 +39,7 @@ namespace Lucene.Net.Search { } - protected override TopDocs NewTopDocs(ScoreDoc[] results, int start) + protected internal override TopDocs NewTopDocs(ScoreDoc[] results, int start) { if (results == null) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 86335f0..aa0f80a 100644 --- a/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs +++ b/src/Lucene.Net.Tests/core/Store/TestBufferedIndexInput.cs @@ -242,7 +242,7 @@ namespace Lucene.Net.Store // an infinite file } - protected override void ReadInternal(byte[] b, int offset, int length) + protected internal override void ReadInternal(byte[] b, int offset, int length) { for (int i = offset; i < offset + length; i++) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Store/TestHugeRamFile.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Store/TestHugeRamFile.cs b/src/Lucene.Net.Tests/core/Store/TestHugeRamFile.cs index 1ee2c48..c3714fc 100644 --- a/src/Lucene.Net.Tests/core/Store/TestHugeRamFile.cs +++ b/src/Lucene.Net.Tests/core/Store/TestHugeRamFile.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Store private long Capacity = 0; private readonly Dictionary SingleBuffers = new Dictionary(); - protected override byte[] NewBuffer(int size) + protected internal override byte[] NewBuffer(int size) { Capacity += size; if (Capacity <= MAX_VALUE) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs b/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs index 59a7ffd..7512d5d 100644 --- a/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs +++ b/src/Lucene.Net.Tests/core/TestMergeSchedulerExternal.cs @@ -72,7 +72,7 @@ namespace Lucene.Net.Tests } } - protected override MergeThread GetMergeThread(IndexWriter writer, MergePolicy.OneMerge merge) + protected internal override MergeThread GetMergeThread(IndexWriter writer, MergePolicy.OneMerge merge) { MergeThread thread = new MyMergeThread(this, writer, merge); thread.ThreadPriority = MergeThreadPriority; @@ -81,12 +81,12 @@ namespace Lucene.Net.Tests return thread; } - protected override void HandleMergeException(Exception t) + protected internal override void HandleMergeException(Exception t) { OuterInstance.ExcCalled = true; } - protected override void DoMerge(MergePolicy.OneMerge merge) + protected internal override void DoMerge(MergePolicy.OneMerge merge) { OuterInstance.MergeCalled = true; base.DoMerge(merge); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Util/TestCloseableThreadLocal.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Util/TestCloseableThreadLocal.cs b/src/Lucene.Net.Tests/core/Util/TestCloseableThreadLocal.cs index f109198..ca202f9 100644 --- a/src/Lucene.Net.Tests/core/Util/TestCloseableThreadLocal.cs +++ b/src/Lucene.Net.Tests/core/Util/TestCloseableThreadLocal.cs @@ -60,7 +60,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override object InitialValue() + protected internal override object InitialValue() { return TEST_VALUE; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Util/TestFilterIterator.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Util/TestFilterIterator.cs b/src/Lucene.Net.Tests/core/Util/TestFilterIterator.cs index 5d1616c..dbc4f9b 100644 --- a/src/Lucene.Net.Tests/core/Util/TestFilterIterator.cs +++ b/src/Lucene.Net.Tests/core/Util/TestFilterIterator.cs @@ -50,7 +50,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return false; } @@ -75,7 +75,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return "a".Equals(s); } @@ -101,7 +101,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return "a".Equals(s); } @@ -126,7 +126,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return "b".Equals(s); } @@ -152,7 +152,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return "b".Equals(s); } @@ -181,7 +181,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return true; } @@ -210,7 +210,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return true; } @@ -243,7 +243,7 @@ namespace Lucene.Net.Util this.OuterInstance = outerInstance; } - protected override bool PredicateFunction(string s) + protected internal override bool PredicateFunction(string s) { return true; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/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 3868ee3..59bc78d 100644 --- a/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs +++ b/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs @@ -57,7 +57,7 @@ namespace Lucene.Net.Util { } - protected override int? SentinelObject + protected internal override int? SentinelObject { get { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c67366fd/src/Lucene.Net.Tests/core/Util/TestRollingBuffer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Util/TestRollingBuffer.cs b/src/Lucene.Net.Tests/core/Util/TestRollingBuffer.cs index 336b1ed..e0fac3e 100644 --- a/src/Lucene.Net.Tests/core/Util/TestRollingBuffer.cs +++ b/src/Lucene.Net.Tests/core/Util/TestRollingBuffer.cs @@ -103,7 +103,7 @@ namespace Lucene.Net.Util return pos; } - protected override Position NewInstance() + protected internal override Position NewInstance() { Position pos = new Position(); pos.Pos = -1;