This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit 36abc9a832cf43b85c686061daaf00f92a4afba0
Author: Shad Storhaug <[email protected]>
AuthorDate: Sat Feb 8 18:36:51 2020 +0700

    BREAKING: Lucene.Net.TestFramework.Support: Changed namespace of 
ApiScanTestBase, CultureInfoSupport, and ExceptionSerializationTestBase to 
Lucene.Net.Util
---
 .../Support/ApiScanTestBase.cs                     | 27 +++++++-------
 .../Support/CultureInfoSupport.cs                  |  2 +-
 .../Support/ExceptionSerializationTestBase.cs      |  4 +--
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 42 ++++++++++------------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 42 ++++++++++------------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 42 ++++++++++------------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 42 ++++++++++------------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 32 ++++++++---------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 42 ++++++++++------------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 41 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 src/Lucene.Net.Tests/Support/TestApiConsistency.cs | 40 ++++++++++-----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 .../Support/TestApiConsistency.cs                  | 39 ++++++++++----------
 .../Support/TestExceptionSerialization.cs          |  1 +
 51 files changed, 475 insertions(+), 544 deletions(-)

diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs 
b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index 35ed0d2..b0f6a1b 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Util;
+using Lucene.Net.Support;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,7 +8,7 @@ using System.Text.RegularExpressions;
 using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
-namespace Lucene.Net.Support
+namespace Lucene.Net.Util
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,8 +28,9 @@ namespace Lucene.Net.Support
      */
 
     /// <summary>
-    /// LUCENENET specific - functionality for scanning the API to ensure 
-    /// naming and .NET conventions are followed consistently.
+    /// LUCENENET specific - functionality for scanning the API to ensure
+    /// naming and .NET conventions are followed consistently. Not for use
+    /// by end users.
     /// </summary>
     public abstract class ApiScanTestBase : LuceneTestCase
 #if TESTFRAMEWORK_XUNIT
@@ -49,52 +50,52 @@ namespace Lucene.Net.Support
         /// must be camelCase (optionally may be prefixed with underscore, 
         /// but it is preferred not to use the underscore to match Lucene).
         /// </summary>
-        private static Regex PrivateFieldName = new 
Regex("^_?[a-z][a-zA-Z0-9_]*$|^[A-Z0-9_]+$", RegexOptions.Compiled);
+        private static readonly Regex PrivateFieldName = new 
Regex("^_?[a-z][a-zA-Z0-9_]*$|^[A-Z0-9_]+$", RegexOptions.Compiled);
 
         /// <summary>
         /// Protected fields must either be upper case separated with 
underscores or
         /// must be prefixed with m_ (to avoid naming conflicts with 
properties).
         /// </summary>
-        private static Regex ProtectedFieldName = new 
Regex("^m_[a-z][a-zA-Z0-9_]*$|^[A-Z0-9_]+$", RegexOptions.Compiled);
+        private static readonly Regex ProtectedFieldName = new 
Regex("^m_[a-z][a-zA-Z0-9_]*$|^[A-Z0-9_]+$", RegexOptions.Compiled);
 
         /// <summary>
         /// Method parameters must be camelCase and not begin or end with 
underscore.
         /// </summary>
-        private static Regex MethodParameterName = new 
Regex("^[a-z](?:[a-zA-Z0-9_]*[a-zA-Z0-9])?$", RegexOptions.Compiled);
+        private static readonly Regex MethodParameterName = new 
Regex("^[a-z](?:[a-zA-Z0-9_]*[a-zA-Z0-9])?$", RegexOptions.Compiled);
 
         /// <summary>
         /// Interfaces must begin with "I" followed by another captial letter. 
Note this includes a
         /// fix for generic interface names, that end with `{number}.
         /// </summary>
-        private static Regex InterfaceName = new 
Regex("^I[A-Z][a-zA-Z0-9_]*(?:`\\d+)?$", RegexOptions.Compiled);
+        private static readonly Regex InterfaceName = new 
Regex("^I[A-Z][a-zA-Z0-9_]*(?:`\\d+)?$", RegexOptions.Compiled);
 
         /// <summary>
         /// Class names must be pascal case and not use the interface naming 
convention.
         /// </summary>
-        private static Regex ClassName = new 
Regex("^[A-Z][a-zA-Z0-9_]*(?:`\\d+)?$", RegexOptions.Compiled);
+        private static readonly Regex ClassName = new 
Regex("^[A-Z][a-zA-Z0-9_]*(?:`\\d+)?$", RegexOptions.Compiled);
 
         /// <summary>
         /// Public members should not contain the word "Comparer". In .NET, 
these should be named "Comparer".
         /// </summary>
-        private static Regex ContainsComparer = new Regex("[Cc]omparator", 
RegexOptions.Compiled);
+        private static readonly Regex ContainsComparer = new 
Regex("[Cc]omparator", RegexOptions.Compiled);
 
         /// <summary>
         /// Public methods and properties should not contain the word "Int" 
that is not followed by 16, 32, or 64,
         /// "Long", "Short", or "Float". These should be converted to their 
.NET names "Int32", "Int64", "Int16", and "Short".
         /// Note we need to ignore common words such as "point", "intern", and 
"intersect".
         /// </summary>
-        private static Regex ContainsNonNetNumeric = new 
Regex("(?<![Pp]o|[Pp]r|[Jj]o)[Ii]nt(?!16|32|64|er|eg|ro)|[Ll]ong(?!est|er)|[Ss]hort(?!est|er)|[Ff]loat",
 RegexOptions.Compiled);
+        private static readonly Regex ContainsNonNetNumeric = new 
Regex("(?<![Pp]o|[Pp]r|[Jj]o)[Ii]nt(?!16|32|64|er|eg|ro)|[Ll]ong(?!est|er)|[Ss]hort(?!est|er)|[Ff]loat",
 RegexOptions.Compiled);
 
         /// <summary>
         /// Constants should not contain the word INT that is not followed by 
16, 32, or 64, LONG, SHORT, or FLOAT
         /// </summary>
-        private static Regex ConstContainsNonNetNumeric = new 
Regex("(?<!PO|PR|JO)INT(?!16|32|64|ER|EG|RO)|LONG(?!EST|ER)|SHORT(?!EST|ER)|FLOAT",
 RegexOptions.Compiled);
+        private static readonly Regex ConstContainsNonNetNumeric = new 
Regex("(?<!PO|PR|JO)INT(?!16|32|64|ER|EG|RO)|LONG(?!EST|ER)|SHORT(?!EST|ER)|FLOAT",
 RegexOptions.Compiled);
 
         /// <summary>
         /// Matches IL code pattern for a method body with only a return 
statement for a local variable.
         /// In this case, the array is writable by the consumer.
         /// </summary>
-        private static Regex MethodBodyReturnValueOnly = new 
Regex("\\0\\u0002\\{(?:.|\\\\u\\d\\d\\d\\d|\\0|\\[a-z]){3}\\u0004\\n\\+\\0\\u0006\\*",
 RegexOptions.Compiled);
+        private static readonly Regex MethodBodyReturnValueOnly = new 
Regex("\\0\\u0002\\{(?:.|\\\\u\\d\\d\\d\\d|\\0|\\[a-z]){3}\\u0004\\n\\+\\0\\u0006\\*",
 RegexOptions.Compiled);
 
 
         //[Test, LuceneNetSpecific]
diff --git a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs 
b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
index 8ee8d6c..02dbdb3 100644
--- a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
+++ b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Lucene.Net.Support
+namespace Lucene.Net.Util
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git 
a/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs 
b/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs
index ff2b154..65134a1 100644
--- a/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs
@@ -1,6 +1,4 @@
 #if FEATURE_SERIALIZABLE
-using Lucene.Net.TestFramework;
-using Lucene.Net.Util;
 using System;
 using System.Globalization;
 using System.IO;
@@ -9,7 +7,7 @@ using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using Assert = Lucene.Net.TestFramework.Assert;
 
-namespace Lucene.Net.Support
+namespace Lucene.Net.Util
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
index d849a78..8ec72b6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Analysis
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs
index de2fce9..55f5be0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git 
a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
index f21cbde..8985e94 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Analysis.Ja.Support
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestExceptionSerialization.cs
index 80d5b43..c116cd1 100644
--- 
a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestExceptionSerialization.cs
+++ 
b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git 
a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
index 542b8bb..d7bc47b 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Analysis.Phonetic
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestExceptionSerialization.cs
index 282daff..c7c454d 100644
--- 
a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestExceptionSerialization.cs
+++ 
b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git 
a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
index a0dcf4e..d049009 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Analysis.Cn.Smart.Support
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestExceptionSerialization.cs
index f01a3c3..ca73e99 100644
--- 
a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestExceptionSerialization.cs
+++ 
b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git 
a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
index eaf90be..ff371f1 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Analysis.Stempel
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestExceptionSerialization.cs
index 4fc50cb..9e489bc 100644
--- 
a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestExceptionSerialization.cs
+++ 
b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
index 49776c9..da035b0 100644
--- a/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Benchmarks.Support
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Benchmark/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Benchmark/Support/TestExceptionSerialization.cs
index 9e2933c..3025feb 100644
--- a/src/Lucene.Net.Tests.Benchmark/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Benchmark/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
index def796f..75ec564 100644
--- a/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Classification
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Classification/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Classification/Support/TestExceptionSerialization.cs
index 1f5e4d1..e17feff 100644
--- a/src/Lucene.Net.Tests.Classification/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Classification/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
index 20d7784..e1cdb97 100644
--- a/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Codecs.Tests
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Codecs/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Codecs/Support/TestExceptionSerialization.cs
index 293f3cc..c102597 100644
--- a/src/Lucene.Net.Tests.Codecs/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Codecs/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
index c1eb4c4..e8b9448 100644
--- a/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
@@ -1,26 +1,26 @@
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Expressions
 {
     /*
-        * Licensed to the Apache Software Foundation (ASF) under one or more
-        * contributor license agreements.  See the NOTICE file distributed with
-        * this work for additional information regarding copyright ownership.
-        * The ASF licenses this file to You under the Apache License, Version 
2.0
-        * (the "License"); you may not use this file except in compliance with
-        * the License.  You may obtain a copy of the License at
-        *
-        *     http://www.apache.org/licenses/LICENSE-2.0
-        *
-        * Unless required by applicable law or agreed to in writing, software
-        * distributed under the License is distributed on an "AS IS" BASIS,
-        * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
implied.
-        * See the License for the specific language governing permissions and
-        * limitations under the License.
-        */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
 
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
diff --git 
a/src/Lucene.Net.Tests.Expressions/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Expressions/Support/TestExceptionSerialization.cs
index 37efac9..4823f9c 100644
--- a/src/Lucene.Net.Tests.Expressions/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Expressions/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
index 5b9b189..50310b9 100644
--- a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Facet
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Facet/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Facet/Support/TestExceptionSerialization.cs
index 947e21a..b487317 100644
--- a/src/Lucene.Net.Tests.Facet/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Facet/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
index bbbbea8..3d3c445 100644
--- a/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Grouping
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Grouping/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Grouping/Support/TestExceptionSerialization.cs
index 6642c21..308eb4c 100644
--- a/src/Lucene.Net.Tests.Grouping/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Grouping/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
index 098aeb1..82fb815 100644
--- a/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Search
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Highlighter/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Highlighter/Support/TestExceptionSerialization.cs
index 4a11185..229c48a 100644
--- a/src/Lucene.Net.Tests.Highlighter/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
index feb4475..7ee5e8e 100644
--- a/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Join
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Join/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Join/Support/TestExceptionSerialization.cs
index 5c7a668..099fcc1 100644
--- a/src/Lucene.Net.Tests.Join/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Join/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
index 267fde1..c49cdc7 100644
--- a/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Memory
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Memory/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Memory/Support/TestExceptionSerialization.cs
index 43ec27a..6689715 100644
--- a/src/Lucene.Net.Tests.Memory/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Memory/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
index 9f92912..ee0cce6 100644
--- a/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Misc
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Misc/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Misc/Support/TestExceptionSerialization.cs
index c92102e..67417b6 100644
--- a/src/Lucene.Net.Tests.Misc/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Misc/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
index dfc6a00..687de61 100644
--- a/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Queries
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Queries/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Queries/Support/TestExceptionSerialization.cs
index 7d8442e..7730181 100644
--- a/src/Lucene.Net.Tests.Queries/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Queries/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
index 6710fb9..87b7a07 100644
--- a/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.QueryParsers
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.QueryParser/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.QueryParser/Support/TestExceptionSerialization.cs
index f448c95..db0a09c 100644
--- a/src/Lucene.Net.Tests.QueryParser/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
index 00e3763..624f28d 100644
--- a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Replicator
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.Replicator/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Replicator/Support/TestExceptionSerialization.cs
index 02b9665..153a69a 100644
--- a/src/Lucene.Net.Tests.Replicator/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Replicator/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
index 4e45a0b..de53a4d 100644
--- a/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Sandbox
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Sandbox/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Sandbox/Support/TestExceptionSerialization.cs
index 0b45e48..ba0c622 100644
--- a/src/Lucene.Net.Tests.Sandbox/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
index 1c92117..cdb6379 100644
--- a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Spatial
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Spatial/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Spatial/Support/TestExceptionSerialization.cs
index 9dd217d..88b2710 100644
--- a/src/Lucene.Net.Tests.Spatial/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Spatial/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
index a0baff5..8a33bb7 100644
--- a/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.Suggest
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests.Suggest/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.Suggest/Support/TestExceptionSerialization.cs
index 3fbf209..ae75a9b 100644
--- a/src/Lucene.Net.Tests.Suggest/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Suggest/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
index acc357b..503aa6a 100644
--- a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
@@ -1,33 +1,28 @@
-// LUCENENET TODO: Get this working on all test frameworks
 #if TESTFRAMEWORK_NUNIT
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Tests.TestFramework
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/Lucene.Net.Tests.TestFramework/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests.TestFramework/Support/TestExceptionSerialization.cs
index 270e504..5ceea6d 100644
--- a/src/Lucene.Net.Tests.TestFramework/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Support/TestExceptionSerialization.cs
@@ -2,6 +2,7 @@
 #if TESTFRAMEWORK_NUNIT
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests/Support/TestApiConsistency.cs 
b/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
index 990fac5..0580242 100644
--- a/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
@@ -1,31 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git a/src/Lucene.Net.Tests/Support/TestExceptionSerialization.cs 
b/src/Lucene.Net.Tests/Support/TestExceptionSerialization.cs
index 2c359b5..e3fadaa 100644
--- a/src/Lucene.Net.Tests/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs 
b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
index 16bb2b8..63cf56e 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
@@ -1,30 +1,27 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
 namespace Lucene.Net.Support
 {
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
     /// <summary>
     /// LUCENENET specific tests for ensuring API conventions are followed
     /// </summary>
diff --git 
a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestExceptionSerialization.cs 
b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestExceptionSerialization.cs
index 4a11185..229c48a 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestExceptionSerialization.cs
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestExceptionSerialization.cs
@@ -1,5 +1,6 @@
 #if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;

Reply via email to