You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/10/02 10:16:33 UTC
[02/49] lucenenet git commit: Setup InternalsVisibleTo
Lucene.Net.TestFramework <- Lucene.Net.Tests for testing.
Setup InternalsVisibleTo Lucene.Net.TestFramework <- 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/b56ebc22
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b56ebc22
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b56ebc22
Branch: refs/heads/master
Commit: b56ebc22bb06fddc941b467d8310cfd735e5f9e9
Parents: c67366f
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Tue Sep 6 13:17:13 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Tue Sep 6 13:19:08 2016 +0700
----------------------------------------------------------------------
.../Lucene.Net.TestFramework.csproj | 2 +-
.../Properties/AssemblyInfo.cs | 13 +++++++++++++
.../core/Analysis/TestLookaheadTokenFilter.cs | 2 +-
.../core/Analysis/TrivialLookaheadFilter.cs | 4 ++--
.../Codecs/Lucene40/TestLucene40DocValuesFormat.cs | 2 +-
.../Codecs/Lucene42/TestLucene42DocValuesFormat.cs | 2 +-
.../Codecs/Perfield/TestPerFieldDocValuesFormat.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs | 12 ++++++------
.../core/Index/TestTieredMergePolicy.cs | 2 +-
.../core/Search/TestSearcherManager.cs | 12 ++++++------
12 files changed, 35 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/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 8d3d4e5..cf0ba78 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -36,7 +36,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs b/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
index 467e175..a6ade6d 100644
--- a/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
@@ -22,6 +22,19 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("5f36e3cf-82ac-4d97-af1a-6dabe60e9180")]
+// for testing
+//[assembly: InternalsVisibleTo("Lucene.Net.Tests, 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:
//
// Major Version
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
index f8b9b78..44933dc 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Analysis
{
}
- protected override LookaheadTokenFilter.Position NewPosition()
+ protected internal override LookaheadTokenFilter.Position NewPosition()
{
return new LookaheadTokenFilter.Position();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/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 e513e57..a79b17c 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TrivialLookaheadFilter.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Analysis
OffsetAtt = AddAttribute<IOffsetAttribute>();
}
- protected override TestPosition NewPosition()
+ protected internal override TestPosition NewPosition()
{
return new TestPosition();
}
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis
InsertUpto = -1;
}
- protected override void AfterPosition()
+ protected internal override void AfterPosition()
{
if (InsertUpto < OutputPos)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
index 813c638..9ee39e7 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
// LUCENE-4583: this codec should throw IAE on huge binary values:
- protected override bool CodecAcceptsHugeBinaryValues(string field)
+ protected internal override bool CodecAcceptsHugeBinaryValues(string field)
{
return false;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index 4cf9c73..7f4438b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Codecs.Lucene42
}
}
- protected override bool CodecAcceptsHugeBinaryValues(string field)
+ protected internal override bool CodecAcceptsHugeBinaryValues(string field)
{
return false;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
index f2898ab..bf0a5fe 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Codecs.Perfield
}
}
- protected override bool CodecAcceptsHugeBinaryValues(string field)
+ protected internal override bool CodecAcceptsHugeBinaryValues(string field)
{
return TestUtil.FieldSupportsHugeBinaryDocValues(field);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs b/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
index 5db90c9..1efe781 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.Index
}
}
- protected override bool CodecAcceptsHugeBinaryValues(string field)
+ protected internal override bool CodecAcceptsHugeBinaryValues(string field)
{
return TestUtil.FieldSupportsHugeBinaryDocValues(field);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs b/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
index 35e3603..e99678b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
@@ -19,7 +19,7 @@ namespace Lucene.Net.Index
public class TestLogMergePolicy : BaseMergePolicyTestCase
{
- protected override MergePolicy MergePolicy()
+ protected internal override MergePolicy MergePolicy()
{
return NewLogMergePolicy(Random());
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/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 658d9f3..e248d2e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNRTThreads.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
UseNonNrtReaders = Random().NextBoolean();
}
- protected override void DoSearching(TaskScheduler es, DateTime stopTime)
+ protected internal override void DoSearching(TaskScheduler es, DateTime stopTime)
{
bool anyOpenDelFiles = false;
@@ -114,7 +114,7 @@ namespace Lucene.Net.Index
Assert.IsFalse(anyOpenDelFiles, "saw non-zero open-but-deleted count");
}
- protected override Directory GetDirectory(Directory @in)
+ protected internal override Directory GetDirectory(Directory @in)
{
Debug.Assert(@in is MockDirectoryWrapper);
if (!UseNonNrtReaders)
@@ -124,7 +124,7 @@ namespace Lucene.Net.Index
return @in;
}
- protected override void DoAfterWriter(TaskScheduler es)
+ protected internal override void DoAfterWriter(TaskScheduler es)
{
// Force writer to do reader pooling, always, so that
// all merged segments, even for merges before
@@ -134,7 +134,7 @@ namespace Lucene.Net.Index
private IndexSearcher FixedSearcher;
- protected override IndexSearcher CurrentSearcher
+ protected internal override IndexSearcher CurrentSearcher
{
get
{
@@ -142,7 +142,7 @@ namespace Lucene.Net.Index
}
}
- protected override void ReleaseSearcher(IndexSearcher s)
+ protected internal override void ReleaseSearcher(IndexSearcher s)
{
if (s != FixedSearcher)
{
@@ -151,7 +151,7 @@ namespace Lucene.Net.Index
}
}
- protected override IndexSearcher FinalSearcher
+ protected internal override IndexSearcher FinalSearcher
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/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 efeb08b..5dc9b6c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Index
[TestFixture]
public class TestTieredMergePolicy : BaseMergePolicyTestCase
{
- protected override MergePolicy MergePolicy()
+ protected internal override MergePolicy MergePolicy()
{
return NewTieredMergePolicy();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b56ebc22/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 240f310..234f09c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearcherManager.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Search
RunTest("TestSearcherManager");
}
- protected override IndexSearcher FinalSearcher
+ protected internal override IndexSearcher FinalSearcher
{
get
{
@@ -74,7 +74,7 @@ namespace Lucene.Net.Search
private readonly IList<long> PastSearchers = new List<long>();
private bool IsNRT;
- protected override void DoAfterWriter(TaskScheduler es)
+ protected internal override void DoAfterWriter(TaskScheduler es)
{
SearcherFactory factory = new SearcherFactoryAnonymousInnerClassHelper(this, es);
if (Random().NextBoolean())
@@ -118,7 +118,7 @@ namespace Lucene.Net.Search
}
}
- protected override void DoSearching(TaskScheduler es, DateTime stopTime)
+ protected internal override void DoSearching(TaskScheduler es, DateTime stopTime)
{
ThreadClass reopenThread = new ThreadAnonymousInnerClassHelper(this, stopTime);
reopenThread.SetDaemon(true);
@@ -180,7 +180,7 @@ namespace Lucene.Net.Search
}
}
- protected override IndexSearcher CurrentSearcher
+ protected internal override IndexSearcher CurrentSearcher
{
get
{
@@ -240,12 +240,12 @@ namespace Lucene.Net.Search
}
}
- protected override void ReleaseSearcher(IndexSearcher s)
+ protected internal override void ReleaseSearcher(IndexSearcher s)
{
s.IndexReader.DecRef();
}
- protected override void DoClose()
+ protected internal override void DoClose()
{
Assert.IsTrue(WarmCalled);
if (VERBOSE)