change implementation so that Read overrides behave as expected

src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs

@@ -939,7 +939,7 @@ private static void CheckAnalysisConsistency(Random random, Analyzer a, bool use
                         }
                         // Throw an errant exception from the Reader:
 
-                        MockReaderWrapper evilReader = new MockReaderWrapper(random, new StringReader(text));
+                        MockReaderWrapper evilReader = new MockReaderWrapper(random, text);
                         evilReader.ThrowExcAfterChar(random.Next(text.Length));
                         reader = evilReader;
 
@@ -1046,7 +1046,7 @@ private static void CheckAnalysisConsistency(Random random, Analyzer a, bool use
                     Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: using spoon-feed reader");
                 }
 
-                reader = new MockReaderWrapper(random, reader);
+                reader = new MockReaderWrapper(random, text);
             }
 
             ts = a.TokenStream("dummy", useCharFilter ? (TextReader)new MockCharFilter(reader, remainder) : reader);
@@ -1092,7 +1092,7 @@ private static void CheckAnalysisConsistency(Random random, Analyzer a, bool use
                         Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: indexing using spoon-feed reader");
                     }
 
-                    reader = new MockReaderWrapper(random, reader);
+                    reader = new MockReaderWrapper(random, text);
                 }
 
                 field.ReaderValue = useCharFilter ? (TextReader)new MockCharFilter(reader, remainder) : reader;

src/Lucene.Net.TestFramework/Analysis/MockReaderWrapper.cs

@@ -32,17 +32,15 @@ namespace Lucene.Net.Analysis
 
     public class MockReaderWrapper : StringReader
     {
-        private readonly StringReader @in;
         private readonly Random Random;
 
         private int ExcAtChar = -1;
         private int ReadSoFar;
         private bool ThrowExcNext_Renamed;
 
-        public MockReaderWrapper(Random random, StringReader @in)
-            : base(@in.ReadToEnd())
+        public MockReaderWrapper(Random random, string text)
+            : base(text)
         {
-            this.@in = @in;
             this.Random = random;
         }
 
@@ -60,17 +58,18 @@ public virtual void ThrowExcNext()
             ThrowExcNext_Renamed = true;
         }
 
-        public override void Close()
+        public override int Read()
         {
-            @in.Close();
+            ThrowExceptionIfApplicable();
+
+            var c = base.Read();
+            ReadSoFar += 1;
+            return c;
         }
 
         public override int Read(char[] cbuf, int off, int len)
         {
-            if (ThrowExcNext_Renamed || (ExcAtChar != -1 && ReadSoFar >= ExcAtChar))
-            {
-                throw new Exception("fake exception now!");
-            }
+            ThrowExceptionIfApplicable();
             int read;
             int realLen;
             if (len == 1)
@@ -87,14 +86,14 @@ public override int Read(char[] cbuf, int off, int len)
             {
                 int left = ExcAtChar - ReadSoFar;
                 Assert.True(left != 0);
-                read = @in.Read(cbuf, off, Math.Min(realLen, left));
+                read = base.Read(cbuf, off, Math.Min(realLen, left));
                 //Characters are left
                 Assert.True(read != 0);
                 ReadSoFar += read;
             }
             else
             {
-                read = @in.Read(cbuf, off, realLen);
+                read = base.Read(cbuf, off, realLen);
                 //Terrible TextReader::Read semantics
                 if (read == 0)
                 {
@@ -104,6 +103,14 @@ public override int Read(char[] cbuf, int off, int len)
             return read;
         }
 
+        private void ThrowExceptionIfApplicable()
+        {
+            if (ThrowExcNext_Renamed || (ExcAtChar != -1 && ReadSoFar >= ExcAtChar))
+            {
+                throw new Exception("fake exception now!");
+            }
+        }
+
         public bool MarkSupported()
         {
             return false;