You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/02/28 23:43:28 UTC
[Lucene.Net] svn commit: r1294875 [33/45] - in /incubator/lucene.net/trunk: ./ build/
build/vs2010/contrib/ build/vs2010/test/ doc/ src/ src/contrib/Analyzers/
src/contrib/Analyzers/AR/ src/contrib/Analyzers/BR/
src/contrib/Analyzers/CJK/ src/contrib/Analyzers/Cn/ ...
Modified: incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/SpellChecker/Test/TestSpellChecker.cs Tue Feb 28 22:43:08 2012
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
using System;
-
+using System.Collections.Concurrent;
using NUnit.Framework;
using RAMDirectory = Lucene.Net.Store.RAMDirectory;
@@ -36,32 +35,28 @@ using Lucene.Net.Search;
namespace SpellChecker.Net.Test.Search.Spell
{
-
-
- /// <summary> Test case
- ///
+ /// <summary>
+ /// Test case
/// </summary>
- /// <author> Nicolas Maisonneuve
- /// </author>
+ /// <author>Nicolas Maisonneuve</author>
[TestFixture]
public class TestSpellChecker
{
private SpellCheckerMock spellChecker;
private Directory userindex, spellindex;
- public ArrayList searchers;
- private Random random = new Random();
-
+ private readonly Random random = new Random();
+ public ConcurrentQueue<IndexSearcher> searchers;
[SetUp]
public virtual void SetUp()
{
//create a user index
userindex = new RAMDirectory();
- IndexWriter writer = new IndexWriter(userindex, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
+ var writer = new IndexWriter(userindex, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
- for (int i = 0; i < 1000; i++)
+ for (var i = 0; i < 1000; i++)
{
- Document doc = new Document();
+ var doc = new Document();
doc.Add(new Field("field1", English.IntToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
doc.Add(new Field("field2", English.IntToEnglish(i + 1), Field.Store.YES, Field.Index.ANALYZED)); // + word thousand
writer.AddDocument(doc);
@@ -70,7 +65,7 @@ namespace SpellChecker.Net.Test.Search.S
// create the spellChecker
spellindex = new RAMDirectory();
- searchers = ArrayList.Synchronized(new ArrayList());
+ searchers = new ConcurrentQueue<IndexSearcher>();
spellChecker = new SpellCheckerMock(spellindex, this);
}
@@ -112,6 +107,7 @@ namespace SpellChecker.Net.Test.Search.S
Assert.Fail();
}
}
+
private void CheckCommonSuggestions(IndexReader r)
{
String[] similar = spellChecker.SuggestSimilar("fvie", 2);
@@ -190,7 +186,7 @@ namespace SpellChecker.Net.Test.Search.S
Assert.AreEqual(similar[1], "one");
try
{
- similar = spellChecker.SuggestSimilar("tousand", 10, r, null, false);
+ spellChecker.SuggestSimilar("tousand", 10, r, null, false);
}
catch (NullReferenceException e)
{
@@ -218,16 +214,14 @@ namespace SpellChecker.Net.Test.Search.S
{
long time = (System.DateTime.Now.Ticks - 621355968000000000) / 10000;
spellChecker.IndexDictionary(new LuceneDictionary(r, field));
- time = (System.DateTime.Now.Ticks - 621355968000000000) / 10000 - time;
- //System.out.println("time to build " + field + ": " + time);
}
private int Numdoc()
{
- IndexReader rs = IndexReader.Open(spellindex);
+ var rs = IndexReader.Open(spellindex);
int num = rs.NumDocs();
Assert.IsTrue(num != 0);
- //System.out.println("num docs: " + num);
+
rs.Close();
return num;
}
@@ -235,18 +229,23 @@ namespace SpellChecker.Net.Test.Search.S
[Test]
public void TestClose()
{
- IndexReader r = IndexReader.Open(userindex, true);
+ var r = IndexReader.Open(userindex, true);
spellChecker.ClearIndex();
- String field = "field1";
+ const string field = "field1";
+
Addwords(r, "field1");
int num_field1 = this.Numdoc();
+
Addwords(r, "field2");
int num_field2 = this.Numdoc();
+
Assert.AreEqual(num_field2, num_field1 + 1);
+
CheckCommonSuggestions(r);
AssertLastSearcherOpen(4);
spellChecker.Close();
AssertSearchersClosed();
+
try
{
spellChecker.Close();
@@ -352,7 +351,8 @@ namespace SpellChecker.Net.Test.Search.S
AssertSearchersClosed();
}
- private void joinAll(SpellCheckWorker[] workers, long timeout)
+
+ private static void joinAll(SpellCheckWorker[] workers, long timeout)
{
for (int j = 0; j < workers.Length; j++)
{
@@ -470,8 +470,8 @@ namespace SpellChecker.Net.Test.Search.S
public class SpellCheckerMock : SpellChecker.Net.Search.Spell.SpellChecker
{
- private TestSpellChecker enclosingInstance;
- ArrayList searchers = ArrayList.Synchronized(new ArrayList()); // <--New !!!!!!!
+ private readonly TestSpellChecker enclosingInstance;
+ private readonly ConcurrentQueue<IndexSearcher> searchers = new ConcurrentQueue<IndexSearcher>();
public SpellCheckerMock(Directory spellIndex, TestSpellChecker inst)
: base(spellIndex)
{
@@ -487,7 +487,7 @@ namespace SpellChecker.Net.Test.Search.S
public override IndexSearcher CreateSearcher(Directory dir)
{
IndexSearcher searcher = base.CreateSearcher(dir);
- searchers.Add(searcher);
+ searchers.Enqueue(searcher);
return searcher;
}
}
Modified: incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs Tue Feb 28 22:43:08 2012
@@ -25,79 +25,16 @@ using LuceneTestCase = Lucene.Net.Util.L
namespace Lucene.Net.Analysis
{
- /// <summary> Base class for all Lucene unit tests that use TokenStreams.
- /// <p/>
- /// This class runs all tests twice, one time with {@link TokenStream#setOnlyUseNewAPI} <code>false</code>
- /// and after that one time with <code>true</code>.
- /// </summary>
+ /// <summary>Base class for all Lucene unit tests that use TokenStreams.</summary>
public abstract class BaseTokenStreamTestCase:LuceneTestCase
{
-
- private bool onlyUseNewAPI = false;
- private System.Collections.Hashtable testWithNewAPI;
-
- public BaseTokenStreamTestCase():base()
- {
- this.testWithNewAPI = null; // run all tests also with onlyUseNewAPI
- }
-
+ public BaseTokenStreamTestCase()
+ { }
+
public BaseTokenStreamTestCase(System.String name):base(name)
- {
- this.testWithNewAPI = null; // run all tests also with onlyUseNewAPI
- }
-
- public BaseTokenStreamTestCase(System.Collections.Hashtable testWithNewAPI):base()
- {
- this.testWithNewAPI = testWithNewAPI;
- }
-
- public BaseTokenStreamTestCase(System.String name, System.Collections.Hashtable testWithNewAPI):base(name)
- {
- this.testWithNewAPI = testWithNewAPI;
- }
-
- // @Override
- [SetUp]
- public override void SetUp()
- {
- base.SetUp();
- TokenStream.SetOnlyUseNewAPI(onlyUseNewAPI);
- }
-
- // @Override
- public override void RunBare()
- {
- // Do the test with onlyUseNewAPI=false (default)
- try
- {
- onlyUseNewAPI = false;
- // base.RunBare(); // {{Aroush-2.9}}
- System.Diagnostics.Debug.Fail("Port issue:", "base.RunBare()"); // {{Aroush-2.9}}
- }
- catch (System.Exception e)
- {
- System.Console.Out.WriteLine("Test failure of '" + GetType() + "' occurred with onlyUseNewAPI=false");
- throw e;
- }
-
- if (testWithNewAPI == null || testWithNewAPI.Contains(GetType()))
- {
- // Do the test again with onlyUseNewAPI=true
- try
- {
- onlyUseNewAPI = true;
- base.RunBare();
- }
- catch (System.Exception e)
- {
- System.Console.Out.WriteLine("Test failure of '" + GetType() + "' occurred with onlyUseNewAPI=true");
- throw e;
- }
- }
- }
+ { }
// some helpers to test Analyzers and TokenStreams:
-
public interface CheckClearAttributesAttribute : Lucene.Net.Util.Attribute
{
bool GetAndResetClearCalled();
@@ -119,13 +56,11 @@ namespace Lucene.Net.Analysis
}
}
- //@Override
public override void Clear()
{
clearCalled = true;
}
- //@Override
public override bool Equals(Object other)
{
return (
@@ -134,15 +69,12 @@ namespace Lucene.Net.Analysis
);
}
-
- //@Override
public override int GetHashCode()
{
//Java: return 76137213 ^ Boolean.valueOf(clearCalled).hashCode();
return 76137213 ^ clearCalled.GetHashCode();
}
- //@Override
public override void CopyTo(Lucene.Net.Util.AttributeImpl target)
{
((CheckClearAttributesAttributeImpl)target).Clear();
@@ -152,30 +84,30 @@ namespace Lucene.Net.Analysis
public static void AssertTokenStreamContents(TokenStream ts, System.String[] output, int[] startOffsets, int[] endOffsets, System.String[] types, int[] posIncrements, int? finalOffset)
{
Assert.IsNotNull(output);
- CheckClearAttributesAttribute checkClearAtt = (CheckClearAttributesAttribute)ts.AddAttribute(typeof(CheckClearAttributesAttribute));
+ CheckClearAttributesAttribute checkClearAtt = ts.AddAttribute<CheckClearAttributesAttribute>();
- Assert.IsTrue(ts.HasAttribute(typeof(TermAttribute)), "has no TermAttribute");
- TermAttribute termAtt = (TermAttribute)ts.GetAttribute(typeof(TermAttribute));
+ Assert.IsTrue(ts.HasAttribute<TermAttribute>(), "has no TermAttribute");
+ TermAttribute termAtt = ts.GetAttribute<TermAttribute>();
OffsetAttribute offsetAtt = null;
if (startOffsets != null || endOffsets != null || finalOffset != null)
{
- Assert.IsTrue(ts.HasAttribute(typeof(OffsetAttribute)), "has no OffsetAttribute");
- offsetAtt = (OffsetAttribute)ts.GetAttribute(typeof(OffsetAttribute));
+ Assert.IsTrue(ts.HasAttribute<OffsetAttribute>(), "has no OffsetAttribute");
+ offsetAtt = ts.GetAttribute<OffsetAttribute>();
}
TypeAttribute typeAtt = null;
if (types != null)
{
- Assert.IsTrue(ts.HasAttribute(typeof(TypeAttribute)), "has no TypeAttribute");
- typeAtt = (TypeAttribute)ts.GetAttribute(typeof(TypeAttribute));
+ Assert.IsTrue(ts.HasAttribute<TypeAttribute>(), "has no TypeAttribute");
+ typeAtt = ts.GetAttribute<TypeAttribute>();
}
PositionIncrementAttribute posIncrAtt = null;
if (posIncrements != null)
{
- Assert.IsTrue(ts.HasAttribute(typeof(PositionIncrementAttribute)), "has no PositionIncrementAttribute");
- posIncrAtt = (PositionIncrementAttribute)ts.GetAttribute(typeof(PositionIncrementAttribute));
+ Assert.IsTrue(ts.HasAttribute<PositionIncrementAttribute>(), "has no PositionIncrementAttribute");
+ posIncrAtt = ts.GetAttribute<PositionIncrementAttribute>();
}
ts.Reset();
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs Tue Feb 28 22:43:08 2012
@@ -25,7 +25,7 @@ namespace Lucene.Net.Analysis
{
[TestFixture]
- public class TestASCIIFoldingFilter:BaseTokenStreamTestCase
+ public class TestASCIIFoldingFilter : BaseTokenStreamTestCase
{
// testLain1Accents() is a copy of TestLatin1AccentFilter.testU().
@@ -38,8 +38,8 @@ namespace Lucene.Net.Analysis
" ð ñ ò ó ô õ ö ø Šà þ ù ú û ü ý ÿ ï¬ ï¬")
);
ASCIIFoldingFilter filter = new ASCIIFoldingFilter(stream);
-
- TermAttribute termAtt = (TermAttribute) filter.GetAttribute(typeof(TermAttribute));
+
+ TermAttribute termAtt = filter.GetAttribute<TermAttribute>();
AssertTermEquals("Des", filter, termAtt);
AssertTermEquals("mot", filter, termAtt);
@@ -1902,7 +1902,7 @@ namespace Lucene.Net.Analysis
TokenStream stream = new WhitespaceTokenizer(new System.IO.StringReader(inputText.ToString()));
ASCIIFoldingFilter filter = new ASCIIFoldingFilter(stream);
- TermAttribute termAtt = (TermAttribute) filter.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = filter.GetAttribute<TermAttribute>();
System.Collections.IEnumerator expectedIter = expectedOutputTokens.GetEnumerator();
while (expectedIter.MoveNext())
{
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs Tue Feb 28 22:43:08 2012
@@ -24,17 +24,17 @@ using StandardTokenizer = Lucene.Net.Ana
using PayloadAttribute = Lucene.Net.Analysis.Tokenattributes.PayloadAttribute;
using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;
using Payload = Lucene.Net.Index.Payload;
+using Version = Lucene.Net.Util.Version;
namespace Lucene.Net.Analysis
{
[TestFixture]
- public class TestAnalyzers:BaseTokenStreamTestCase
+ public class TestAnalyzers : BaseTokenStreamTestCase
{
-
- /*public TestAnalyzers(System.String name):base(name)
- {
- }*/
+ //public TestAnalyzers(System.String name) : base(name)
+ //{
+ //}
[Test]
public virtual void TestSimple()
@@ -67,14 +67,14 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestStop()
{
- Analyzer a = new StopAnalyzer();
+ Analyzer a = new StopAnalyzer(Version.LUCENE_CURRENT);
AssertAnalyzesTo(a, "foo bar FOO BAR", new System.String[]{"foo", "bar", "foo", "bar"});
AssertAnalyzesTo(a, "foo a bar such FOO THESE BAR", new System.String[]{"foo", "bar", "foo", "bar"});
}
internal virtual void VerifyPayload(TokenStream ts)
{
- PayloadAttribute payloadAtt = (PayloadAttribute) ts.GetAttribute(typeof(PayloadAttribute));
+ PayloadAttribute payloadAtt = ts.GetAttribute<PayloadAttribute>();
for (byte b = 1; ; b++)
{
bool hasNext = ts.IncrementToken();
@@ -118,6 +118,10 @@ namespace Lucene.Net.Analysis
private class MyStandardAnalyzer:StandardAnalyzer
{
+ public MyStandardAnalyzer() : base(Version.LUCENE_CURRENT)
+ {
+
+ }
public override TokenStream TokenStream(System.String field, System.IO.TextReader reader)
{
return new WhitespaceAnalyzer().TokenStream(field, reader);
@@ -135,13 +139,14 @@ namespace Lucene.Net.Analysis
Assert.IsFalse(ts.IncrementToken());
}
+
[Test]
public void Test_LUCENE_3042_LUCENENET_433()
{
- String testString = "t";
+ var testString = "t";
- Analyzer analyzer = new Lucene.Net.Analysis.Standard.StandardAnalyzer();
- TokenStream stream = analyzer.ReusableTokenStream("dummy", new System.IO.StringReader(testString));
+ Analyzer analyzer = new Lucene.Net.Analysis.Standard.StandardAnalyzer(Version.LUCENE_30);
+ var stream = analyzer.ReusableTokenStream("dummy", new System.IO.StringReader(testString));
stream.Reset();
while (stream.IncrementToken())
{
@@ -165,7 +170,7 @@ namespace Lucene.Net.Analysis
public PayloadSetter(TokenStream input):base(input)
{
InitBlock();
- payloadAtt = (PayloadAttribute) AddAttribute(typeof(PayloadAttribute));
+ payloadAtt = AddAttribute<PayloadAttribute>();
}
internal byte[] data = new byte[1];
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs Tue Feb 28 22:43:08 2012
@@ -46,8 +46,8 @@ namespace Lucene.Net.Analysis
private void InitBlock(TestCachingTokenFilter enclosingInstance)
{
this.enclosingInstance = enclosingInstance;
- termAtt = (TermAttribute) AddAttribute(typeof(TermAttribute));
- offsetAtt = (OffsetAttribute) AddAttribute(typeof(OffsetAttribute));
+ termAtt = AddAttribute<TermAttribute>();
+ offsetAtt = AddAttribute<OffsetAttribute>();
}
private TestCachingTokenFilter enclosingInstance;
public TestCachingTokenFilter Enclosing_Instance
@@ -76,6 +76,11 @@ namespace Lucene.Net.Analysis
return true;
}
}
+
+ protected override void Dispose(bool disposing)
+ {
+ // Do Nothing
+ }
}
private System.String[] tokens = new System.String[]{"term1", "term2", "term3", "term2"};
@@ -101,7 +106,7 @@ namespace Lucene.Net.Analysis
writer.AddDocument(doc);
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, true);
TermPositions termPositions = reader.TermPositions(new Term("preanalyzed", "term1"));
Assert.IsTrue(termPositions.Next());
Assert.AreEqual(1, termPositions.Freq());
@@ -127,8 +132,8 @@ namespace Lucene.Net.Analysis
private void checkTokens(TokenStream stream)
{
int count = 0;
-
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
+
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
Assert.IsNotNull(termAtt);
while (stream.IncrementToken())
{
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestCharArraySet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestCharArraySet.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestCharArraySet.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestCharArraySet.cs Tue Feb 28 22:43:08 2012
@@ -16,7 +16,7 @@
*/
using System;
-
+using System.Collections.Generic;
using NUnit.Framework;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
@@ -63,13 +63,13 @@ namespace Lucene.Net.Analysis
{
CharArraySet set_Renamed = new CharArraySet(10, true);
System.Int32 val = 1;
- set_Renamed.Add((System.Object) val);
- Assert.IsTrue(set_Renamed.Contains((System.Object) val));
- Assert.IsTrue(set_Renamed.Contains((System.Object) 1));
+ set_Renamed.Add(val);
+ Assert.IsTrue(set_Renamed.Contains(val));
+ Assert.IsTrue(set_Renamed.Contains(1));
// test unmodifiable
set_Renamed = CharArraySet.UnmodifiableSet(set_Renamed);
- Assert.IsTrue(set_Renamed.Contains((System.Object) val));
- Assert.IsTrue(set_Renamed.Contains((System.Object) 1));
+ Assert.IsTrue(set_Renamed.Contains(val));
+ Assert.IsTrue(set_Renamed.Contains(1));
}
[Test]
@@ -162,7 +162,7 @@ namespace Lucene.Net.Analysis
}
try
{
- set_Renamed.RemoveAll(new System.Collections.ArrayList(TEST_STOP_WORDS));
+ set_Renamed.RemoveAll(new List<string>(TEST_STOP_WORDS));
Assert.Fail("Modified unmodifiable set");
}
catch (System.NotSupportedException e)
@@ -173,7 +173,7 @@ namespace Lucene.Net.Analysis
try
{
- set_Renamed.RetainAll(new System.Collections.ArrayList(new System.String[] { NOT_IN_SET }));
+ set_Renamed.RetainAll(new List<string>(new [] { NOT_IN_SET }));
Assert.Fail("Modified unmodifiable set");
}
catch (System.NotSupportedException e)
@@ -184,7 +184,7 @@ namespace Lucene.Net.Analysis
try
{
- set_Renamed.AddAll(new System.Collections.ArrayList(new System.String[] { NOT_IN_SET }));
+ set_Renamed.AddAll(new List<string>(new [] { NOT_IN_SET }));
Assert.Fail("Modified unmodifiable set");
}
catch (System.NotSupportedException e)
@@ -203,7 +203,7 @@ namespace Lucene.Net.Analysis
public virtual void TestUnmodifiableSet()
{
CharArraySet set_Renamed = new CharArraySet(10, true);
- set_Renamed.AddAll(new System.Collections.ArrayList(TEST_STOP_WORDS));
+ set_Renamed.AddAll(new List<string>(TEST_STOP_WORDS));
int size = set_Renamed.Count;
set_Renamed = CharArraySet.UnmodifiableSet(set_Renamed);
Assert.AreEqual(size, set_Renamed.Count, "Set size changed due to UnmodifiableSet call");
@@ -213,7 +213,7 @@ namespace Lucene.Net.Analysis
CharArraySet.UnmodifiableSet(null);
Assert.Fail("can not make null unmodifiable");
}
- catch (System.NullReferenceException e)
+ catch (System.ArgumentNullException e)
{
// expected
}
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestCharFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestCharFilter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestCharFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestCharFilter.cs Tue Feb 28 22:43:08 2012
@@ -62,8 +62,8 @@ namespace Lucene.Net.Analysis
protected internal CharFilter1(CharStream in_Renamed):base(in_Renamed)
{
}
-
- public /*protected internal*/ override int Correct(int currentOff)
+
+ protected internal override int Correct(int currentOff)
{
return currentOff + 1;
}
@@ -75,8 +75,8 @@ namespace Lucene.Net.Analysis
protected internal CharFilter2(CharStream in_Renamed):base(in_Renamed)
{
}
-
- public /*protected internal*/ override int Correct(int currentOff)
+
+ protected internal override int Correct(int currentOff)
{
return currentOff + 2;
}
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs Tue Feb 28 22:43:08 2012
@@ -32,7 +32,7 @@ namespace Lucene.Net.Analysis
{
TokenStream stream = new WhitespaceTokenizer(new System.IO.StringReader("Des mot clés à LA CHAÃNE à à à à à Ã
à à à à à à à à à à IJ à à à à à à à à Šà à à à à à Ÿ à á â ã ä Ã¥ æ ç è é ê ë ì à î ï ij ð ñ ò ó ô õ ö ø Šà þ ù ú û ü ý ÿ ï¬ ï¬"));
ISOLatin1AccentFilter filter = new ISOLatin1AccentFilter(stream);
- TermAttribute termAtt = (TermAttribute) filter.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = filter.GetAttribute<TermAttribute>();
AssertTermEquals("Des", filter, termAtt);
AssertTermEquals("mot", filter, termAtt);
AssertTermEquals("cles", filter, termAtt);
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs Tue Feb 28 22:43:08 2012
@@ -31,6 +31,7 @@ using RAMDirectory = Lucene.Net.Store.RA
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
using Query = Lucene.Net.Search.Query;
using ScoreDoc = Lucene.Net.Search.ScoreDoc;
+using Version = Lucene.Net.Util.Version;
namespace Lucene.Net.Analysis
{
@@ -56,7 +57,7 @@ namespace Lucene.Net.Analysis
writer.Close();
- searcher = new IndexSearcher(directory);
+ searcher = new IndexSearcher(directory, true);
}
[Test]
@@ -65,7 +66,7 @@ namespace Lucene.Net.Analysis
PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new SimpleAnalyzer());
analyzer.AddAnalyzer("partnum", new KeywordAnalyzer());
- QueryParser queryParser = new QueryParser("description", analyzer);
+ QueryParser queryParser = new QueryParser(Version.LUCENE_CURRENT, "description", analyzer);
Query query = queryParser.Parse("partnum:Q36 AND SPACE");
ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
@@ -86,7 +87,7 @@ namespace Lucene.Net.Analysis
writer.AddDocument(doc);
writer.Close();
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, true);
TermDocs td = reader.TermDocs(new Term("partnum", "Q36"));
Assert.IsTrue(td.Next());
td = reader.TermDocs(new Term("partnum", "Q37"));
@@ -98,7 +99,7 @@ namespace Lucene.Net.Analysis
public virtual void TestOffsets()
{
TokenStream stream = new KeywordAnalyzer().TokenStream("field", new System.IO.StringReader("abcd"));
- OffsetAttribute offsetAtt = (OffsetAttribute) stream.AddAttribute(typeof(OffsetAttribute));
+ OffsetAttribute offsetAtt = stream.AddAttribute<OffsetAttribute>();
Assert.IsTrue(stream.IncrementToken());
Assert.AreEqual(0, offsetAtt.StartOffset());
Assert.AreEqual(4, offsetAtt.EndOffset());
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs Tue Feb 28 22:43:08 2012
@@ -33,7 +33,7 @@ namespace Lucene.Net.Analysis
{
TokenStream stream = new WhitespaceTokenizer(new System.IO.StringReader("short toolong evenmuchlongertext a ab toolong foo"));
LengthFilter filter = new LengthFilter(stream, 2, 6);
- TermAttribute termAtt = (TermAttribute) filter.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = filter.GetAttribute<TermAttribute>();
Assert.IsTrue(filter.IncrementToken());
Assert.AreEqual("short", termAtt.Term());
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs Tue Feb 28 22:43:08 2012
@@ -38,8 +38,8 @@ namespace Lucene.Net.Analysis
{
NumericTokenStream stream = new NumericTokenStream().SetLongValue(lvalue);
// use getAttribute to test if attributes really exist, if not an IAE will be throwed
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
- TypeAttribute typeAtt = (TypeAttribute) stream.GetAttribute(typeof(TypeAttribute));
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
+ TypeAttribute typeAtt = stream.GetAttribute<TypeAttribute>();
for (int shift = 0; shift < 64; shift += NumericUtils.PRECISION_STEP_DEFAULT)
{
Assert.IsTrue(stream.IncrementToken(), "New token is available");
@@ -54,8 +54,8 @@ namespace Lucene.Net.Analysis
{
NumericTokenStream stream = new NumericTokenStream().SetIntValue(ivalue);
// use getAttribute to test if attributes really exist, if not an IAE will be throwed
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
- TypeAttribute typeAtt = (TypeAttribute) stream.GetAttribute(typeof(TypeAttribute));
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
+ TypeAttribute typeAtt = stream.GetAttribute<TypeAttribute>();
for (int shift = 0; shift < 32; shift += NumericUtils.PRECISION_STEP_DEFAULT)
{
Assert.IsTrue(stream.IncrementToken(), "New token is available");
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs Tue Feb 28 22:43:08 2012
@@ -35,13 +35,13 @@ namespace Lucene.Net.Analysis
analyzer.AddAnalyzer("special", new SimpleAnalyzer());
TokenStream tokenStream = analyzer.TokenStream("field", new System.IO.StringReader(text));
- TermAttribute termAtt = (TermAttribute) tokenStream.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = tokenStream.GetAttribute<TermAttribute>();
Assert.IsTrue(tokenStream.IncrementToken());
Assert.AreEqual("Qwerty", termAtt.Term(), "WhitespaceAnalyzer does not lowercase");
tokenStream = analyzer.TokenStream("special", new System.IO.StringReader(text));
- termAtt = (TermAttribute) tokenStream.GetAttribute(typeof(TermAttribute));
+ termAtt = tokenStream.GetAttribute<TermAttribute>();
Assert.IsTrue(tokenStream.IncrementToken());
Assert.AreEqual("qwerty", termAtt.Term(), "SimpleAnalyzer lowercases");
}
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs Tue Feb 28 22:43:08 2012
@@ -33,12 +33,12 @@ namespace Lucene.Net.Analysis
public class TestStandardAnalyzer:BaseTokenStreamTestCase
{
- private Analyzer a = new StandardAnalyzer();
+ private Analyzer a = new StandardAnalyzer(Version.LUCENE_CURRENT);
[Test]
public virtual void TestMaxTermLength()
{
- StandardAnalyzer sa = new StandardAnalyzer();
+ StandardAnalyzer sa = new StandardAnalyzer(Version.LUCENE_CURRENT);
sa.SetMaxTokenLength(5);
AssertAnalyzesTo(sa, "ab cd toolong xy z", new System.String[]{"ab", "cd", "xy", "z"});
}
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMaxTermLength2()
{
- StandardAnalyzer sa = new StandardAnalyzer();
+ StandardAnalyzer sa = new StandardAnalyzer(Version.LUCENE_CURRENT);
AssertAnalyzesTo(sa, "ab cd toolong xy z", new System.String[]{"ab", "cd", "toolong", "xy", "z"});
sa.SetMaxTokenLength(5);
@@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis
{
try
{
- StandardAnalyzer analyzer = new StandardAnalyzer(true);
+ StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT);
AssertAnalyzesTo(analyzer, "www.nutch.org.", new System.String[]{"www.nutch.org"}, new System.String[]{"<HOST>"});
}
catch (System.NullReferenceException e)
@@ -139,9 +139,6 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestDomainNames()
{
- // Don't reuse a because we alter its state
- // (setReplaceInvalidAcronym)
-
// Current lucene should not show the bug
StandardAnalyzer a2 = new StandardAnalyzer(Version.LUCENE_CURRENT);
// domain names
@@ -264,15 +261,5 @@ namespace Lucene.Net.Analysis
{
AssertAnalyzesTo(a, "/money.cnn.com/magazines/fortune/fortune_archive/2007/03/19/8402357/index.htm " + "safari-0-sheikh-zayed-grand-mosque.jpg", new System.String[]{"money.cnn.com", "magazines", "fortune", "fortune", "archive/2007/03/19/8402357", "index.htm", "safari-0-sheikh", "zayed", "grand", "mosque.jpg"}, new System.String[]{"<HOST>", "<ALPHANUM>", "<ALPHANUM>", "<ALPHANUM>", "<NUM>", "<HOST>", "<NUM>", "<ALPHANUM>", "<ALPHANUM>", "<HOST>"});
}
-
- /// <deprecated> this should be removed in the 3.0.
- /// </deprecated>
- [Test]
- public virtual void TestDeprecatedAcronyms()
- {
- // test backward compatibility for applications that require the old behavior.
- // this should be removed once replaceDepAcronym is removed.
- AssertAnalyzesTo(a, "lucene.apache.org.", new System.String[]{"lucene.apache.org"}, new System.String[]{"<HOST>"});
- }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs Tue Feb 28 22:43:08 2012
@@ -16,11 +16,12 @@
*/
using System;
-
+using System.Collections.Generic;
using NUnit.Framework;
using PositionIncrementAttribute = Lucene.Net.Analysis.Tokenattributes.PositionIncrementAttribute;
using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;
+using Version = Lucene.Net.Util.Version;
namespace Lucene.Net.Analysis
{
@@ -29,8 +30,8 @@ namespace Lucene.Net.Analysis
public class TestStopAnalyzer:BaseTokenStreamTestCase
{
- private StopAnalyzer stop = new StopAnalyzer(false);
- private System.Collections.Hashtable inValidTokens = new System.Collections.Hashtable();
+ private StopAnalyzer stop = new StopAnalyzer(Version.LUCENE_CURRENT);
+ private HashSet<string> inValidTokens = new HashSet<string>();
public TestStopAnalyzer(System.String s):base(s)
{
@@ -44,12 +45,7 @@ namespace Lucene.Net.Analysis
public override void SetUp()
{
base.SetUp();
-
- System.Collections.IEnumerator it = StopAnalyzer.ENGLISH_STOP_WORDS_SET.GetEnumerator();
- while (it.MoveNext())
- {
- inValidTokens.Add(it.Current, it.Current);
- }
+ inValidTokens.UnionWith(StopAnalyzer.ENGLISH_STOP_WORDS_SET);
}
[Test]
@@ -59,7 +55,7 @@ namespace Lucene.Net.Analysis
System.IO.StringReader reader = new System.IO.StringReader("This is a test of the english stop analyzer");
TokenStream stream = stop.TokenStream("test", reader);
Assert.IsTrue(stream != null);
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
while (stream.IncrementToken())
{
@@ -70,56 +66,47 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestStopList()
{
- System.Collections.Hashtable stopWordsSet = new System.Collections.Hashtable();
- stopWordsSet.Add("good", "good");
- stopWordsSet.Add("test", "test");
- stopWordsSet.Add("analyzer", "analyzer");
- StopAnalyzer newStop = new StopAnalyzer(stopWordsSet);
+ var stopWordsSet = new System.Collections.Generic.HashSet<string>();
+ stopWordsSet.Add("good");
+ stopWordsSet.Add("test");
+ stopWordsSet.Add("analyzer");
+ StopAnalyzer newStop = new StopAnalyzer(Version.LUCENE_24, stopWordsSet);
System.IO.StringReader reader = new System.IO.StringReader("This is a good test of the english stop analyzer");
TokenStream stream = newStop.TokenStream("test", reader);
Assert.IsNotNull(stream);
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
- PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) stream.AddAttribute(typeof(PositionIncrementAttribute));
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
+ PositionIncrementAttribute posIncrAtt = stream.AddAttribute<PositionIncrementAttribute>();
while (stream.IncrementToken())
{
System.String text = termAtt.Term();
Assert.IsFalse(stopWordsSet.Contains(text));
- Assert.AreEqual(1, posIncrAtt.GetPositionIncrement()); // by default stop tokenizer does not apply increments.
+ Assert.AreEqual(1, posIncrAtt.GetPositionIncrement()); // in 2.4 stop tokenizer does not apply increments.
}
}
[Test]
public virtual void TestStopListPositions()
- {
- bool defaultEnable = StopFilter.GetEnablePositionIncrementsDefault();
- StopFilter.SetEnablePositionIncrementsDefault(true);
- try
- {
- System.Collections.Hashtable stopWordsSet = new System.Collections.Hashtable();
- stopWordsSet.Add("good", "good");
- stopWordsSet.Add("test", "test");
- stopWordsSet.Add("analyzer", "analyzer");
- StopAnalyzer newStop = new StopAnalyzer(stopWordsSet);
- System.IO.StringReader reader = new System.IO.StringReader("This is a good test of the english stop analyzer with positions");
- int[] expectedIncr = new int[]{1, 1, 1, 3, 1, 1, 1, 2, 1};
- TokenStream stream = newStop.TokenStream("test", reader);
- Assert.IsNotNull(stream);
- int i = 0;
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
- PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) stream.AddAttribute(typeof(PositionIncrementAttribute));
-
- while (stream.IncrementToken())
- {
- System.String text = termAtt.Term();
- Assert.IsFalse(stopWordsSet.Contains(text));
- Assert.AreEqual(expectedIncr[i++], posIncrAtt.GetPositionIncrement());
- }
- }
- finally
- {
- StopFilter.SetEnablePositionIncrementsDefault(defaultEnable);
- }
- }
+ {
+ var stopWordsSet = new System.Collections.Generic.HashSet<string>();
+ stopWordsSet.Add("good");
+ stopWordsSet.Add("test");
+ stopWordsSet.Add("analyzer");
+ var newStop = new StopAnalyzer(Version.LUCENE_CURRENT, stopWordsSet);
+ var reader = new System.IO.StringReader("This is a good test of the english stop analyzer with positions");
+ int[] expectedIncr = { 1, 1, 1, 3, 1, 1, 1, 2, 1};
+ TokenStream stream = newStop.TokenStream("test", reader);
+ Assert.NotNull(stream);
+ int i = 0;
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
+ PositionIncrementAttribute posIncrAtt = stream.AddAttribute<PositionIncrementAttribute>();
+
+ while (stream.IncrementToken())
+ {
+ string text = termAtt.Term();
+ Assert.IsFalse(stopWordsSet.Contains(text));
+ Assert.AreEqual(expectedIncr[i++], posIncrAtt.GetPositionIncrement());
+ }
+ }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs Tue Feb 28 22:43:08 2012
@@ -39,9 +39,9 @@ namespace Lucene.Net.Analysis
public virtual void TestExactCase()
{
System.IO.StringReader reader = new System.IO.StringReader("Now is The Time");
- System.String[] stopWords = new System.String[]{"is", "the", "Time"};
- TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords);
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
+ var stopWords = new System.Collections.Generic.HashSet<string> {"is", "the", "Time"};
+ TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords, false);
+ TermAttribute termAtt = (TermAttribute)stream.GetAttribute<TermAttribute>();
Assert.IsTrue(stream.IncrementToken());
Assert.AreEqual("Now", termAtt.Term());
Assert.IsTrue(stream.IncrementToken());
@@ -53,9 +53,9 @@ namespace Lucene.Net.Analysis
public virtual void TestIgnoreCase()
{
System.IO.StringReader reader = new System.IO.StringReader("Now is The Time");
- System.String[] stopWords = new System.String[]{"is", "the", "Time"};
+ var stopWords = new System.Collections.Generic.HashSet<string> { "is", "the", "Time" };
TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords, true);
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
Assert.IsTrue(stream.IncrementToken());
Assert.AreEqual("Now", termAtt.Term());
Assert.IsFalse(stream.IncrementToken());
@@ -66,9 +66,9 @@ namespace Lucene.Net.Analysis
{
System.IO.StringReader reader = new System.IO.StringReader("Now is The Time");
System.String[] stopWords = new System.String[]{"is", "the", "Time"};
- System.Collections.Hashtable stopSet = StopFilter.MakeStopSet(stopWords);
+ var stopSet = StopFilter.MakeStopSet(stopWords);
TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopSet);
- TermAttribute termAtt = (TermAttribute) stream.GetAttribute(typeof(TermAttribute));
+ TermAttribute termAtt = stream.GetAttribute<TermAttribute>();
Assert.IsTrue(stream.IncrementToken());
Assert.AreEqual("Now", termAtt.Term());
Assert.IsTrue(stream.IncrementToken());
@@ -93,7 +93,7 @@ namespace Lucene.Net.Analysis
System.String[] stopWords = (System.String[]) a.ToArray();
for (int i = 0; i < a.Count; i++)
Log("Stop: " + stopWords[i]);
- System.Collections.Hashtable stopSet = StopFilter.MakeStopSet(stopWords);
+ var stopSet = StopFilter.MakeStopSet(stopWords);
// with increments
System.IO.StringReader reader = new System.IO.StringReader(sb.ToString());
StopFilter stpf = new StopFilter(false, new WhitespaceTokenizer(reader), stopSet);
@@ -122,8 +122,8 @@ namespace Lucene.Net.Analysis
System.String[] stopWords1 = (System.String[]) a1.ToArray();
for (int i = 0; i < a1.Count; i++)
Log("Stop1: " + stopWords1[i]);
- System.Collections.Hashtable stopSet0 = StopFilter.MakeStopSet(stopWords0);
- System.Collections.Hashtable stopSet1 = StopFilter.MakeStopSet(stopWords1);
+ var stopSet0 = StopFilter.MakeStopSet(stopWords0);
+ var stopSet1 = StopFilter.MakeStopSet(stopWords1);
reader = new System.IO.StringReader(sb.ToString());
StopFilter stpf0 = new StopFilter(false, new WhitespaceTokenizer(reader), stopSet0); // first part of the set
stpf0.SetEnablePositionIncrements(true);
@@ -135,8 +135,8 @@ namespace Lucene.Net.Analysis
{
Log("---> test with enable-increments-" + (enableIcrements?"enabled":"disabled"));
stpf.SetEnablePositionIncrements(enableIcrements);
- TermAttribute termAtt = (TermAttribute) stpf.GetAttribute(typeof(TermAttribute));
- PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) stpf.GetAttribute(typeof(PositionIncrementAttribute));
+ TermAttribute termAtt = stpf.GetAttribute<TermAttribute>();
+ PositionIncrementAttribute posIncrAtt = stpf.GetAttribute<PositionIncrementAttribute>();
for (int i = 0; i < 20; i += 3)
{
Assert.IsTrue(stpf.IncrementToken());
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs Tue Feb 28 22:43:08 2012
@@ -16,9 +16,12 @@
*/
using System;
-
+using System.IO;
+using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Util;
using NUnit.Framework;
-
+using Attribute = Lucene.Net.Util.Attribute;
+using FlagsAttribute = Lucene.Net.Analysis.Tokenattributes.FlagsAttribute;
using Payload = Lucene.Net.Index.Payload;
using TestSimpleAttributeImpls = Lucene.Net.Analysis.Tokenattributes.TestSimpleAttributeImpls;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
@@ -164,7 +167,7 @@ namespace Lucene.Net.Analysis
t.SetTermBuffer(b, 0, 5);
Assert.AreEqual("(aloha,0,5)", t.ToString());
- t.SetTermText("hi there");
+ t.SetTermBuffer("hi there");
Assert.AreEqual("(hi there,0,5)", t.ToString());
}
@@ -189,20 +192,17 @@ namespace Lucene.Net.Analysis
public virtual void TestMixedStringArray()
{
Token t = new Token("hello", 0, 5);
- Assert.AreEqual(t.TermText(), "hello");
Assert.AreEqual(t.TermLength(), 5);
Assert.AreEqual(t.Term(), "hello");
- t.SetTermText("hello2");
+ t.SetTermBuffer("hello2");
Assert.AreEqual(t.TermLength(), 6);
Assert.AreEqual(t.Term(), "hello2");
t.SetTermBuffer("hello3".ToCharArray(), 0, 6);
- Assert.AreEqual(t.TermText(), "hello3");
+ Assert.AreEqual(t.Term(), "hello3");
- // Make sure if we get the buffer and change a character
- // that termText() reflects the change
char[] buffer = t.TermBuffer();
buffer[1] = 'o';
- Assert.AreEqual(t.TermText(), "hollo3");
+ Assert.AreEqual(t.Term(), "hollo3");
}
[Test]
@@ -245,5 +245,42 @@ namespace Lucene.Net.Analysis
Assert.AreEqual(pl, copy.GetPayload());
Assert.AreNotSame(pl, copy.GetPayload());
}
+
+ public interface SenselessAttribute : Attribute {}
+
+ public class SenselessAttributeImpl : AttributeImpl, SenselessAttribute
+ {
+ public override void CopyTo(AttributeImpl target)
+ { }
+
+ public override void Clear()
+ { }
+
+ public override bool Equals(object other)
+ {
+ return other is SenselessAttributeImpl;
+ }
+
+ public override int GetHashCode()
+ {
+ return 0;
+ }
+ }
+
+ [Test]
+ public void TestTokenAttributeFactory()
+ {
+ TokenStream ts = new WhitespaceTokenizer(Token.TOKEN_ATTRIBUTE_FACTORY, new StringReader("foo, bar"));
+
+ Assert.IsTrue(ts.AddAttribute<SenselessAttribute>() is SenselessAttributeImpl,
+ "TypeAttribute is not implemented by SenselessAttributeImpl");
+
+ Assert.IsTrue(ts.AddAttribute<TermAttribute>() is Token, "TermAttribute is not implemented by Token");
+ Assert.IsTrue(ts.AddAttribute<OffsetAttribute>() is Token, "OffsetAttribute is not implemented by Token");
+ Assert.IsTrue(ts.AddAttribute<FlagsAttribute>() is Token, "FlagsAttribute is not implemented by Token");
+ Assert.IsTrue(ts.AddAttribute<PayloadAttribute>() is Token, "PayloadAttribute is not implemented by Token");
+ Assert.IsTrue(ts.AddAttribute<PositionIncrementAttribute>() is Token, "PositionIncrementAttribute is not implemented by Token");
+ Assert.IsTrue(ts.AddAttribute<TypeAttribute>() is Token, "TypeAttribute is not implemented by Token");
+ }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/core/App.config
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/App.config?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/App.config (original)
+++ incubator/lucene.net/trunk/test/core/App.config Tue Feb 28 22:43:08 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -19,14 +19,26 @@
under the License.
-->
-
<configuration>
<appSettings>
- <add key="tempDir" value="C:\Windows\Temp\Lucene.Net-Tests"/>
+ <add key="tempDir" value="C:\Windows\Temp\Lucene.Net-Tests" />
+ <add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<!-- When I add this setting and run tests, I get 0 success, 0 failures, 0 tests not run
<appSettings>
<add key="Lucene.Net.CompressionLib.class" value="Lucene.Net.Index.Compression.SharpZipLibAdapter"/>
</appSettings>
-->
+ <system.web>
+ <membership defaultProvider="ClientAuthenticationMembershipProvider">
+ <providers>
+ <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+ </providers>
+ </membership>
+ <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+ <providers>
+ <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+ </providers>
+ </roleManager>
+ </system.web>
</configuration>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/core/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/AssemblyInfo.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/test/core/AssemblyInfo.cs Tue Feb 28 22:43:08 2012
@@ -37,7 +37,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.9.4")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
//
// Version information for an assembly consists of the following four values:
@@ -50,7 +50,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.4.001")]
+[assembly: AssemblyVersion("3.0.3")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs (original)
+++ incubator/lucene.net/trunk/test/core/Document/TestBinaryDocument.cs Tue Feb 28 22:43:08 2012
@@ -28,12 +28,7 @@ using LuceneTestCase = Lucene.Net.Util.L
namespace Lucene.Net.Documents
{
- /// <summary> Tests {@link Document} class.
- ///
- ///
- /// </summary>
- /// <version> $Id: TestBinaryDocument.java 756760 2009-03-20 21:10:12Z mikemccand $
- /// </version>
+ /// <summary>Tests {@link Document} class.</summary>
[TestFixture]
public class TestBinaryDocument:LuceneTestCase
{
@@ -45,14 +40,12 @@ namespace Lucene.Net.Documents
public virtual void TestBinaryFieldInIndex()
{
Fieldable binaryFldStored = new Field("binaryStored", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValStored), Field.Store.YES);
- Fieldable binaryFldCompressed = new Field("binaryCompressed", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValCompressed), Field.Store.COMPRESS);
Fieldable stringFldStored = new Field("stringStored", binaryValStored, Field.Store.YES, Field.Index.NO, Field.TermVector.NO);
- Fieldable stringFldCompressed = new Field("stringCompressed", binaryValCompressed, Field.Store.COMPRESS, Field.Index.NO, Field.TermVector.NO);
try
{
// binary fields with store off are not allowed
- new Field("fail", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValCompressed), Field.Store.NO);
+ new Field("fail", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValStored), Field.Store.NO);
Assert.Fail();
}
catch (System.ArgumentException iae)
@@ -63,22 +56,20 @@ namespace Lucene.Net.Documents
Document doc = new Document();
doc.Add(binaryFldStored);
- doc.Add(binaryFldCompressed);
doc.Add(stringFldStored);
- doc.Add(stringFldCompressed);
/** test for field count */
- Assert.AreEqual(4, doc.fields_ForNUnit.Count);
+ Assert.AreEqual(2, doc.fields_ForNUnit.Count);
/** add the doc to a ram index */
MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
writer.AddDocument(doc);
writer.Close();
/** open a reader and fetch the document */
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
Document docFromReader = reader.Document(0);
Assert.IsTrue(docFromReader != null);
@@ -86,18 +77,10 @@ namespace Lucene.Net.Documents
System.String binaryFldStoredTest = new System.String(System.Text.UTF8Encoding.UTF8.GetChars(docFromReader.GetBinaryValue("binaryStored")));
Assert.IsTrue(binaryFldStoredTest.Equals(binaryValStored));
- /** fetch the binary compressed field and compare it's content with the original one */
- System.String binaryFldCompressedTest = new System.String(System.Text.UTF8Encoding.UTF8.GetChars(docFromReader.GetBinaryValue("binaryCompressed")));
- Assert.IsTrue(binaryFldCompressedTest.Equals(binaryValCompressed));
-
/** fetch the string field and compare it's content with the original one */
System.String stringFldStoredTest = docFromReader.Get("stringStored");
Assert.IsTrue(stringFldStoredTest.Equals(binaryValStored));
- /** fetch the compressed string field and compare it's content with the original one */
- System.String stringFldCompressedTest = docFromReader.Get("stringCompressed");
- Assert.IsTrue(stringFldCompressedTest.Equals(binaryValCompressed));
-
/** delete the document from index */
reader.DeleteDocument(0);
Assert.AreEqual(0, reader.NumDocs());
@@ -119,12 +102,12 @@ namespace Lucene.Net.Documents
/** add the doc to a ram index */
MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
writer.AddDocument(doc);
writer.Close();
/** open a reader and fetch the document */
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, false);
Document docFromReader = reader.Document(0);
Assert.IsTrue(docFromReader != null);
Modified: incubator/lucene.net/trunk/test/core/Document/TestDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Document/TestDocument.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Document/TestDocument.cs (original)
+++ incubator/lucene.net/trunk/test/core/Document/TestDocument.cs Tue Feb 28 22:43:08 2012
@@ -33,12 +33,7 @@ using LuceneTestCase = Lucene.Net.Util.L
namespace Lucene.Net.Documents
{
- /// <summary> Tests {@link Document} class.
- ///
- ///
- /// </summary>
- /// <version> $Id: TestDocument.java 754789 2009-03-15 23:24:39Z mikemccand $
- /// </version>
+ /// <summary>Tests {@link Document} class.</summary>
[TestFixture]
public class TestDocument:LuceneTestCase
{
@@ -170,11 +165,11 @@ namespace Lucene.Net.Documents
public virtual void TestGetValuesForIndexedDocument()
{
RAMDirectory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
writer.AddDocument(MakeDocumentWithFields());
writer.Close();
- Searcher searcher = new IndexSearcher(dir);
+ Searcher searcher = new IndexSearcher(dir, true);
// search for something that does exists
Query query = new TermQuery(new Term("keyword", "test1"));
@@ -243,7 +238,7 @@ namespace Lucene.Net.Documents
doc.Add(new Field("keyword", "test", Field.Store.YES, Field.Index.NOT_ANALYZED));
RAMDirectory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED);
writer.AddDocument(doc);
field.SetValue("id2");
writer.AddDocument(doc);
@@ -251,7 +246,7 @@ namespace Lucene.Net.Documents
writer.AddDocument(doc);
writer.Close();
- Searcher searcher = new IndexSearcher(dir);
+ Searcher searcher = new IndexSearcher(dir, true);
Query query = new TermQuery(new Term("keyword", "test"));
Modified: incubator/lucene.net/trunk/test/core/Index/DocHelper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/DocHelper.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/DocHelper.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/DocHelper.cs Tue Feb 28 22:43:08 2012
@@ -40,12 +40,6 @@ namespace Lucene.Net.Index
public const System.String TEXT_FIELD_2_KEY = "textField2";
public static Field textField2;
- public const System.String FIELD_2_COMPRESSED_TEXT = "field field field two text";
- //Fields will be lexicographically sorted. So, the order is: field, text, two
- public static readonly int[] COMPRESSED_FIELD_2_FREQS = new int[]{3, 1, 1};
- public const System.String COMPRESSED_TEXT_FIELD_2_KEY = "compressedTextField2";
- public static Field compressedTextField2;
-
public const System.String FIELD_3_TEXT = "aaaNoNorms aaaNoNorms bbbNoNorms";
public const System.String TEXT_FIELD_3_KEY = "textField3";
@@ -170,7 +164,7 @@ namespace Lucene.Net.Index
writer.SetSimilarity(similarity);
//writer.setUseCompoundFile(false);
writer.AddDocument(doc);
- writer.Flush();
+ writer.Commit();
SegmentInfo info = writer.NewestSegment();
writer.Close();
return info;
@@ -184,7 +178,6 @@ namespace Lucene.Net.Index
{
textField1 = new Field(TEXT_FIELD_1_KEY, FIELD_1_TEXT, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO);
textField2 = new Field(TEXT_FIELD_2_KEY, FIELD_2_TEXT, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
- compressedTextField2 = new Field(COMPRESSED_TEXT_FIELD_2_KEY, FIELD_2_COMPRESSED_TEXT, Field.Store.COMPRESS, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
textField3 = new Field(TEXT_FIELD_3_KEY, FIELD_3_TEXT, Field.Store.YES, Field.Index.ANALYZED);
{
textField3.SetOmitNorms(true);
@@ -201,7 +194,7 @@ namespace Lucene.Net.Index
lazyField = new Field(LAZY_FIELD_KEY, LAZY_FIELD_TEXT, Field.Store.YES, Field.Index.ANALYZED);
textUtfField1 = new Field(TEXT_FIELD_UTF1_KEY, FIELD_UTF1_TEXT, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO);
textUtfField2 = new Field(TEXT_FIELD_UTF2_KEY, FIELD_UTF2_TEXT, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
- fields = new Field[] { textField1, textField2, textField3, compressedTextField2, keyField, noNormsField, noTFField, unIndField, unStoredField1, unStoredField2, textUtfField1, textUtfField2, lazyField, lazyFieldBinary, largeLazyField };
+ fields = new Field[] { textField1, textField2, textField3, keyField, noNormsField, noTFField, unIndField, unStoredField1, unStoredField2, textUtfField1, textUtfField2, lazyField, lazyFieldBinary, largeLazyField };
{
//Initialize the large Lazy Field
System.Text.StringBuilder buffer = new System.Text.StringBuilder();
@@ -241,7 +234,7 @@ namespace Lucene.Net.Index
Add(unstored, f);
if (f.GetOmitNorms())
Add(noNorms, f);
- if (f.GetOmitTf())
+ if (f.GetOmitTermFreqAndPositions())
Add(noTf, f);
if (f.IsLazy())
Add(lazy, f);
@@ -251,7 +244,6 @@ namespace Lucene.Net.Index
nameValues = new System.Collections.Hashtable();
nameValues[TEXT_FIELD_1_KEY] = FIELD_1_TEXT;
nameValues[TEXT_FIELD_2_KEY] = FIELD_2_TEXT;
- nameValues[COMPRESSED_TEXT_FIELD_2_KEY] = FIELD_2_COMPRESSED_TEXT;
nameValues[TEXT_FIELD_3_KEY] = FIELD_3_TEXT;
nameValues[KEYWORD_FIELD_KEY] = KEYWORD_TEXT;
nameValues[NO_NORMS_KEY] = NO_NORMS_TEXT;
Modified: incubator/lucene.net/trunk/test/core/Index/MockIndexInput.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/MockIndexInput.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/MockIndexInput.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/MockIndexInput.cs Tue Feb 28 22:43:08 2012
@@ -54,11 +54,11 @@ namespace Lucene.Net.Index
}
pointer += len;
}
-
- public override void Close()
- {
- // ignore
- }
+
+ protected override void Dispose(bool disposing)
+ {
+ //ignore
+ }
public override void SeekInternal(long pos)
{
Modified: incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs Tue Feb 28 22:43:08 2012
@@ -48,27 +48,27 @@ namespace Lucene.Net.Index
writer = NewWriter(dir, true);
// add 100 documents
AddDocs(writer, 100);
- Assert.AreEqual(100, writer.DocCount());
+ Assert.AreEqual(100, writer.MaxDoc());
writer.Close();
writer = NewWriter(aux, true);
writer.SetUseCompoundFile(false); // use one without a compound file
// add 40 documents in separate files
AddDocs(writer, 40);
- Assert.AreEqual(40, writer.DocCount());
+ Assert.AreEqual(40, writer.MaxDoc());
writer.Close();
writer = NewWriter(aux2, true);
// add 40 documents in compound files
AddDocs2(writer, 50);
- Assert.AreEqual(50, writer.DocCount());
+ Assert.AreEqual(50, writer.MaxDoc());
writer.Close();
// test doc count before segments are merged
writer = NewWriter(dir, false);
- Assert.AreEqual(100, writer.DocCount());
+ Assert.AreEqual(100, writer.MaxDoc());
writer.AddIndexesNoOptimize(new Directory[]{aux, aux2});
- Assert.AreEqual(190, writer.DocCount());
+ Assert.AreEqual(190, writer.MaxDoc());
writer.Close();
// make sure the old index is correct
@@ -82,14 +82,14 @@ namespace Lucene.Net.Index
writer = NewWriter(aux3, true);
// add 40 documents
AddDocs(writer, 40);
- Assert.AreEqual(40, writer.DocCount());
+ Assert.AreEqual(40, writer.MaxDoc());
writer.Close();
// test doc count before segments are merged/index is optimized
writer = NewWriter(dir, false);
- Assert.AreEqual(190, writer.DocCount());
+ Assert.AreEqual(190, writer.MaxDoc());
writer.AddIndexesNoOptimize(new Directory[]{aux3});
- Assert.AreEqual(230, writer.DocCount());
+ Assert.AreEqual(230, writer.MaxDoc());
writer.Close();
// make sure the new index is correct
@@ -118,9 +118,9 @@ namespace Lucene.Net.Index
writer.Close();
writer = NewWriter(dir, false);
- Assert.AreEqual(230, writer.DocCount());
+ Assert.AreEqual(230, writer.MaxDoc());
writer.AddIndexesNoOptimize(new Directory[]{aux4});
- Assert.AreEqual(231, writer.DocCount());
+ Assert.AreEqual(231, writer.MaxDoc());
writer.Close();
VerifyNumDocs(dir, 231);
@@ -156,6 +156,7 @@ namespace Lucene.Net.Index
writer.DeleteDocuments(q);
writer.Optimize();
+ writer.Commit();
VerifyNumDocs(dir, 1039);
VerifyTermDocs(dir, new Term("content", "aaa"), 1030);
@@ -196,6 +197,7 @@ namespace Lucene.Net.Index
writer.DeleteDocuments(q);
writer.Optimize();
+ writer.Commit();
VerifyNumDocs(dir, 1039);
VerifyTermDocs(dir, new Term("content", "aaa"), 1030);
@@ -236,6 +238,7 @@ namespace Lucene.Net.Index
writer.AddIndexesNoOptimize(new Directory[]{aux});
writer.Optimize();
+ writer.Commit();
VerifyNumDocs(dir, 1039);
VerifyTermDocs(dir, new Term("content", "aaa"), 1030);
@@ -260,7 +263,7 @@ namespace Lucene.Net.Index
writer = NewWriter(dir, true);
// add 100 documents
AddDocs(writer, 100);
- Assert.AreEqual(100, writer.DocCount());
+ Assert.AreEqual(100, writer.MaxDoc());
writer.Close();
writer = NewWriter(aux, true);
@@ -284,7 +287,7 @@ namespace Lucene.Net.Index
}
catch (System.ArgumentException e)
{
- Assert.AreEqual(100, writer.DocCount());
+ Assert.AreEqual(100, writer.MaxDoc());
}
writer.Close();
@@ -311,7 +314,7 @@ namespace Lucene.Net.Index
AddDocs(writer, 10);
writer.AddIndexesNoOptimize(new Directory[]{aux});
- Assert.AreEqual(1040, writer.DocCount());
+ Assert.AreEqual(1040, writer.MaxDoc());
Assert.AreEqual(2, writer.GetSegmentCount());
Assert.AreEqual(1000, writer.GetDocCount(0));
writer.Close();
@@ -337,7 +340,7 @@ namespace Lucene.Net.Index
AddDocs(writer, 2);
writer.AddIndexesNoOptimize(new Directory[]{aux});
- Assert.AreEqual(1032, writer.DocCount());
+ Assert.AreEqual(1032, writer.MaxDoc());
Assert.AreEqual(2, writer.GetSegmentCount());
Assert.AreEqual(1000, writer.GetDocCount(0));
writer.Close();
@@ -362,7 +365,7 @@ namespace Lucene.Net.Index
writer.SetMergeFactor(4);
writer.AddIndexesNoOptimize(new Directory[]{aux, new RAMDirectory(aux)});
- Assert.AreEqual(1060, writer.DocCount());
+ Assert.AreEqual(1060, writer.MaxDoc());
Assert.AreEqual(1000, writer.GetDocCount(0));
writer.Close();
@@ -381,7 +384,7 @@ namespace Lucene.Net.Index
SetUpDirs(dir, aux);
- IndexReader reader = IndexReader.Open(aux);
+ IndexReader reader = IndexReader.Open(aux, false);
for (int i = 0; i < 20; i++)
{
reader.DeleteDocument(i);
@@ -394,7 +397,7 @@ namespace Lucene.Net.Index
writer.SetMergeFactor(4);
writer.AddIndexesNoOptimize(new Directory[]{aux, new RAMDirectory(aux)});
- Assert.AreEqual(1020, writer.DocCount());
+ Assert.AreEqual(1020, writer.MaxDoc());
Assert.AreEqual(1000, writer.GetDocCount(0));
writer.Close();
@@ -418,11 +421,11 @@ namespace Lucene.Net.Index
writer.SetMaxBufferedDocs(100);
writer.SetMergeFactor(10);
writer.AddIndexesNoOptimize(new Directory[]{aux});
- Assert.AreEqual(30, writer.DocCount());
+ Assert.AreEqual(30, writer.MaxDoc());
Assert.AreEqual(3, writer.GetSegmentCount());
writer.Close();
- IndexReader reader = IndexReader.Open(aux);
+ IndexReader reader = IndexReader.Open(aux, false);
for (int i = 0; i < 27; i++)
{
reader.DeleteDocument(i);
@@ -430,7 +433,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(3, reader.NumDocs());
reader.Close();
- reader = IndexReader.Open(aux2);
+ reader = IndexReader.Open(aux2, false);
for (int i = 0; i < 8; i++)
{
reader.DeleteDocument(i);
@@ -443,7 +446,7 @@ namespace Lucene.Net.Index
writer.SetMergeFactor(4);
writer.AddIndexesNoOptimize(new Directory[]{aux, aux2});
- Assert.AreEqual(1025, writer.DocCount());
+ Assert.AreEqual(1025, writer.MaxDoc());
Assert.AreEqual(1000, writer.GetDocCount(0));
writer.Close();
@@ -453,7 +456,7 @@ namespace Lucene.Net.Index
private IndexWriter NewWriter(Directory dir, bool create)
{
- IndexWriter writer = new IndexWriter(dir, true, new WhitespaceAnalyzer(), create);
+ IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), create, IndexWriter.MaxFieldLength.UNLIMITED);
writer.SetMergePolicy(new LogDocMergePolicy(writer));
return writer;
}
@@ -480,7 +483,7 @@ namespace Lucene.Net.Index
private void VerifyNumDocs(Directory dir, int numDocs)
{
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, true);
Assert.AreEqual(numDocs, reader.MaxDoc());
Assert.AreEqual(numDocs, reader.NumDocs());
reader.Close();
@@ -488,7 +491,7 @@ namespace Lucene.Net.Index
private void VerifyTermDocs(Directory dir, Term term, int numDocs)
{
- IndexReader reader = IndexReader.Open(dir);
+ IndexReader reader = IndexReader.Open(dir, true);
TermDocs termDocs = reader.TermDocs(term);
int count = 0;
while (termDocs.Next())
@@ -505,7 +508,7 @@ namespace Lucene.Net.Index
writer.SetMaxBufferedDocs(1000);
// add 1000 documents in 1 segment
AddDocs(writer, 1000);
- Assert.AreEqual(1000, writer.DocCount());
+ Assert.AreEqual(1000, writer.MaxDoc());
Assert.AreEqual(1, writer.GetSegmentCount());
writer.Close();
@@ -523,7 +526,7 @@ namespace Lucene.Net.Index
writer.SetMaxBufferedDocs(100);
writer.SetMergeFactor(10);
}
- Assert.AreEqual(30, writer.DocCount());
+ Assert.AreEqual(30, writer.MaxDoc());
Assert.AreEqual(3, writer.GetSegmentCount());
writer.Close();
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs?rev=1294875&r1=1294874&r2=1294875&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestAtomicUpdate.cs Tue Feb 28 22:43:08 2012
@@ -16,7 +16,7 @@
*/
using System;
-
+using Lucene.Net.Support;
using NUnit.Framework;
using Lucene.Net.Analysis;
@@ -53,8 +53,9 @@ namespace Lucene.Net.Index
}
}
-
- public MockIndexWriter(TestAtomicUpdate enclosingInstance, Directory dir, bool autoCommit, Analyzer a, bool create):base(dir, autoCommit, a, create)
+
+ public MockIndexWriter(TestAtomicUpdate enclosingInstance, Directory dir, Analyzer a, bool create, IndexWriter.MaxFieldLength mfl)
+ : base(dir, a, create, mfl)
{
InitBlock(enclosingInstance);
}
@@ -68,7 +69,7 @@ namespace Lucene.Net.Index
}
}
- abstract public class TimedThread:SupportClass.ThreadClass
+ abstract public class TimedThread:ThreadClass
{
internal bool failed;
internal int count;
@@ -98,7 +99,7 @@ namespace Lucene.Net.Index
}
catch (System.Exception e)
{
- System.Console.Out.WriteLine(SupportClass.ThreadClass.Current().Name + ": exc");
+ System.Console.Out.WriteLine(ThreadClass.Current().Name + ": exc");
System.Console.Out.WriteLine(e.StackTrace);
failed = true;
}
@@ -147,7 +148,7 @@ namespace Lucene.Net.Index
public override void DoWork()
{
- IndexReader r = IndexReader.Open(directory);
+ IndexReader r = IndexReader.Open(directory, true);
Assert.AreEqual(100, r.NumDocs());
r.Close();
}
@@ -161,8 +162,8 @@ namespace Lucene.Net.Index
{
TimedThread[] threads = new TimedThread[4];
-
- IndexWriter writer = new MockIndexWriter(this, directory, true, ANALYZER, true);
+
+ IndexWriter writer = new MockIndexWriter(this, directory, ANALYZER, true, IndexWriter.MaxFieldLength.UNLIMITED);
writer.SetMaxBufferedDocs(7);
writer.SetMergeFactor(3);
@@ -172,11 +173,15 @@ namespace Lucene.Net.Index
Document d = new Document();
d.Add(new Field("id", System.Convert.ToString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
d.Add(new Field("contents", English.IntToEnglish(i), Field.Store.NO, Field.Index.ANALYZED));
+ if ((i - 1) % 7 == 0)
+ {
+ writer.Commit();
+ }
writer.AddDocument(d);
}
writer.Commit();
- IndexReader r = IndexReader.Open(directory);
+ IndexReader r = IndexReader.Open(directory, true);
Assert.AreEqual(100, r.NumDocs());
r.Close();
@@ -228,8 +233,7 @@ namespace Lucene.Net.Index
directory.Close();
// Second in an FSDirectory:
- System.String tempDir = System.IO.Path.GetTempPath();
- System.IO.FileInfo dirPath = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "lucene.test.atomic"));
+ System.IO.DirectoryInfo dirPath = _TestUtil.GetTempDir("lucene.test.atomic");
directory = FSDirectory.Open(dirPath);
RunTest(directory);
directory.Close();