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 2016/12/19 03:24:03 UTC

[1/5] lucenenet git commit: Revert "Updating test projects to NUnit 3.5.0"

Repository: lucenenet
Updated Branches:
  refs/heads/master b85ce248e -> 0ff42e347


Revert "Updating test projects to NUnit 3.5.0"

This reverts commit 5fea5afaf23ac8f658428d5e4ba0773a680730d8.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d50d877b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d50d877b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d50d877b

Branch: refs/heads/master
Commit: d50d877b386e863a03fda012cadd6afbf46fa6db
Parents: b85ce24
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 19 10:14:36 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 19 10:14:36 2016 +0700

----------------------------------------------------------------------
 src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj | 5 ++---
 src/Lucene.Net.TestFramework/packages.config                 | 2 +-
 .../Lucene.Net.Tests.Analysis.Common.csproj                  | 6 +++---
 src/Lucene.Net.Tests.Analysis.Common/packages.config         | 1 -
 .../Lucene.Net.Tests.Analysis.Stempel.csproj                 | 4 ++--
 src/Lucene.Net.Tests.Analysis.Stempel/packages.config        | 2 +-
 .../Lucene.Net.Tests.Classification.csproj                   | 6 +++---
 src/Lucene.Net.Tests.Classification/packages.config          | 2 +-
 src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj   | 5 ++---
 src/Lucene.Net.Tests.Codecs/packages.config                  | 2 +-
 .../Lucene.Net.Tests.Expressions.csproj                      | 4 ++--
 src/Lucene.Net.Tests.Expressions/packages.config             | 2 +-
 src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj     | 5 ++---
 src/Lucene.Net.Tests.Facet/packages.config                   | 2 +-
 .../Lucene.Net.Tests.Grouping.csproj                         | 4 ++--
 src/Lucene.Net.Tests.Grouping/packages.config                | 2 +-
 src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj       | 4 ++--
 src/Lucene.Net.Tests.Join/packages.config                    | 2 +-
 src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj   | 4 ++--
 src/Lucene.Net.Tests.Memory/packages.config                  | 2 +-
 src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj       | 4 ++--
 src/Lucene.Net.Tests.Misc/packages.config                    | 2 +-
 src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj | 5 ++---
 src/Lucene.Net.Tests.Queries/packages.config                 | 2 +-
 .../Lucene.Net.Tests.QueryParser.csproj                      | 5 ++---
 src/Lucene.Net.Tests.QueryParser/packages.config             | 2 +-
 src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj | 8 ++++----
 src/Lucene.Net.Tests.Sandbox/packages.config                 | 2 +-
 src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj | 4 ++--
 src/Lucene.Net.Tests.Spatial/packages.config                 | 2 +-
 src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj | 4 ++--
 src/Lucene.Net.Tests.Suggest/packages.config                 | 2 +-
 src/Lucene.Net.Tests/Lucene.Net.Tests.csproj                 | 5 ++---
 src/Lucene.Net.Tests/packages.config                         | 2 +-
 34 files changed, 54 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 62e58a5..ef35fc8 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -43,9 +43,8 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.TestFramework/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/packages.config b/src/Lucene.Net.TestFramework/packages.config
index 7f7d735..967502d 100644
--- a/src/Lucene.Net.TestFramework/packages.config
+++ b/src/Lucene.Net.TestFramework/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 3e3fdad..029a40f 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
@@ -40,9 +40,9 @@
       <HintPath>..\..\packages\ICU4NET-ICU4C55.1-bin32.1.0.0\lib\net45\ICU4NETExtension.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Analysis.Common/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/packages.config b/src/Lucene.Net.Tests.Analysis.Common/packages.config
index 5757975..7685c3b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/packages.config
+++ b/src/Lucene.Net.Tests.Analysis.Common/packages.config
@@ -1,5 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ICU4NET-ICU4C55.1-bin32" version="1.0.0" targetFramework="net451" />
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 b7e3b1c..8be32c0 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,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Analysis.Stempel/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/packages.config b/src/Lucene.Net.Tests.Analysis.Stempel/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/packages.config
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 cce44f8..4ccf2dc 100644
--- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
+++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
@@ -30,9 +30,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Classification/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/packages.config b/src/Lucene.Net.Tests.Classification/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Classification/packages.config
+++ b/src/Lucene.Net.Tests.Classification/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 459d08b..9a32f6c 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,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Codecs/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/packages.config b/src/Lucene.Net.Tests.Codecs/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Codecs/packages.config
+++ b/src/Lucene.Net.Tests.Codecs/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 e24d7a8..d69d88d 100644
--- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
+++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Expressions/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/packages.config b/src/Lucene.Net.Tests.Expressions/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Expressions/packages.config
+++ b/src/Lucene.Net.Tests.Expressions/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 8672933..18ad7c8 100644
--- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
+++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
@@ -30,9 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Facet/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/packages.config b/src/Lucene.Net.Tests.Facet/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Facet/packages.config
+++ b/src/Lucene.Net.Tests.Facet/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 69eb4f7..0141a9a 100644
--- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
+++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Grouping/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/packages.config b/src/Lucene.Net.Tests.Grouping/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Grouping/packages.config
+++ b/src/Lucene.Net.Tests.Grouping/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 1028b38..838b1fd 100644
--- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
+++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Join/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/packages.config b/src/Lucene.Net.Tests.Join/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Join/packages.config
+++ b/src/Lucene.Net.Tests.Join/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 e1b4e74..158b3c1 100644
--- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
+++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Memory/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/packages.config b/src/Lucene.Net.Tests.Memory/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Memory/packages.config
+++ b/src/Lucene.Net.Tests.Memory/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 968b9a9..7b26bd0 100644
--- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
+++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Misc/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/packages.config b/src/Lucene.Net.Tests.Misc/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Misc/packages.config
+++ b/src/Lucene.Net.Tests.Misc/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 bafe90f..3780567 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,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Queries/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/packages.config b/src/Lucene.Net.Tests.Queries/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Queries/packages.config
+++ b/src/Lucene.Net.Tests.Queries/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 c62a8ce..b33a18d 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,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.QueryParser/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/packages.config b/src/Lucene.Net.Tests.QueryParser/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.QueryParser/packages.config
+++ b/src/Lucene.Net.Tests.QueryParser/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
index 3a9740d..f0493af 100644
--- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
+++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />
@@ -76,10 +76,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Queries\fuzzyTestData.txt" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <EmbeddedResource Include="Queries\fuzzyTestData.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Sandbox/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/packages.config b/src/Lucene.Net.Tests.Sandbox/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Sandbox/packages.config
+++ b/src/Lucene.Net.Tests.Sandbox/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
index ddf0e88..95a21f6 100644
--- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
+++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
@@ -38,8 +38,8 @@
       <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Spatial/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/packages.config b/src/Lucene.Net.Tests.Spatial/packages.config
index 939be49..b28dff1 100644
--- a/src/Lucene.Net.Tests.Spatial/packages.config
+++ b/src/Lucene.Net.Tests.Spatial/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="GeoAPI" version="1.7.4" targetFramework="net451" />
   <package id="NetTopologySuite" version="1.14" targetFramework="net451" />
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
   <package id="Spatial4n.Core" version="0.4.1-beta" targetFramework="net451" />
   <package id="Spatial4n.Core.NTS" version="0.4.1-beta" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 7429d45..c31408e 100644
--- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
+++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests.Suggest/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/packages.config b/src/Lucene.Net.Tests.Suggest/packages.config
index 7f7d735..139d513 100644
--- a/src/Lucene.Net.Tests.Suggest/packages.config
+++ b/src/Lucene.Net.Tests.Suggest/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net451" />
 </packages>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/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 4ed2e8b..00a14dc 100644
--- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
+++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
@@ -39,9 +39,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <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" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d50d877b/src/Lucene.Net.Tests/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/packages.config b/src/Lucene.Net.Tests/packages.config
index 7f7d735..967502d 100644
--- a/src/Lucene.Net.Tests/packages.config
+++ b/src/Lucene.Net.Tests/packages.config
@@ -1,4 +1,4 @@
 \ufeff<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net451" />
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
 </packages>
\ No newline at end of file


[3/5] lucenenet git commit: Revert "Replacing obsolete [TestFixtureTearDown] with [OneTimeTearDown]"

Posted by ni...@apache.org.
Revert "Replacing obsolete [TestFixtureTearDown] with [OneTimeTearDown]"

This reverts commit fd7aeba146b92c8149373e4543830be1fac6b03d.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/10efe5b9
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/10efe5b9
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/10efe5b9

Branch: refs/heads/master
Commit: 10efe5b98311a7241cb23fadea3882fedb4f547d
Parents: 1a36bec
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 19 10:15:06 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 19 10:15:06 2016 +0700

----------------------------------------------------------------------
 src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs   | 2 +-
 .../Analysis/Core/TestRandomChains.cs                              | 2 +-
 .../Analysis/Hunspell/TestHunspellStemFilter.cs                    | 2 +-
 .../Taxonomy/TestTaxonomyFacetAssociations.cs                      | 2 +-
 src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs    | 2 +-
 src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs                   | 2 +-
 src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs             | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs           | 2 +-
 src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs                | 2 +-
 .../Flexible/Precedence/TestPrecedenceQueryParser.cs               | 2 +-
 .../Flexible/Standard/TestNumericQueryParser.cs                    | 2 +-
 src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs | 2 +-
 src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs       | 2 +-
 src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs                 | 2 +-
 .../Queries/TestSortedSetSortFieldSelectors.cs                     | 2 +-
 .../core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs               | 2 +-
 src/Lucene.Net.Tests/core/Index/Test2BDocs.cs                      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs    | 2 +-
 src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs                | 2 +-
 src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs    | 2 +-
 src/Lucene.Net.Tests/core/Index/TestIndexInput.cs                  | 2 +-
 src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs            | 2 +-
 src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs  | 2 +-
 src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs  | 2 +-
 src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs               | 2 +-
 .../core/Search/Spans/TestFieldMaskingSpanQuery.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestBoolean2.cs                   | 2 +-
 src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs      | 2 +-
 src/Lucene.Net.Tests/core/Search/TestDateFilter.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestExplanations.cs               | 2 +-
 src/Lucene.Net.Tests/core/Search/TestFieldCache.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs            | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs     | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs     | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs           | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs        | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs        | 2 +-
 src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs                | 2 +-
 src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs       | 2 +-
 src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs             | 2 +-
 src/Lucene.Net.Tests/core/Search/TestTermVectors.cs                | 2 +-
 42 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index dfe233b..ffef930 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -488,7 +488,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             AllTerms = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
index c745f8a..fb2676a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -249,7 +249,7 @@ namespace Lucene.Net.Analysis.Core
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             tokenizers = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index dfe7655..413d99b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Analysis.Hunspell
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void afterClass()
         {
             dictionary = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index dbc9e24..8cdd14d 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Facet.Taxonomy
             taxoReader = new DirectoryTaxonomyReader(taxoDir);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index 600e969..09d1119 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Facet.Taxonomy
         private static Net.Store.Directory indexDir, taxoDir;
         private static IDictionary<string, int?> allExpectedCounts, termExpectedCounts;
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassCountingFacetsAggregatorTest()
         {
             IOUtils.Close(indexDir, taxoDir);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 8c2b263..01f7fe5 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Facet
         private static FacetsConfig config;
 
       
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassDrillDownQueryTest()
         {
             IOUtils.Close(reader, taxo, dir, taxoDir);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
index 9bf2d47..8e110a2 100644
--- a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
+++ b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Documents
 
         public Directory dir = NewDirectory();
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void RemoveIndex()
         {
             if (null != dir)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 9be84ba..99623ad 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -223,7 +223,7 @@ namespace Lucene.Net.Index.Sorter
             reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassSorterTestBase()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
index fe4df72..efd6ffe 100644
--- a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
+++ b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Misc
             TestUtil.CheckIndex(dir);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void TearDownClass()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
index 193ac04..6290faa 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
             qpAnalyzer = new QPTestAnalyzer();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void afterClass()
         {
             qpAnalyzer = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
index a3d1527..e0dcf8f 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
@@ -567,7 +567,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
             return NUMBER_FORMAT.Parse(NUMBER_FORMAT.Format(number));
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
index a1dae43..6a9c9e7 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
             qpAnalyzer = new QPTestAnalyzer();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             qpAnalyzer = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index 3d1b5b0..e6c4621 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.QueryParsers.Util
             qpAnalyzer = new QPTestAnalyzer();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             qpAnalyzer = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
index d84a8c1..b069048 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.QueryParsers.Xml
 
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
index 84638aa..78119e0 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Sandbox.Queries
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void afterClass()
         {
             Codec.Default = (savedCodec);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 7c5eace..227e22b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -113,7 +113,7 @@ namespace Lucene.Net.Codecs.Lucene3x
             SampleTerms = Sample(Random(), Reader, 1000);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             TermEnum.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 a4d3db9..7bf3749 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Index
             iw.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void AfterClass()
         {
             Dir.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 5492fef..1dd70ce 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -221,7 +221,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void AfterClass()
         {
             foreach (Directory d in OldIndexDirs.Values)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 42d01e9..af1790f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -148,7 +148,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void AfterClass()
         {
             foreach (Directory d in OldIndexDirs.Values)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 e580ae8..fa54837 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Index
             FaultyIndexInput.DoFail = false;
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Dir.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
index 4e15e37..77ac69b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
             LineDocFile = new LineFileDocs(Random(), DefaultCodecSupportsDocValues());
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             LineDocFile.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
index dcef226..ea1f79f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             INTS = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
index fa1209d..16a6d17 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Search
             UnsignedIndexReader = Build(Random(), UnsignedIndexDir);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassBaseTestRangeFilter()
         {
             SignedIndexReader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 10a1649..9da6e81 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search.Payloads
             Searcher.Similarity = Similarity;
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 6d841cf..b44ffd4 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Search.Payloads
             Searcher.Similarity = Similarity;
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 6a255fc..34529d8 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Search.Spans
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index 4d54777..e8ab517 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Spans
             Searcher = NewSearcher(Reader);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index 7c6cc51..e8f2e87 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
             riw.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index 4ba6461..882b740 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Search
             //System.out.println("Set up " + getName());
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             s = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
index fe18320..a0154b2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Search
         }
 
         ///
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public virtual void TestAfter()
         {
             // create an index

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index 5bc1e80..18962f9 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
         // same contents, but no field boost
         public const string ALTFIELD = "alt";
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassTestExplanations()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 55e2cf3..d45f364 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -165,7 +165,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index fde85d4..c452619 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             atomicReader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
index dbc72c3..7f95d2a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 b0595fa..61ee69b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search
             MultiSearcherDupls = NewSearcher(MultiReaderDupls);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index 068ece5..f6756c2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
             Reader = DirectoryReader.Open(Directory);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
index fadaa16..59c527b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
index 6473977..de7b10f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -143,7 +143,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 63e23d7..d4710e2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -108,7 +108,7 @@ namespace Lucene.Net.Search
             Query = new PhraseQuery();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index 0a56ce9..22be01c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -82,7 +82,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
index ee5c467..1b60b0e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.Search
             w.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void Finish()
         {
             s.IndexReader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index c9da2da..d2a5126 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -93,7 +93,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();


[2/5] lucenenet git commit: Revert "Replacing obsolete [TestFixtureSetUp] with [OneTimeSetUp]"

Posted by ni...@apache.org.
Revert "Replacing obsolete [TestFixtureSetUp] with [OneTimeSetUp]"

This reverts commit 28f2f7909a67f087c276cc660c26a991c899145e.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1a36bec5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1a36bec5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1a36bec5

Branch: refs/heads/master
Commit: 1a36bec5673586711f9c519ee1a3600111ba8bbc
Parents: d50d877
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 19 10:14:52 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 19 10:14:52 2016 +0700

----------------------------------------------------------------------
 src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs   | 2 +-
 .../Analysis/Core/TestRandomChains.cs                              | 2 +-
 .../Analysis/Hunspell/TestCaseInsensitive.cs                       | 2 +-
 .../Analysis/Hunspell/TestCircumfix.cs                             | 2 +-
 .../Analysis/Hunspell/TestComplexPrefix.cs                         | 2 +-
 .../Analysis/Hunspell/TestCondition.cs                             | 2 +-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs | 2 +-
 .../Analysis/Hunspell/TestDependencies.cs                          | 2 +-
 .../Analysis/Hunspell/TestEscaped.cs                               | 2 +-
 .../Analysis/Hunspell/TestFlagLong.cs                              | 2 +-
 .../Analysis/Hunspell/TestFlagNum.cs                               | 2 +-
 .../Analysis/Hunspell/TestHomonyms.cs                              | 2 +-
 .../Analysis/Hunspell/TestHunspellStemFilter.cs                    | 2 +-
 .../Analysis/Hunspell/TestIgnore.cs                                | 2 +-
 .../Analysis/Hunspell/TestMorph.cs                                 | 2 +-
 .../Analysis/Hunspell/TestOptionalCondition.cs                     | 2 +-
 .../Analysis/Hunspell/TestStemmer.cs                               | 2 +-
 .../Analysis/Hunspell/TestTwoFold.cs                               | 2 +-
 .../Analysis/Hunspell/TestTwoSuffixes.cs                           | 2 +-
 .../Taxonomy/TestTaxonomyFacetAssociations.cs                      | 2 +-
 src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs    | 2 +-
 src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs                   | 2 +-
 src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs             | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs         | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs           | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs  | 2 +-
 src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs                | 2 +-
 .../Flexible/Precedence/TestPrecedenceQueryParser.cs               | 2 +-
 .../Flexible/Standard/TestNumericQueryParser.cs                    | 2 +-
 src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs | 2 +-
 src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs       | 2 +-
 src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs                 | 2 +-
 .../Queries/TestSortedSetSortFieldSelectors.cs                     | 2 +-
 .../core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs         | 2 +-
 src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs        | 2 +-
 .../core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs               | 2 +-
 .../core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs            | 2 +-
 .../core/Codecs/Lucene40/TestLucene40PostingsFormat.cs             | 2 +-
 .../core/Codecs/Lucene40/TestLucene40PostingsReader.cs             | 2 +-
 .../core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs         | 2 +-
 .../core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs          | 2 +-
 src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs     | 2 +-
 .../core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs         | 2 +-
 .../core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs            | 2 +-
 src/Lucene.Net.Tests/core/Index/Test2BDocs.cs                      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs    | 2 +-
 src/Lucene.Net.Tests/core/Index/TestCodecs.cs                      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs                | 2 +-
 src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs    | 2 +-
 src/Lucene.Net.Tests/core/Index/TestIndexInput.cs                  | 2 +-
 src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs            | 2 +-
 src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs  | 2 +-
 src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs  | 2 +-
 src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs               | 2 +-
 .../core/Search/Spans/TestFieldMaskingSpanQuery.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestBoolean2.cs                   | 2 +-
 src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs      | 2 +-
 src/Lucene.Net.Tests/core/Search/TestDateFilter.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestExplanations.cs               | 2 +-
 src/Lucene.Net.Tests/core/Search/TestFieldCache.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs            | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs     | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs     | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs           | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs        | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs        | 2 +-
 src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs                | 2 +-
 src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs       | 2 +-
 src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs             | 2 +-
 src/Lucene.Net.Tests/core/Search/TestTermVectors.cs                | 2 +-
 src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs | 2 +-
 src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs   | 2 +-
 73 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index b5f14e6..dfe233b 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -370,7 +370,7 @@ namespace Lucene.Net.Index
             return new SeedPostings(seed, minDocFreq, maxDocFreq, withLiveDocs ? GlobalLiveDocs : null, options);
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void CreatePostings()
         {
             TotalPostings = 0;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
index 4ce045c..c745f8a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -180,7 +180,7 @@ namespace Lucene.Net.Analysis.Core
             }
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             IEnumerable<Type> analysisClasses = typeof(StandardAnalyzer).Assembly.GetTypes()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
index be73de9..cba206b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestCaseInsensitive : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init(true, "simple.aff", "mixedcase.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
index 86387a6..d0c3668 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestCircumfix_ : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("circumfix.aff", "circumfix.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
index e0f228c..5c82714 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestComplexPrefix : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("complexprefix.aff", "complexprefix.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
index 888c755..b9f0a41 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestCondition : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("condition.aff", "condition.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
index e0b1a83..9c2ad74 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestConv : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("conv.aff", "conv.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
index ce34433..5e2fc48 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestDependencies_ : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("dependencies.aff", "dependencies.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
index a4608b6..8db5602 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestEscaped : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("escaped.aff", "escaped.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
index 0f84119..cb589ec 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestFlagLong : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("flaglong.aff", "flaglong.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
index cc9a33e..d1b16a3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestFlagNum : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("flagnum.aff", "flagnum.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
index 716b61e..e07a15b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestHomonyms : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("homonyms.aff", "homonyms.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index 5aebc1c..dfe7655 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Analysis.Hunspell
     {
         private static Dictionary dictionary;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             System.IO.Stream affixStream = typeof(TestStemmer).getResourceAsStream("simple.aff");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
index c026f73..bc96964 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestIgnore : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("ignore.aff", "ignore.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
index 0cc6cae..f371ec4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestMorph : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("morph.aff", "morph.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
index 05028cb..7e4cd4c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestOptionalCondition : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("optional-condition.aff", "condition.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
index cf8e4d9..358ff99 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestStemmer : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("simple.aff", "simple.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
index 93cbc4f..12ee1c0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestTwoFold : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("twofold.aff", "morph.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
index 7f51873..2799054 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestTwoSuffixes : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("twosuffixes.aff", "twosuffixes.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index fc38863..dbc9e24 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Facet.Taxonomy
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index 1999642..600e969 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -245,7 +245,7 @@ namespace Lucene.Net.Facet.Taxonomy
             return counts;
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassCountingFacetsAggregatorTest()
         {
             indexDir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 2ab70d8..8c2b263 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Facet
             config = null;
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassDrillDownQueryTest()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
index 5c23395..9bf2d47 100644
--- a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
+++ b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.Documents
             }
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void CreateIndex()
         {
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
index b6beda4..fdc0e95 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Index.Sorter
             new Sort(new SortField(null, SortField.Type_e.DOC, true))
         };
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassSorterUtilTest()
         {
             // only read the values of the undeleted documents, since after addIndexes,

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 8d3ae8a..9be84ba 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -213,7 +213,7 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassSorterTestBase()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
index 9de7707..93b234a 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Index.Sorter
 
     public class SortingAtomicReaderTest : SorterTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClassSortingAtomicReaderTest()
         {
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
index e26ea8e..fe4df72 100644
--- a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
+++ b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
@@ -14,7 +14,7 @@ namespace Lucene.Net.Misc
         private static Directory dir = null;
         private static IndexReader reader = null;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void SetUpClass()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
index b806a6d..193ac04 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
     {
         public static Analyzer qpAnalyzer;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void beforeClass()
         {
             qpAnalyzer = new QPTestAnalyzer();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
index 52745bd..a3d1527 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
                 dateFormat, CultureInfo.CurrentCulture, DateTimeStyles.RoundtripKind, out result);
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             ANALYZER = new MockAnalyzer(Random());

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
index d9e4552..a1dae43 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
     {
         public static Analyzer qpAnalyzer;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             qpAnalyzer = new QPTestAnalyzer();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index d81e7e3..3d1b5b0 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Util
     {
         public static Analyzer qpAnalyzer;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             qpAnalyzer = new QPTestAnalyzer();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
index 45b7ffa..d84a8c1 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.QueryParsers.Xml
         private static IndexReader reader;
         private static IndexSearcher searcher;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             // TODO: rewrite test (this needs to set QueryParser.enablePositionIncrements, too, for work with CURRENT):

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
index b60f921..84638aa 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Sandbox.Queries
     {
         static Codec savedCodec;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void beforeClass()
         {
             savedCodec = Codec.Default;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
index 1e37cbf..d3d0889 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Codecs.Lucene3x
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 cccbdfd..256eae2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Codecs.Lucene3x
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 ba03722..7c5eace 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Codecs.Lucene3x
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             // NOTE: turn off compound file, this test will open some index files directly.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 d63a6b3..3686767 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
index 2d2b5f1..0d3666d 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
index 47cc0e6..73852cd 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
index 9dc5682..4e3bebf 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
index ba05490..9a6e544 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
index 761d63e..c335b8c 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index 916f8d0..bcd5a49 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs.Lucene41
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 f9c47ce..598f373 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Codecs.Lucene42
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 158b9ac..a4d3db9 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Index
     {
         internal static Directory Dir;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Dir = NewFSDirectory(CreateTempDir("2Bdocs"));

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 f7f354d..5492fef 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -202,7 +202,7 @@ namespace Lucene.Net.Index
             return null; // never get here
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Assert.IsFalse(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "test infra is broken!");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 b5e5808..42d01e9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Index
 
         internal static IDictionary<string, Directory> OldIndexDirs;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Assert.IsFalse(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "test infra is broken!");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 07feee2..1df01e9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -89,7 +89,7 @@ namespace Lucene.Net.Index
         private const int DOC_FREQ_RAND = 500; // must be > 16 to test skipping
         private const int TERM_DOC_FREQ_RAND = 20;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             NUM_TEST_ITER = AtLeast(20);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 405713e..e580ae8 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Index
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             TestDoc = new Document();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
index 86d1a23..4e15e37 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Index
 
         private static LineFileDocs LineDocFile;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             LineDocFile = new LineFileDocs(Random(), DefaultCodecSupportsDocValues());

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
index 37e7901..dcef226 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
         internal static long[] LONGS;
         internal static byte[] RANDOM_TEST_BYTES;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Random random = Random();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
index db1290a..fa1209d 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Search
         /// Is non-static because <see cref="Build(Random, TestIndex)"/> is no
         /// longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassBaseTestRangeFilter()
         {
             MaxId = AtLeast(500);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 a8ad290..10a1649 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Search.Payloads
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 27fbf3c..6d841cf 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Search.Payloads
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 6be72f1..6a255fc 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Search.Spans
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             SimplePayloadAnalyzer = new AnalyzerAnonymousInnerClassHelper();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index 0c2a2ac..4d54777 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search.Spans
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index 605aded..7c6cc51 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index 4e6952e..4ba6461 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewStringField is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             string[] data = new string[] { "A 1 2 3 4 5 6", "Z       4 5 6", null, "B   2   4 5 6", "Y     3   5 6", null, "C     3     6", "X       4 5 6" };

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
index 11e62e1..fe18320 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
     public class TestDateFilter : LuceneTestCase
     {
         ///
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public virtual void TestBefore()
         {
             // create an index

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index dc77d59..5bc1e80 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search
         /// Is non-static because NewIndexWriterConfig, NewTextField and
         /// NewStringField are no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassTestExplanations()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 8f26642..55e2cf3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search
 
 
         // LUCENENET: Changed to non-static because NewIndexWriterConfig is non-static
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             NUM_DOCS = AtLeast(500);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index c24b5e1..fde85d4 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
index d824b33..dbc72c3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             string[] data = new string[] { "A 1 2 3 4 5 6", "Z       4 5 6", null, "B   2   4 5 6", "Y     3   5 6", null, "C     3     6", "X       4 5 6" };

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 44128a1..b0595fa 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index 0faaef9..068ece5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
index 92e02ba..fadaa16 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             NoDocs = AtLeast(4096);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
index 4a80fc2..6473977 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             NoDocs = AtLeast(4096);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/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 409555e..63e23d7 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
         private PhraseQuery Query;
         private static Directory Directory;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index af93996..0a56ce9 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
index a48b09f..ee5c467 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.Search
         private static Directory Dir;
         private static IndexSearcher s;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void MakeIndex()
         {
             Dir = new RAMDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index 75aa477..c9da2da 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs b/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
index 8e7a681..744c7b2 100644
--- a/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Support
                 dictionary.Add(key, "value");
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void TestSetup()
         {
             keys = new SmallObject[100000];

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs b/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
index 2016f62..339e7ad 100644
--- a/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Util
         private static int NUM_RANDOM_TESTS;
         private static int MAX_RANDOM_BINARY_LENGTH;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             NUM_RANDOM_TESTS = AtLeast(200);


[4/5] lucenenet git commit: Revert "Replacing [ExpectedException(T)] with Assert.Throws"

Posted by ni...@apache.org.
Revert "Replacing [ExpectedException(T)] with Assert.Throws<T>"

This reverts commit 761c3343e9f99688dbb6994ad49fcf872145ab19.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2005d019
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2005d019
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2005d019

Branch: refs/heads/master
Commit: 2005d019e1e735850bdeb0050d797793f41db5db
Parents: 10efe5b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 19 10:15:24 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 19 10:15:24 2016 +0700

----------------------------------------------------------------------
 .../Miscellaneous/TestCapitalizationFilter.cs   | 12 +++----
 .../Miscellaneous/TestCodepointCountFilter.cs   |  4 +--
 .../Analysis/Miscellaneous/TestLengthFilter.cs  |  4 +--
 .../Miscellaneous/TestLimitTokenCountFilter.cs  |  4 +--
 .../TestLimitTokenPositionFilter.cs             |  3 +-
 .../Miscellaneous/TestTruncateTokenFilter.cs    |  3 +-
 .../Sinks/TokenRangeSinkTokenizerTest.cs        |  3 +-
 .../Analysis/Synonym/TestSolrSynonymParser.cs   | 15 ++++++---
 .../TestCompressingStoredFieldsFormat.cs        | 35 +++++++++-----------
 .../core/Support/TestLurchTable.cs              |  4 +--
 .../core/Util/TestBytesRefHash.cs               | 22 ++++++------
 src/Lucene.Net.Tests/core/Util/TestSetOnce.cs   | 12 +++----
 12 files changed, 60 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
index ffa38db..cff486e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
@@ -139,24 +139,24 @@ namespace Lucene.Net.Analysis.Miscellaneous
         /// checking the validity of constructor arguments
         /// </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                new CapitalizationFilter(new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), true, null, true, null, -1, CapitalizationFilter.DEFAULT_MAX_WORD_COUNT, CapitalizationFilter.DEFAULT_MAX_TOKEN_LENGTH));
+            new CapitalizationFilter(new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), true, null, true, null, -1, CapitalizationFilter.DEFAULT_MAX_WORD_COUNT, CapitalizationFilter.DEFAULT_MAX_TOKEN_LENGTH);
         }
 
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments1()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                new CapitalizationFilter(new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), true, null, true, null, 0, -10, CapitalizationFilter.DEFAULT_MAX_TOKEN_LENGTH));
+            new CapitalizationFilter(new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), true, null, true, null, 0, -10, CapitalizationFilter.DEFAULT_MAX_TOKEN_LENGTH);
         }
 
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments2()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                new CapitalizationFilter(new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), true, null, true, null, 0, CapitalizationFilter.DEFAULT_MAX_WORD_COUNT, -50));
+            new CapitalizationFilter(new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), true, null, true, null, 0, CapitalizationFilter.DEFAULT_MAX_WORD_COUNT, -50);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
index 78c9f67..b690ae9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
@@ -86,10 +86,10 @@ namespace Lucene.Net.Analysis.Miscellaneous
         /// checking the validity of constructor arguments
         /// </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                new CodepointCountFilter(TEST_VERSION_CURRENT, new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), 4, 1));
+            new CodepointCountFilter(TEST_VERSION_CURRENT, new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), 4, 1);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
index 47b9614..43eb450 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
@@ -71,10 +71,10 @@ namespace Lucene.Net.Analysis.Miscellaneous
         /// checking the validity of constructor arguments
         /// </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                new LengthFilter(TEST_VERSION_CURRENT, new MockTokenizer(new StringReader("accept only valid arguments")), -4, -1));
+            new LengthFilter(TEST_VERSION_CURRENT, new MockTokenizer(new StringReader("accept only valid arguments")), -4, -1);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
index e1d12e0..f0e9e4b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
@@ -37,10 +37,10 @@ namespace Lucene.Net.Analysis.Miscellaneous
         }
 
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-                new LimitTokenCountFilter(new MockTokenizer(new StringReader("A1 B2 C3 D4 E5 F6"), MockTokenizer.WHITESPACE, false), -1));
+            new LimitTokenCountFilter(new MockTokenizer(new StringReader("A1 B2 C3 D4 E5 F6"), MockTokenizer.WHITESPACE, false), -1);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
index 933c744..c32b5f9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
@@ -92,9 +92,10 @@ namespace Lucene.Net.Analysis.Miscellaneous
         }
 
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentException))]
         public virtual void TestIllegalArguments()
         {
-            Assert.Throws<ArgumentException>(() => new LimitTokenPositionFilter(new MockTokenizer(new StringReader("one two three four five")), 0));
+            new LimitTokenPositionFilter(new MockTokenizer(new StringReader("one two three four five")), 0);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
index 26ea658..dcd886d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
@@ -36,9 +36,10 @@ namespace Lucene.Net.Analysis.Miscellaneous
         }
 
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestNonPositiveLength()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() =>  new TruncateTokenFilter(new MockTokenizer(new StringReader("length must be a positive number")), -48));
+            new TruncateTokenFilter(new MockTokenizer(new StringReader("length must be a positive number")), -48);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
index 80444c7..5ec9ade 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
@@ -51,9 +51,10 @@ namespace Lucene.Net.Analysis.Sinks
         }
 
         [Test]
+        [ExpectedException(ExpectedException = typeof(ArgumentOutOfRangeException))]
         public virtual void TestIllegalArguments()
         {
-            Assert.Throws<ArgumentOutOfRangeException>(() => new TokenRangeSinkFilter(4, 2));
+            new TokenRangeSinkFilter(4, 2);
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
index b04f6cc..983c75c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
@@ -73,51 +73,56 @@ namespace Lucene.Net.Analysis.Synonym
         /// <summary>
         /// parse a syn file with bad syntax </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(Exception))]
         public virtual void TestInvalidDoubleMap()
         {
             string testFile = "a => b => c";
             SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(Random()));
-            Assert.Throws<Exception>(() => parser.Parse(new StringReader(testFile)));
+            parser.Parse(new StringReader(testFile));
         }
 
         /// <summary>
         /// parse a syn file with bad syntax </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(Exception))]
         public virtual void TestInvalidAnalyzesToNothingOutput()
         {
             string testFile = "a => 1";
             SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(Random(), MockTokenizer.SIMPLE, false));
-            Assert.Throws<Exception>(() => parser.Parse(new StringReader(testFile)));
+            parser.Parse(new StringReader(testFile));
         }
 
         /// <summary>
         /// parse a syn file with bad syntax </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(Exception))]
         public virtual void TestInvalidAnalyzesToNothingInput()
         {
             string testFile = "1 => a";
             SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(Random(), MockTokenizer.SIMPLE, false));
-            Assert.Throws<Exception>(() => parser.Parse(new StringReader(testFile)));
+            parser.Parse(new StringReader(testFile));
         }
 
         /// <summary>
         /// parse a syn file with bad syntax </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(Exception))]
         public virtual void TestInvalidPositionsInput()
         {
             string testFile = "testola => the test";
             SolrSynonymParser parser = new SolrSynonymParser(true, true, new EnglishAnalyzer(TEST_VERSION_CURRENT));
-            Assert.Throws<Exception>(() => parser.Parse(new StringReader(testFile)));
+            parser.Parse(new StringReader(testFile));
         }
 
         /// <summary>
         /// parse a syn file with bad syntax </summary>
         [Test]
+        [ExpectedException(ExpectedException = typeof(Exception))]
         public virtual void TestInvalidPositionsOutput()
         {
             string testFile = "the test => testola";
             SolrSynonymParser parser = new SolrSynonymParser(true, true, new EnglishAnalyzer(TEST_VERSION_CURRENT));
-            Assert.Throws<Exception>(() => parser.Parse(new StringReader(testFile)));
+            parser.Parse(new StringReader(testFile));
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
index e902cb1..998b942 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Documents;
-using System;
 using Field = Lucene.Net.Documents.Field;
 
 namespace Lucene.Net.Codecs.Compressing
@@ -46,6 +45,7 @@ namespace Lucene.Net.Codecs.Compressing
         }
 
         [Test]
+        [ExpectedException("System.ArgumentException")]
         public virtual void TestDeletePartiallyWrittenFilesIfAbort()
         {
             Directory dir = NewDirectory();
@@ -68,29 +68,26 @@ namespace Lucene.Net.Codecs.Compressing
             fieldType.Stored = true;
             invalidDoc.Add(new FieldAnonymousInnerClassHelper(this, fieldType));
 
-            Assert.Throws<ArgumentException>(() =>
+            try
             {
-                try
-                {
-                    iw.AddDocument(invalidDoc);
-                    iw.Commit();
-                }
-                finally
+                iw.AddDocument(invalidDoc);
+                iw.Commit();
+            }
+            finally
+            {
+                int counter = 0;
+                foreach (string fileName in dir.ListAll())
                 {
-                    int counter = 0;
-                    foreach (string fileName in dir.ListAll())
+                    if (fileName.EndsWith(".fdt") || fileName.EndsWith(".fdx"))
                     {
-                        if (fileName.EndsWith(".fdt") || fileName.EndsWith(".fdx"))
-                        {
-                            counter++;
-                        }
+                        counter++;
                     }
-                    // Only one .fdt and one .fdx files must have been found
-                    Assert.AreEqual(2, counter);
-                    iw.Dispose();
-                    dir.Dispose();
                 }
-            });
+                // Only one .fdt and one .fdx files must have been found
+                Assert.AreEqual(2, counter);
+                iw.Dispose();
+                dir.Dispose();
+            }
         }
 
         private class FieldAnonymousInnerClassHelper : Field

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests/core/Support/TestLurchTable.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestLurchTable.cs b/src/Lucene.Net.Tests/core/Support/TestLurchTable.cs
index 778b419..264e95c 100644
--- a/src/Lucene.Net.Tests/core/Support/TestLurchTable.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestLurchTable.cs
@@ -504,7 +504,7 @@ namespace Lucene.Net.Support
             VerifyCollection(EqualityComparer<string>.Default, values.AsReadOnly(), dict.Values);
         }
 
-        [Test]
+        [Test, ExpectedException(typeof(ObjectDisposedException))]
         public void TestDisposed()
         {
             IDictionary<int, string> test = new LurchTableTest<int, string>();
@@ -513,7 +513,7 @@ namespace Lucene.Net.Support
             {
                 disposable.Dispose();
             }
-            Assert.Throws<ObjectDisposedException>(() => test.Add(1, ""));
+            test.Add(1, "");
         }
 
         class KeyValueEquality<TKey, TValue> : IEqualityComparer<KeyValuePair<TKey, TValue>>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/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 a6ecf0e..c439dfd 100644
--- a/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestBytesRefHash.cs
@@ -323,6 +323,7 @@ namespace Lucene.Net.Util
         }
 
         [Test]
+        [ExpectedException(typeof(MaxBytesLengthExceededException))]
         public virtual void TestLargeValue()
         {
             int[] sizes = { Random().Next(5), ByteBlockPool.BYTE_BLOCK_SIZE - 33 + Random().Next(31), ByteBlockPool.BYTE_BLOCK_SIZE - 1 + Random().Next(37) };
@@ -332,21 +333,18 @@ namespace Lucene.Net.Util
                 @ref.Bytes = new byte[sizes[i]];
                 @ref.Offset = 0;
                 @ref.Length = sizes[i];
-                Assert.Throws<MaxBytesLengthExceededException>(() =>
+                try
                 {
-                    try
-                    {
-                        Assert.AreEqual(i, Hash.Add(@ref));
-                    }
-                    catch (MaxBytesLengthExceededException e)
+                    Assert.AreEqual(i, Hash.Add(@ref));
+                }
+                catch (MaxBytesLengthExceededException e)
+                {
+                    if (i < sizes.Length - 1)
                     {
-                        if (i < sizes.Length - 1)
-                        {
-                            Assert.Fail("unexpected exception at size: " + sizes[i]);
-                        }
-                        throw e;
+                        Assert.Fail("unexpected exception at size: " + sizes[i]);
                     }
-                });
+                    throw e;
+                }
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2005d019/src/Lucene.Net.Tests/core/Util/TestSetOnce.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestSetOnce.cs b/src/Lucene.Net.Tests/core/Util/TestSetOnce.cs
index 4bd23bf..af0cd37 100644
--- a/src/Lucene.Net.Tests/core/Util/TestSetOnce.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestSetOnce.cs
@@ -65,26 +65,22 @@ namespace Lucene.Net.Util
         }
 
         [Test]
+        [ExpectedException(typeof(SetOnce<int?>.AlreadySetException))]
         public virtual void TestSettingCtor()
         {
             SetOnce<int?> set = new SetOnce<int?>(new int?(5));
             Assert.AreEqual(5, (int)set.Get());
-            Assert.Throws<SetOnce<int?>.AlreadySetException>(() =>
-            {
-                set.Set(new int?(7));
-            });
+            set.Set(new int?(7));
         }
 
         [Test]
+        [ExpectedException(typeof(SetOnce<int?>.AlreadySetException))]
         public virtual void TestSetOnce_mem()
         {
             SetOnce<int?> set = new SetOnce<int?>();
             set.Set(new int?(5));
             Assert.AreEqual(5, (int)set.Get());
-            Assert.Throws<SetOnce<int?>.AlreadySetException>(() =>
-            {
-                set.Set(new int?(7));
-            });
+            set.Set(new int?(7));
         }
 
         [Test]


[5/5] lucenenet git commit: Revert "Adding Skip reason for [Ignore] tests"

Posted by ni...@apache.org.
Revert "Adding Skip reason for [Ignore] tests"

This reverts commit eaaab34e5f5026ff2b5173ad7387992876217876.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0ff42e34
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0ff42e34
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0ff42e34

Branch: refs/heads/master
Commit: 0ff42e3471af859dab84743b98a21e03f74a6a3c
Parents: 2005d01
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 19 10:15:38 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 19 10:15:38 2016 +0700

----------------------------------------------------------------------
 .../Suggest/Analyzing/TestFreeTextSuggester.cs          |  3 +--
 src/Lucene.Net.Tests/core/Index/Test2BTerms.cs          |  2 +-
 src/Lucene.Net.Tests/core/Index/Test4GBStoredFields.cs  |  2 +-
 src/Lucene.Net.Tests/core/TestWorstCaseTestBehavior.cs  | 12 ++++++------
 src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs |  2 +-
 .../core/Util/StressRamUsageEstimator.cs                |  2 +-
 src/Lucene.Net.Tests/core/Util/TestPagedBytes.cs        |  2 +-
 src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs     |  4 ++--
 8 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
index e81072a..ee79e68 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
@@ -209,8 +209,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
             }
         }
 
-        [Test]
-        [Ignore("Ignored Test: TestWiki")]
+        [Ignore]
         public void TestWiki()
         {
             LineFileDocs lfd = new LineFileDocs(null, "/lucenedata/enwiki/enwiki-20120502-lines-1k.txt", false);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs b/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
index 1f075d3..f896a57 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Index
     //   java -server -Xmx8g -d64 -cp .:lib/junit-4.10.jar:./build/classes/test:./build/classes/test-framework:./build/classes/java -Dlucene.version=4.0-dev -Dtests.directory=MMapDirectory -DtempDir=build -ea org.junit.runner.JUnitCore Lucene.Net.Index.Test2BTerms
     //
     [SuppressCodecs("SimpleText", "Memory", "Direct")]
-    [Ignore("Ignored: Test2BTerms")]
+    [Ignore]
     [TestFixture]
     public class Test2BTerms : LuceneTestCase
     {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/src/Lucene.Net.Tests/core/Index/Test4GBStoredFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test4GBStoredFields.cs b/src/Lucene.Net.Tests/core/Index/Test4GBStoredFields.cs
index d507a36..5748354 100644
--- a/src/Lucene.Net.Tests/core/Index/Test4GBStoredFields.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test4GBStoredFields.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Index
     [TestFixture]
     public class Test4GBStoredFields : LuceneTestCase
     {
-        [Ignore("LUCENENET NOTE: This was marked Nightly in Java")] // LUCENENET NOTE: This was marked Nightly in Java
+        [Ignore] // LUCENENET NOTE: This was marked Nightly in Java
         [Test]
         public virtual void Test([ValueSource(typeof(ConcurrentMergeSchedulers), "Values")]IConcurrentMergeScheduler scheduler)
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/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 bcc0751..ee0a0b9 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("Ignored test: TestThreadLeak")]
+        [Ignore]
         [Test]
         public virtual void TestThreadLeak()
         {
@@ -62,7 +62,7 @@ namespace Lucene.Net
             }
         }
 
-        [Ignore("Ignored: TestLaaaaaargeOutput")]
+        [Ignore]
         [Test]
         public virtual void TestLaaaaaargeOutput()
         {
@@ -81,7 +81,7 @@ namespace Lucene.Net
         }
 
 
-        [Ignore("TestProgressiveOutput")]
+        [Ignore]
         [Test]
         public virtual void TestProgressiveOutput()
         {
@@ -95,7 +95,7 @@ namespace Lucene.Net
             }
         }
 
-        [Ignore("Ignored: TestUncaughtException")]
+        [Ignore]
         [Test]
         public virtual void TestUncaughtException()
         {
@@ -119,7 +119,7 @@ namespace Lucene.Net
             }
         }
 
-        [Ignore("Ignored: TestTimeout")]
+        [Ignore]
         [Test, Timeout(500)]
         public virtual void TestTimeout()
         {
@@ -127,7 +127,7 @@ namespace Lucene.Net
         }
 
 
-        [Ignore("Ignored: TestZombie")]
+        [Ignore]
         [Test, Timeout(1000)]
         public virtual void TestZombie()
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/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 d9622a1..310de82 100644
--- a/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs
+++ b/src/Lucene.Net.Tests/core/Util/Packed/TestPackedInts.cs
@@ -911,7 +911,7 @@ namespace Lucene.Net.Util.Packed
         }
 
         // memory hole
-        [Ignore("memory hole")]
+        [Ignore]
         [Test]
         public virtual void TestPagedGrowableWriterOverflow()
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/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 d467bfd..0a63554 100644
--- a/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs
+++ b/src/Lucene.Net.Tests/core/Util/StressRamUsageEstimator.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Util
         }
 
         // this shows an easy stack overflow because we're counting recursively.
-        [Ignore("this shows an easy stack overflow because we're counting recursively.")]
+        [Ignore]
         [Test]
         public virtual void TestChainedEstimation()
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/src/Lucene.Net.Tests/core/Util/TestPagedBytes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestPagedBytes.cs b/src/Lucene.Net.Tests/core/Util/TestPagedBytes.cs
index 6213e33..89908e9 100644
--- a/src/Lucene.Net.Tests/core/Util/TestPagedBytes.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestPagedBytes.cs
@@ -178,7 +178,7 @@ namespace Lucene.Net.Util
             }
         }
 
-        [Ignore("memory hole")] // memory hole
+        [Ignore] // memory hole
         [Test]
         [LongRunningTest, Timeout(120000)]
         public virtual void TestOverflow()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0ff42e34/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 9906c0e..eb4275a 100644
--- a/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
@@ -208,9 +208,9 @@ namespace Lucene.Net.Util
                 Assert.IsNotNull(b);
                 return (int) (a - b);
             }
-        }
+        } 
 
-        [Ignore("Increase heap size to run this test")] // Increase heap size to run this test
+        [Ignore] // Increase heap size to run this test
         [Test, LuceneNetSpecific]
         public static void TestMaxSizeBounds()
         {