Lucene.Net.TestFramework: Removed FloatUtils and LuceneTestCaseWithReducedFloatPrecision - this would seem to invalidate the tests more than anything else, since it is highly unlikely that anyone will be using this method to "fix" floating point precision. Not sure exactly what it was supposed to fix because the tests are passing without it.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cd97c700 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cd97c700 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cd97c700 Branch: refs/heads/api-work Commit: cd97c70049746dc23a6dde56f62bf883aa5a2d60 Parents: 605beeb Author: Shad Storhaug <[email protected]> Authored: Mon Mar 20 05:05:30 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Mon Mar 20 05:05:30 2017 +0700 ---------------------------------------------------------------------- .../Lucene.Net.TestFramework.csproj | 4 +-- .../Support/FloatUtils.cs | 28 -------------------- .../LuceneTestCaseWithReducedFloatPrecision.cs | 15 ----------- src/Lucene.Net.Tests/Search/TestExplanations.cs | 2 +- src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs | 2 +- src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 2 +- src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 2 +- 7 files changed, 5 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/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 0073b98..62bef0e 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -21,7 +21,7 @@ <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>TRACE;DEBUG</DefineConstants> + <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <Prefer32Bit>false</Prefer32Bit> @@ -425,7 +425,6 @@ <SubType>Code</SubType> </Compile> <Compile Include="Support\CultureInfoSupport.cs" /> - <Compile Include="Support\FloatUtils.cs" /> <Compile Include="Support\RandomizedTest.cs"> <SubType>Code</SubType> </Compile> @@ -458,7 +457,6 @@ <Compile Include="Util\Paths.cs"> <SubType>Code</SubType> </Compile> - <Compile Include="Util\LuceneTestCaseWithReducedFloatPrecision.cs" /> <Compile Include="Util\StackTraceHelper.cs" /> <Compile Include="Util\TestRuleSetupAndRestoreClassEnv.cs"> <SubType>Code</SubType> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/src/Lucene.Net.TestFramework/Support/FloatUtils.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Support/FloatUtils.cs b/src/Lucene.Net.TestFramework/Support/FloatUtils.cs deleted file mode 100644 index 8bc5f1a..0000000 --- a/src/Lucene.Net.TestFramework/Support/FloatUtils.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Lucene.Net.Support -{ - public static class FloatUtils - { - [DllImport("msvcrt")] - public static extern IntPtr _controlfp_s(IntPtr currentControl, int newControl, int mask); - - public static void SetPrecision() - { - //if (!IsLinux()) - { - // precision control - const int _MCW_PC = 0x00030000; - const int _PC_24 = 0x00020000; - - _controlfp_s(IntPtr.Zero, _PC_24, _MCW_PC); - } - //else - { - // LUCENENET TODO: implement setting float precision - // on *nix systems. - } - } - } -} http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/src/Lucene.Net.TestFramework/Util/LuceneTestCaseWithReducedFloatPrecision.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCaseWithReducedFloatPrecision.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCaseWithReducedFloatPrecision.cs deleted file mode 100644 index 863fe54..0000000 --- a/src/Lucene.Net.TestFramework/Util/LuceneTestCaseWithReducedFloatPrecision.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Lucene.Net.Support; - -namespace Lucene.Net.Util -{ - public class LuceneTestCaseWithReducedFloatPrecision : LuceneTestCase - { - public override void SetUp() - { - base.SetUp(); - - // set precision - FloatUtils.SetPrecision(); - } - } -} http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/src/Lucene.Net.Tests/Search/TestExplanations.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestExplanations.cs b/src/Lucene.Net.Tests/Search/TestExplanations.cs index 5cb0b00..a7f09af 100644 --- a/src/Lucene.Net.Tests/Search/TestExplanations.cs +++ b/src/Lucene.Net.Tests/Search/TestExplanations.cs @@ -50,7 +50,7 @@ namespace Lucene.Net.Search /// </summary> /// <seealso cref= "Subclasses for actual tests" </seealso> [TestFixture] - public class TestExplanations : LuceneTestCaseWithReducedFloatPrecision + public class TestExplanations : LuceneTestCase { protected internal static IndexSearcher Searcher; protected internal static IndexReader Reader; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs index 0ead1d4..e2ea517 100644 --- a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Search /// /// </summary> [TestFixture] - public class TestFuzzyQuery : LuceneTestCaseWithReducedFloatPrecision + public class TestFuzzyQuery : LuceneTestCase { [Test] public virtual void TestFuzziness() http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/src/Lucene.Net.Tests/Search/TestSearchAfter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs index cf9aa8a..44d63e2 100644 --- a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs +++ b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.Search /// Tests IndexSearcher's searchAfter() method /// </summary> [TestFixture] - public class TestSearchAfter : LuceneTestCaseWithReducedFloatPrecision + public class TestSearchAfter : LuceneTestCase { private bool isVerbose = false; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cd97c700/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs index 1099e20..0c4393d 100644 --- a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs +++ b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs @@ -42,7 +42,7 @@ namespace Lucene.Net.Search using TestUtil = Lucene.Net.Util.TestUtil; [TestFixture] - public class TestTopDocsMerge : LuceneTestCaseWithReducedFloatPrecision + public class TestTopDocsMerge : LuceneTestCase { private class ShardSearcher : IndexSearcher {
