You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/01/25 13:28:17 UTC

[1/3] lucenenet git commit: Some treatment to exceptions thrown from Field

Repository: lucenenet
Updated Branches:
  refs/heads/master 593231b3b -> 1b806ebf5


Some treatment to exceptions thrown from Field


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

Branch: refs/heads/master
Commit: a6aa4e2da59103ea238f2b6a0359586c0d615490
Parents: 593231b
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Sun Jan 25 14:13:22 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Sun Jan 25 14:13:22 2015 +0200

----------------------------------------------------------------------
 .../Document/BinaryDocValuesField.cs            |  7 ++-
 src/Lucene.Net.Core/Document/Field.cs           | 46 ++++++++++----------
 .../Document/NumericDocValuesField.cs           |  2 +-
 .../Document/SortedDocValuesField.cs            |  4 +-
 4 files changed, 29 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6aa4e2d/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs b/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
index 0001003..0c3edfe 100644
--- a/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
@@ -1,4 +1,4 @@
-
+using System;
 using Lucene.Net.Index;
 using Lucene.Net.Util;
 
@@ -37,8 +37,7 @@ namespace Lucene.Net.Documents
     /// If you also need to store the value, you should add a
     /// separate <seealso cref="StoredField"/> instance.
     /// </summary>
-    /// <seealso cref= BinaryDocValues
-    ///  </seealso>
+    /// <seealso cref= BinaryDocValues</seealso>
     public class BinaryDocValuesField : Field
     {
         /// <summary>
@@ -56,7 +55,7 @@ namespace Lucene.Net.Documents
         /// Create a new binary DocValues field. </summary>
         /// <param name="name"> field name </param>
         /// <param name="value"> binary content </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentNullException"> if the field name is null </exception>
         public BinaryDocValuesField(string name, BytesRef value)
             : base(name, fType)
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6aa4e2d/src/Lucene.Net.Core/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Field.cs b/src/Lucene.Net.Core/Document/Field.cs
index 2c20987..8dd42b8 100644
--- a/src/Lucene.Net.Core/Document/Field.cs
+++ b/src/Lucene.Net.Core/Document/Field.cs
@@ -87,18 +87,18 @@ namespace Lucene.Net.Documents
         /// Intended only for custom Field subclasses. </summary>
         /// <param name="name"> field name </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if either the name or type
+        /// <exception cref="ArgumentNullException"> if either the name or type
         ///         is null. </exception>
         protected internal Field(string name, FieldType type)
         {
             if (name == null)
             {
-                throw new System.ArgumentException("name cannot be null");
+                throw new System.ArgumentNullException("name", "name cannot be null");
             }
             this.Name_Renamed = name;
             if (type == null)
             {
-                throw new System.ArgumentException("type cannot be null");
+                throw new System.ArgumentNullException("type", "type cannot be null");
             }
             this.Type = type;
         }
@@ -108,23 +108,23 @@ namespace Lucene.Net.Documents
         /// <param name="name"> field name </param>
         /// <param name="reader"> reader value </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if either the name or type
+        /// <exception cref="ArgumentNullException"> if either the name or type
         ///         is null, or if the field's type is stored(), or
         ///         if tokenized() is false. </exception>
-        /// <exception cref="NullPointerException"> if the reader is null </exception>
+        /// <exception cref="ArgumentNullException"> if the reader is null </exception>
         public Field(string name, TextReader reader, FieldType type)
         {
             if (name == null)
             {
-                throw new System.ArgumentException("name cannot be null");
+                throw new System.ArgumentNullException("name", "name cannot be null");
             }
             if (type == null)
             {
-                throw new System.ArgumentException("type cannot be null");
+                throw new System.ArgumentNullException("type", "type cannot be null");
             }
             if (reader == null)
             {
-                throw new System.NullReferenceException("reader cannot be null");
+                throw new System.ArgumentNullException("reader", "reader cannot be null");
             }
             if (type.Stored)
             {
@@ -145,19 +145,19 @@ namespace Lucene.Net.Documents
         /// <param name="name"> field name </param>
         /// <param name="tokenStream"> TokenStream value </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if either the name or type
+        /// <exception cref="ArgumentException"> if either the name or type
         ///         is null, or if the field's type is stored(), or
         ///         if tokenized() is false, or if indexed() is false. </exception>
-        /// <exception cref="NullPointerException"> if the tokenStream is null </exception>
+        /// <exception cref="ArgumentNullException"> if the tokenStream is null </exception>
         public Field(string name, TokenStream tokenStream, FieldType type)
         {
             if (name == null)
             {
-                throw new System.ArgumentException("name cannot be null");
+                throw new System.ArgumentNullException("name", "name cannot be null");
             }
             if (tokenStream == null)
             {
-                throw new System.NullReferenceException("tokenStream cannot be null");
+                throw new System.ArgumentNullException("tokenStream","tokenStream cannot be null");
             }
             if (!type.Indexed || !type.Tokenized)
             {
@@ -182,9 +182,9 @@ namespace Lucene.Net.Documents
         /// <param name="name"> field name </param>
         /// <param name="value"> byte array pointing to binary content (not copied) </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null,
+        /// <exception cref="ArgumentException"> if the field name is null,
         ///         or the field's type is indexed() </exception>
-        /// <exception cref="NullPointerException"> if the type is null </exception>
+        /// <exception cref="ArgumentNullException"> if the type is null </exception>
         public Field(string name, byte[] value, FieldType type)
             : this(name, value, 0, value.Length, type)
         {
@@ -200,9 +200,9 @@ namespace Lucene.Net.Documents
         /// <param name="offset"> starting position of the byte array </param>
         /// <param name="length"> valid length of the byte array </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null,
+        /// <exception cref="ArgumentException"> if the field name is null,
         ///         or the field's type is indexed() </exception>
-        /// <exception cref="NullPointerException"> if the type is null </exception>
+        /// <exception cref="ArgumentNullException"> if the type is null </exception>
         public Field(string name, byte[] value, int offset, int length, FieldType type)
             : this(name, new BytesRef(value, offset, length), type)
         {
@@ -216,14 +216,14 @@ namespace Lucene.Net.Documents
         /// <param name="name"> field name </param>
         /// <param name="bytes"> BytesRef pointing to binary content (not copied) </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null,
+        /// <exception cref="ArgumentException"> if the field name is null,
         ///         or the field's type is indexed() </exception>
-        /// <exception cref="NullPointerException"> if the type is null </exception>
+        /// <exception cref="ArgumentNullException"> if the type is null </exception>
         public Field(string name, BytesRef bytes, FieldType type)
         {
             if (name == null)
             {
-                throw new System.ArgumentException("name cannot be null");
+                throw new System.ArgumentNullException("name", "name cannot be null");
             }
             if (type.Indexed)
             {
@@ -241,19 +241,19 @@ namespace Lucene.Net.Documents
         /// <param name="name"> field name </param>
         /// <param name="value"> string value </param>
         /// <param name="type"> field type </param>
-        /// <exception cref="IllegalArgumentException"> if either the name or value
+        /// <exception cref="ArgumentException"> if either the name or value
         ///         is null, or if the field's type is neither indexed() nor stored(),
         ///         or if indexed() is false but storeTermVectors() is true. </exception>
-        /// <exception cref="NullPointerException"> if the type is null </exception>
+        /// <exception cref="ArgumentNullException"> if the type is null </exception>
         public Field(string name, string value, FieldType type)
         {
             if (name == null)
             {
-                throw new System.ArgumentException("name cannot be null");
+                throw new System.ArgumentNullException("name", "name cannot be null");
             }
             if (value == null)
             {
-                throw new System.ArgumentException("value cannot be null");
+                throw new System.ArgumentNullException("value", "value cannot be null");
             }
             if (!type.Stored && !type.Indexed)
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6aa4e2d/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/NumericDocValuesField.cs b/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
index ac3da29..2327654 100644
--- a/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Documents
         /// Creates a new DocValues field with the specified 64-bit long value </summary>
         /// <param name="name"> field name </param>
         /// <param name="value"> 64-bit long value </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentNullException"> if the field name is null </exception>
         public NumericDocValuesField(string name, long value)
             : base(name, TYPE)
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6aa4e2d/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/SortedDocValuesField.cs b/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
index 04afea2..9bf2af8 100644
--- a/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
@@ -1,4 +1,4 @@
-
+using System;
 using Lucene.Net.Index;
 using Lucene.Net.Util;
 
@@ -54,7 +54,7 @@ namespace Lucene.Net.Documents
         /// Create a new sorted DocValues field. </summary>
         /// <param name="name"> field name </param>
         /// <param name="bytes"> binary content </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentNullException"> if the field name is null </exception>
         public SortedDocValuesField(string name, BytesRef bytes)
             : base(name, TYPE)
         {


[2/3] lucenenet git commit: We should be treating this value as an sbyte

Posted by sy...@apache.org.
We should be treating this value as an sbyte


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

Branch: refs/heads/master
Commit: d0ec50f736ee1bf91e9be10a61ac9b7d9ed07adb
Parents: a6aa4e2
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Sun Jan 25 14:27:25 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Sun Jan 25 14:27:25 2015 +0200

----------------------------------------------------------------------
 .../Codecs/lucene3x/PreFlexRWNormsConsumer.cs                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0ec50f7/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWNormsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWNormsConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWNormsConsumer.cs
index cf9153a..2a91121 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWNormsConsumer.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWNormsConsumer.cs
@@ -81,11 +81,11 @@ namespace Lucene.Net.Codecs.Lucene3x
         public override void AddNumericField(FieldInfo field, IEnumerable<long?> values)
         {
             Debug.Assert(field.Number > LastFieldNumber, "writing norms fields out of order" + LastFieldNumber + " -> " + field.Number);
-            foreach (long? n in values)
+            foreach (var n in values)
             {
-                if ((long)n < sbyte.MinValue || (long)n > sbyte.MaxValue)
+                if (((sbyte)(byte)(long)n) < sbyte.MinValue || ((sbyte)(byte)(long)n) > sbyte.MaxValue)
                 {
-                    throw new System.NotSupportedException("3.x cannot index norms that won't fit in a byte, got: " + (long)n);
+                    throw new System.NotSupportedException("3.x cannot index norms that won't fit in a byte, got: " + ((sbyte)(byte)(long)n));
                 }
                 @out.WriteByte((byte)(sbyte)n);
             }


[3/3] lucenenet git commit: Various

Posted by sy...@apache.org.
Various


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

Branch: refs/heads/master
Commit: 1b806ebf5a3779d93f1b1566003d9b78290d6348
Parents: d0ec50f
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Sun Jan 25 14:27:39 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Sun Jan 25 14:27:39 2015 +0200

----------------------------------------------------------------------
 src/Lucene.Net.Core/Codecs/DocValuesConsumer.cs |  2 +-
 .../Codecs/Lucene3x/Lucene3xNormsProducer.cs    |  6 ++--
 src/Lucene.Net.Core/Index/SegmentCoreReaders.cs |  3 +-
 src/Lucene.Net.Core/Index/SegmentMerger.cs      |  2 +-
 .../Index/BaseIndexFileFormatTestCase.cs        | 31 +++++++++++---------
 .../Index/BaseTermVectorsFormatTestCase.cs      | 12 ++++----
 .../Index/RandomIndexWriter.cs                  |  2 +-
 7 files changed, 31 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.Core/Codecs/DocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/DocValuesConsumer.cs b/src/Lucene.Net.Core/Codecs/DocValuesConsumer.cs
index ecec5e1..4511064 100644
--- a/src/Lucene.Net.Core/Codecs/DocValuesConsumer.cs
+++ b/src/Lucene.Net.Core/Codecs/DocValuesConsumer.cs
@@ -112,7 +112,7 @@ namespace Lucene.Net.Codecs
         /// The default implementation calls <seealso cref="#addNumericField"/>, passing
         /// an Iterable that merges and filters deleted documents on the fly.
         /// </summary>
-        // LUCENE TO-DO This is a bit wacky
+        // LUCENENET TODO This is a bit wacky
         public virtual void MergeNumericField(FieldInfo fieldInfo, MergeState mergeState, IList<NumericDocValues> toMerge/*, IList<Bits> docsWithField*/)
         {
             AddNumericField(fieldInfo, GetMergeNumericFieldEnumerable(fieldInfo, mergeState, toMerge));

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xNormsProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xNormsProducer.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xNormsProducer.cs
index 8dd5fa2..6c7abcc 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xNormsProducer.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xNormsProducer.cs
@@ -192,7 +192,7 @@ namespace Lucene.Net.Codecs.Lucene3x
 
         // holds a file+offset pointing to a norms, and lazy-loads it
         // to a singleton NumericDocValues instance
-        private class NormsDocValues
+        private sealed class NormsDocValues
         {
             private readonly Lucene3xNormsProducer OuterInstance;
 
@@ -207,7 +207,7 @@ namespace Lucene.Net.Codecs.Lucene3x
                 this.Offset = normSeek;
             }
 
-            internal virtual NumericDocValues Instance
+            internal NumericDocValues Instance
             {
                 get
                 {
@@ -254,7 +254,7 @@ namespace Lucene.Net.Codecs.Lucene3x
 
         public override NumericDocValues GetNumeric(FieldInfo field)
         {
-            NormsDocValues dv = Norms[field.Name];
+            var dv = Norms[field.Name];
             Debug.Assert(dv != null);
             return dv.Instance;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.Core/Index/SegmentCoreReaders.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/SegmentCoreReaders.cs b/src/Lucene.Net.Core/Index/SegmentCoreReaders.cs
index 570f2cb..6aaf274 100644
--- a/src/Lucene.Net.Core/Index/SegmentCoreReaders.cs
+++ b/src/Lucene.Net.Core/Index/SegmentCoreReaders.cs
@@ -224,9 +224,8 @@ namespace Lucene.Net.Index
             IDictionary<string, object> normFields = normsLocal.Get();
 
             object ret;
-            NumericDocValues norms;
             normFields.TryGetValue(fi.Name, out ret);
-            norms = (NumericDocValues)ret;
+            var norms = ret as NumericDocValues;
             if (norms == null)
             {
                 norms = NormsProducer.GetNumeric(fi);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.Core/Index/SegmentMerger.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/SegmentMerger.cs b/src/Lucene.Net.Core/Index/SegmentMerger.cs
index bb7e444..bd78f58 100644
--- a/src/Lucene.Net.Core/Index/SegmentMerger.cs
+++ b/src/Lucene.Net.Core/Index/SegmentMerger.cs
@@ -291,7 +291,7 @@ namespace Lucene.Net.Index
                                 norms = DocValues.EMPTY_NUMERIC;
                             }
                             toMerge.Add(norms);
-                            //docsWithField.Add(new Lucene.Net.Util.Bits_MatchAllBits(reader.MaxDoc));
+                            // LUCENENET TODO docsWithField.Add(new Lucene.Net.Util.Bits_MatchAllBits(reader.MaxDoc));
                         }
                         consumer.MergeNumericField(field, MergeState, toMerge/*, docsWithField*/);
                     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
index 2ce7711..0b31695 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
@@ -97,28 +97,31 @@ namespace Lucene.Net.Index
             // do not use newMergePolicy that might return a MockMergePolicy that ignores the no-CFS ratio
             MergePolicy mp = NewTieredMergePolicy();
             mp.NoCFSRatio = 0;
-            IndexWriterConfig cfg = (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))).SetUseCompoundFile(false).SetMergePolicy(mp);
-            RandomIndexWriter w = new RandomIndexWriter(Random(), dir, cfg);
-            int numDocs = AtLeast(500);
-            for (int i = 0; i < numDocs; ++i)
+            var cfg = (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))).SetUseCompoundFile(false).SetMergePolicy(mp);
+            using (var w = new RandomIndexWriter(Random(), dir, cfg))
             {
-                Document d = new Document();
-                AddRandomFields(d);
-                w.AddDocument(d);
+                var numDocs = AtLeast(500);
+                for (var i = 0; i < numDocs; ++i)
+                {
+                    var d = new Document();
+                    AddRandomFields(d);
+                    w.AddDocument(d);
+                }
+                w.ForceMerge(1);
+                w.Commit();
             }
-            w.ForceMerge(1);
-            w.Commit();
-            w.Dispose();
             IndexReader reader = DirectoryReader.Open(dir);
 
             Directory dir2 = NewDirectory();
             mp = NewTieredMergePolicy();
             mp.NoCFSRatio = 0;
             cfg = (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random()))).SetUseCompoundFile(false).SetMergePolicy(mp);
-            w = new RandomIndexWriter(Random(), dir2, cfg);
-            w.AddIndexes(reader);
-            w.Commit();
-            w.Dispose();
+
+            using (var w = new RandomIndexWriter(Random(), dir2, cfg))
+            {
+                w.AddIndexes(reader);
+                w.Commit();
+            }
 
             assertEquals(BytesUsedByExtension(dir), BytesUsedByExtension(dir2));
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index b873d41..b4397b1 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -155,11 +155,13 @@ namespace Lucene.Net.Index
 
         protected internal virtual FieldType FieldType(Options options)
         {
-            FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
-            ft.StoreTermVectors = true;
-            ft.StoreTermVectorPositions = (new OptionsWrapper(options)).positions;
-            ft.StoreTermVectorOffsets = (new OptionsWrapper(options)).offsets;
-            ft.StoreTermVectorPayloads = (new OptionsWrapper(options)).payloads;
+            var ft = new FieldType(TextField.TYPE_NOT_STORED)
+            {
+                StoreTermVectors = true,
+                StoreTermVectorPositions = (new OptionsWrapper(options)).positions,
+                StoreTermVectorOffsets = (new OptionsWrapper(options)).offsets,
+                StoreTermVectorPayloads = (new OptionsWrapper(options)).payloads
+            };
             ft.Freeze();
             return ft;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1b806ebf/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index b3f3e40..b4d4370 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -517,7 +517,7 @@ namespace Lucene.Net.Index
 
             public TestPointInfoStream(InfoStream @delegate, TestPoint testPoint)
             {
-                this.@delegate = @delegate == null ? new NullInfoStream() : @delegate;
+                this.@delegate = @delegate ?? new NullInfoStream();
                 this.TestPoint = testPoint;
             }