lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1310635 [7/8] - in /incubator/lucene.net/trunk: build/vs2010/contrib/ build/vs2010/test/ src/contrib/FastVectorHighlighter/ src/contrib/Highlighter/ src/contrib/Memory/ src/contrib/Memory/Properties/ src/contrib/Queries/ src/contrib/Querie...
Date Fri, 06 Apr 2012 23:37:54 GMT
Added: incubator/lucene.net/trunk/test/contrib/Highlighter/Tokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Highlighter/Tokenizer.cs?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Highlighter/Tokenizer.cs (added)
+++ incubator/lucene.net/trunk/test/contrib/Highlighter/Tokenizer.cs Fri Apr  6 23:37:48 2012
@@ -0,0 +1,213 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Lucene.Net.Search.Highlight.Test
+{
+    /// <summary>
+    /// The class performs token processing in strings
+    /// </summary>
+    public class Tokenizer : IEnumerator<string>
+    {
+        /// Position over the string
+        private long currentPos = 0;
+
+        /// Include demiliters in the results.
+        private bool includeDelims = false;
+
+        /// Char representation of the String to tokenize.
+        private char[] chars = null;
+
+        //The tokenizer uses the default delimiter set: the space character, the tab character, the newline character, and the carriage-return character and the form-feed character
+        private string delimiters = " \t\n\r\f";
+
+        /// <summary>
+        /// Initializes a new class instance with a specified string to process
+        /// </summary>
+        /// <param name="source">String to tokenize</param>
+        public Tokenizer(System.String source)
+        {
+            this.chars = source.ToCharArray();
+        }
+
+        /// <summary>
+        /// Initializes a new class instance with a specified string to process
+        /// and the specified token delimiters to use
+        /// </summary>
+        /// <param name="source">String to tokenize</param>
+        /// <param name="delimiters">String containing the delimiters</param>
+        public Tokenizer(System.String source, System.String delimiters)
+            : this(source)
+        {
+            this.delimiters = delimiters;
+        }
+
+
+        /// <summary>
+        /// Initializes a new class instance with a specified string to process, the specified token 
+        /// delimiters to use, and whether the delimiters must be included in the results.
+        /// </summary>
+        /// <param name="source">String to tokenize</param>
+        /// <param name="delimiters">String containing the delimiters</param>
+        /// <param name="includeDelims">Determines if delimiters are included in the results.</param>
+        public Tokenizer(System.String source, System.String delimiters, bool includeDelims)
+            : this(source, delimiters)
+        {
+            this.includeDelims = includeDelims;
+        }
+
+
+        /// <summary>
+        /// Returns the next token from the token list
+        /// </summary>
+        /// <returns>The string value of the token</returns>
+        public System.String NextToken()
+        {
+            return NextToken(this.delimiters);
+        }
+
+        /// <summary>
+        /// Returns the next token from the source string, using the provided
+        /// token delimiters
+        /// </summary>
+        /// <param name="delimiters">String containing the delimiters to use</param>
+        /// <returns>The string value of the token</returns>
+        public System.String NextToken(System.String delimiters)
+        {
+            //According to documentation, the usage of the received delimiters should be temporary (only for this call).
+            //However, it seems it is not true, so the following line is necessary.
+            this.delimiters = delimiters;
+
+            //at the end 
+            if (this.currentPos == this.chars.Length)
+                throw new System.ArgumentOutOfRangeException();
+                //if over a delimiter and delimiters must be returned
+            else if ((System.Array.IndexOf(delimiters.ToCharArray(), chars[this.currentPos]) != -1)
+                     && this.includeDelims)
+                return "" + this.chars[this.currentPos++];
+                //need to get the token wo delimiters.
+            else
+                return NextToken(delimiters.ToCharArray());
+        }
+
+        //Returns the nextToken wo delimiters
+        private System.String NextToken(char[] delimiters)
+        {
+            string token = "";
+            long pos = this.currentPos;
+
+            //skip possible delimiters
+            while (System.Array.IndexOf(delimiters, this.chars[currentPos]) != -1)
+                //The last one is a delimiter (i.e there is no more tokens)
+                if (++this.currentPos == this.chars.Length)
+                {
+                    this.currentPos = pos;
+                    throw new System.ArgumentOutOfRangeException();
+                }
+
+            //getting the token
+            while (System.Array.IndexOf(delimiters, this.chars[this.currentPos]) == -1)
+            {
+                token += this.chars[this.currentPos];
+                //the last one is not a delimiter
+                if (++this.currentPos == this.chars.Length)
+                    break;
+            }
+            return token;
+        }
+
+
+        /// <summary>
+        /// Determines if there are more tokens to return from the source string
+        /// </summary>
+        /// <returns>True or false, depending if there are more tokens</returns>
+        public bool HasMoreTokens()
+        {
+            //keeping the current pos
+            long pos = this.currentPos;
+
+            try
+            {
+                this.NextToken();
+            }
+            catch (System.ArgumentOutOfRangeException)
+            {
+                return false;
+            }
+            finally
+            {
+                this.currentPos = pos;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Remaining tokens count
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                //keeping the current pos
+                long pos = this.currentPos;
+                int i = 0;
+
+                try
+                {
+                    while (true)
+                    {
+                        this.NextToken();
+                        i++;
+                    }
+                }
+                catch (System.ArgumentOutOfRangeException)
+                {
+                    this.currentPos = pos;
+                    return i;
+                }
+            }
+        }
+
+        /// <summary>
+        ///  Performs the same action as NextToken.
+        /// </summary>
+        public string Current
+        {
+            get { return this.NextToken(); }
+        }
+
+        /// <summary>
+        ///  Performs the same action as NextToken.
+        /// </summary>
+        object IEnumerator.Current
+        {
+            get { return Current; }
+        }
+
+        /// <summary>
+        //  Performs the same action as HasMoreTokens.
+        /// </summary>
+        /// <returns>True or false, depending if there are more tokens</returns>
+        public bool MoveNext()
+        {
+            return this.HasMoreTokens();
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        public void Reset()
+        {
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        public void Dispose()
+        {
+            
+        }
+    }
+}

Added: incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj (added)
+++ incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj Fri Apr  6 23:37:48 2012
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Memory</RootNamespace>
+    <AssemblyName>Memory</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise />
+  </Choose>
+  <ItemGroup>
+    <Compile Include="MemoryIndexTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\contrib\Memory\Contrib.Memory.csproj">
+      <Project>{112b9a7c-29cc-4539-8f5a-45669c07cd4d}</Project>
+      <Name>Contrib.Memory</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\core\Lucene.Net.csproj">
+      <Project>{5d4ad9be-1ffb-41ab-9943-25737971bf57}</Project>
+      <Name>Lucene.Net</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\core\Lucene.Net.Test.csproj">
+      <Project>{aaf68bcf-f781-45fc-98b3-2b9cee411e01}</Project>
+      <Name>Lucene.Net.Test</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="testqueries.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="testqueries2.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

Added: incubator/lucene.net/trunk/test/contrib/Memory/MemoryIndexTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Memory/MemoryIndexTest.cs?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Memory/MemoryIndexTest.cs (added)
+++ incubator/lucene.net/trunk/test/contrib/Memory/MemoryIndexTest.cs Fri Apr  6 23:37:48 2012
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Lucene.Net.Analysis;
+using Lucene.Net.Analysis.Standard;
+using Lucene.Net.Documents;
+using Lucene.Net.Index;
+using Lucene.Net.Index.Memory;
+using Lucene.Net.QueryParsers;
+using Lucene.Net.Search;
+using Lucene.Net.Store;
+using Lucene.Net.Test.Analysis;
+using Version = Lucene.Net.Util.Version;
+using NUnit.Framework;
+
+namespace Memory
+{
+    /**
+     * Verifies that Lucene MemoryIndex and RAMDirectory have the same behaviour,
+     * returning the same results for queries on some randomish indexes.
+     */
+
+    public class MemoryIndexTest : BaseTokenStreamTestCase
+    {
+        private readonly HashSet<String> _queries = new HashSet<String>();
+        private Random random;
+
+        public static int ITERATIONS = 100;
+
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+            _queries.UnionWith(ReadQueries("testqueries.txt"));
+            _queries.UnionWith(ReadQueries("testqueries2.txt"));
+            random = NewRandom();
+        }
+
+        /**
+         * read a set of queries from a resource file
+         */
+
+        private IEnumerable<string> ReadQueries(String resource)
+        {
+            var queries = new HashSet<String>();
+            using (var fs = File.Open(resource, FileMode.Open, FileAccess.Read))
+            using (var reader = new StreamReader(fs, Encoding.UTF8))
+            {
+                string line;
+                while ((line = reader.ReadLine()) != null)
+                {
+                    line = line.Trim();
+                    if (line.Length > 0 && !line.StartsWith("#") && !line.StartsWith("//"))
+                    {
+                        queries.Add(line);
+                    }
+                }
+                return queries;
+            }
+        }
+
+        /**
+         * runs random tests, up to ITERATIONS times.
+         */
+        [Test]
+        public void TestRandomQueries()
+        {
+            for (int i = 0; i < ITERATIONS; i++)
+                AssertAgainstRAMDirectory();
+        }
+
+        /**
+         * Build a randomish document for both RAMDirectory and MemoryIndex,
+         * and run all the queries against it.
+         */
+
+        public void AssertAgainstRAMDirectory()
+        {
+            var fooField = new StringBuilder();
+            var termField = new StringBuilder();
+
+            // add up to 250 terms to field "foo"
+            for (int i = 0; i < random.Next(250); i++)
+            {
+                fooField.Append(" ");
+                fooField.Append(RandomTerm());
+            }
+
+            // add up to 250 terms to field "term"
+            for (int i = 0; i < random.Next(250); i++)
+            {
+                termField.Append(" ");
+                termField.Append(RandomTerm());
+            }
+
+            var ramdir = new RAMDirectory();
+            var analyzer = RandomAnalyzer();
+            var writer = new IndexWriter(ramdir, analyzer,
+                                                 IndexWriter.MaxFieldLength.UNLIMITED);
+            var doc = new Document();
+            var field1 = new Field("foo", fooField.ToString(), Field.Store.NO, Field.Index.ANALYZED);
+            var field2 = new Field("term", termField.ToString(), Field.Store.NO, Field.Index.ANALYZED);
+            doc.Add(field1);
+            doc.Add(field2);
+            writer.AddDocument(doc);
+            writer.Close();
+
+            var memory = new MemoryIndex();
+            memory.AddField("foo", fooField.ToString(), analyzer);
+            memory.AddField("term", termField.ToString(), analyzer);
+            AssertAllQueries(memory, ramdir, analyzer);
+        }
+
+        /**
+         * Run all queries against both the RAMDirectory and MemoryIndex, ensuring they are the same.
+         */
+
+        public void AssertAllQueries(MemoryIndex memory, RAMDirectory ramdir, Analyzer analyzer)
+        {
+            var ram = new IndexSearcher(ramdir);
+            var mem = memory.CreateSearcher();
+            var qp = new QueryParser(Version.LUCENE_CURRENT, "foo", analyzer);
+
+            foreach (String query in _queries)
+            {
+                var ramDocs = ram.Search(qp.Parse(query), 1);
+                var memDocs = mem.Search(qp.Parse(query), 1);
+                Assert.AreEqual(ramDocs.TotalHits, memDocs.TotalHits);
+            }
+        }
+
+        /**
+         * Return a random analyzer (Simple, Stop, Standard) to analyze the terms.
+         */
+
+        private Analyzer RandomAnalyzer()
+        {
+            switch (random.Next(3))
+            {
+                case 0:
+                    return new SimpleAnalyzer();
+                case 1:
+                    return new StopAnalyzer(Version.LUCENE_CURRENT);
+                default:
+                    return new StandardAnalyzer(Version.LUCENE_CURRENT);
+            }
+        }
+
+        /**
+         * Some terms to be indexed, in addition to random words. 
+         * These terms are commonly used in the queries. 
+         */
+
+        private static readonly string[] TEST_TERMS = {
+                                                          "term", "Term", "tErm", "TERM",
+                                                          "telm", "stop", "drop", "roll", "phrase", "a", "c", "bar",
+                                                          "blar",
+                                                          "gack", "weltbank", "worlbank", "hello", "on", "the", "apache"
+                                                          , "Apache",
+                                                          "copyright", "Copyright"
+                                                      };
+
+
+        /**
+         * half of the time, returns a random term from TEST_TERMS.
+         * the other half of the time, returns a random unicode string.
+         */
+
+        private String RandomTerm()
+        {
+            if (random.Next(2) == 1)
+            {
+                // return a random TEST_TERM
+                return TEST_TERMS[random.Next(TEST_TERMS.Length)];
+            }
+            else
+            {
+                // return a random unicode term
+                return RandomString();
+            }
+        }
+
+        /**
+         * Return a random unicode term, like TestStressIndexing.
+         */
+
+        private String RandomString()
+        {
+            int end = random.Next(20);
+            if (buffer.Length < 1 + end)
+            {
+                char[] newBuffer = new char[(int) ((1 + end)*1.25)];
+                Array.Copy(buffer, 0, newBuffer, 0, buffer.Length);
+                buffer = newBuffer;
+            }
+            for (int i = 0; i < end - 1; i++)
+            {
+                int t = random.Next(6);
+                if (0 == t && i < end - 1)
+                {
+                    // Make a surrogate pair
+                    // High surrogate
+                    buffer[i++] = (char) NextInt(0xd800, 0xdc00);
+                    // Low surrogate
+                    buffer[i] = (char) NextInt(0xdc00, 0xe000);
+                }
+                else if (t <= 1) buffer[i] = (char) random.Next(0x80);
+                else if (2 == t) buffer[i] = (char) NextInt(0x80, 0x800);
+                else if (3 == t) buffer[i] = (char) NextInt(0x800, 0xd7ff);
+                else if (4 == t) buffer[i] = (char) NextInt(0xe000, 0xffff);
+                else if (5 == t)
+                {
+                    // Illegal unpaired surrogate
+                    if (random.Next(1) == 1) buffer[i] = (char) NextInt(0xd800, 0xdc00);
+                    else buffer[i] = (char) NextInt(0xdc00, 0xe000);
+                }
+            }
+            return new String(buffer, 0, end);
+        }
+
+        private char[] buffer = new char[20];
+        // start is inclusive and end is exclusive
+        private int NextInt(int start, int end)
+        {
+            return start + random.Next(end - start);
+        }
+    }
+}

Added: incubator/lucene.net/trunk/test/contrib/Memory/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Memory/Properties/AssemblyInfo.cs?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Memory/Properties/AssemblyInfo.cs (added)
+++ incubator/lucene.net/trunk/test/contrib/Memory/Properties/AssemblyInfo.cs Fri Apr  6 23:37:48 2012
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Memory")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Memory")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("97c0467a-0d9d-49c0-89c0-5e8d9356cccc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Added: incubator/lucene.net/trunk/test/contrib/Memory/testqueries.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Memory/testqueries.txt?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Memory/testqueries.txt (added)
+++ incubator/lucene.net/trunk/test/contrib/Memory/testqueries.txt Fri Apr  6 23:37:48 2012
@@ -0,0 +1,129 @@
+#
+# queries extracted from TestQueryParser.java
+#
+Apache
+Apach~ AND Copy*
+
+a AND b
+(a AND b)
+c OR (a AND b)
+a AND NOT b
+a AND -b
+a AND !b
+a && b
+a && ! b
+
+a OR b
+a || b
+a OR !b
+a OR ! b
+a OR -b
+
++term -term term
+foo:term AND field:anotherTerm
+term AND "phrase phrase"
+"hello there"
+
+germ term^2.0
+(term)^2.0
+(germ term)^2.0
+term^2.0
+term^2
+"germ term"^2.0
+"term germ"^2
+
+(foo OR bar) AND (baz OR boo)
+((a OR b) AND NOT c) OR d
++(apple "steve jobs") -(foo bar baz)
++title:(dog OR cat) -author:"bob dole"
+
+
+a&b
+a&&b
+.NET
+
+"term germ"~2
+"term germ"~2 flork
+"term"~2
+"~2 germ"
+"term germ"~2^2
+
+3
+term 1.0 1 2
+term term1 term2
+
+term*
+term*^2
+term~
+term~0.7
+term~^2
+term^2~
+term*germ
+term*germ^3
+
+
+term*
+Term*
+TERM*
+term*
+Term*
+TERM*
+
+// Then 'full' wildcard queries:
+te?m
+Te?m
+TE?M
+Te?m*gerM
+te?m
+Te?m
+TE?M
+Te?m*gerM
+
+term term term
+term +stop term
+term -stop term
+drop AND stop AND roll
+term phrase term
+term AND NOT phrase term
+stop
+
+
+[ a TO c]
+[ a TO c ]
+{ a TO c}
+{ a TO c }
+{ a TO c }^2.0
+[ a TO c] OR bar
+[ a TO c] AND bar
+( bar blar { a TO c}) 
+gack ( bar blar { a TO c}) 
+
+
++weltbank +worlbank
++weltbank\n+worlbank
+weltbank \n+worlbank
+weltbank \n +worlbank
++weltbank\r+worlbank
+weltbank \r+worlbank
+weltbank \r +worlbank
++weltbank\r\n+worlbank
+weltbank \r\n+worlbank
+weltbank \r\n +worlbank
+weltbank \r \n +worlbank
++weltbank\t+worlbank
+weltbank \t+worlbank
+weltbank \t +worlbank
+
+
+term term term
+term +term term
+term term +term
+term +term +term
+-term term term
+
+
+on^1.0
+"hello"^2.0
+hello^2.0
+"on"^1.0
+the^3

Added: incubator/lucene.net/trunk/test/contrib/Memory/testqueries2.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Memory/testqueries2.txt?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Memory/testqueries2.txt (added)
+++ incubator/lucene.net/trunk/test/contrib/Memory/testqueries2.txt Fri Apr  6 23:37:48 2012
@@ -0,0 +1,5 @@
+term
+term*
+term~
+Apache
+Apach~ AND Copy*

Modified: incubator/lucene.net/trunk/test/contrib/Queries/BooleanFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Queries/BooleanFilterTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Queries/BooleanFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Queries/BooleanFilterTest.cs Fri Apr  6 23:37:48 2012
@@ -92,7 +92,7 @@ namespace Lucene.Net.Search
         public void TestShould()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetTermsFilter("price", "030"), BooleanClause.Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("price", "030"), Occur.SHOULD));
             TstFilterCard("Should retrieves only 1 doc", 1, booleanFilter);
         }
 
@@ -100,8 +100,8 @@ namespace Lucene.Net.Search
         public void TestShoulds()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), BooleanClause.Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), Occur.SHOULD));
             TstFilterCard("Shoulds are Ored together", 5, booleanFilter);
         }
 
@@ -109,12 +109,12 @@ namespace Lucene.Net.Search
         public void TestShouldsAndMustNot()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), BooleanClause.Occur.MUST_NOT));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), Occur.MUST_NOT));
             TstFilterCard("Shoulds Ored but AndNot", 4, booleanFilter);
 
-            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "Maybe"), BooleanClause.Occur.MUST_NOT));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "Maybe"), Occur.MUST_NOT));
             TstFilterCard("Shoulds Ored but AndNots", 3, booleanFilter);
         }
 
@@ -122,9 +122,9 @@ namespace Lucene.Net.Search
         public void TestShouldsAndMust()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), BooleanClause.Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), Occur.MUST));
             TstFilterCard("Shoulds Ored but MUST", 3, booleanFilter);
         }
 
@@ -132,10 +132,10 @@ namespace Lucene.Net.Search
         public void TestShouldsAndMusts()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), BooleanClause.Occur.MUST));
-            booleanFilter.Add(new FilterClause(GetRangeFilter("date", "20040101", "20041231"), BooleanClause.Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "010", "020"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "020", "030"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("date", "20040101", "20041231"), Occur.MUST));
             TstFilterCard("Shoulds Ored but MUSTs ANDED", 1, booleanFilter);
         }
 
@@ -143,10 +143,10 @@ namespace Lucene.Net.Search
         public void TestShouldsAndMustsAndMustNot()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "030", "040"), BooleanClause.Occur.SHOULD));
-            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), BooleanClause.Occur.MUST));
-            booleanFilter.Add(new FilterClause(GetRangeFilter("date", "20050101", "20051231"), BooleanClause.Occur.MUST));
-            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), BooleanClause.Occur.MUST_NOT));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("price", "030", "040"), Occur.SHOULD));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetRangeFilter("date", "20050101", "20051231"), Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), Occur.MUST_NOT));
             TstFilterCard("Shoulds Ored but MUSTs ANDED and MustNot", 0, booleanFilter);
         }
 
@@ -154,7 +154,7 @@ namespace Lucene.Net.Search
         public void TestJustMust()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), BooleanClause.Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("accessRights", "admin"), Occur.MUST));
             TstFilterCard("MUST", 3, booleanFilter);
         }
 
@@ -162,7 +162,7 @@ namespace Lucene.Net.Search
         public void TestJustMustNot()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), BooleanClause.Occur.MUST_NOT));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), Occur.MUST_NOT));
             TstFilterCard("MUST_NOT", 4, booleanFilter);
         }
 
@@ -170,8 +170,8 @@ namespace Lucene.Net.Search
         public void TestMustAndMustNot()
         {
             BooleanFilter booleanFilter = new BooleanFilter();
-            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), BooleanClause.Occur.MUST));
-            booleanFilter.Add(new FilterClause(GetTermsFilter("price", "030"), BooleanClause.Occur.MUST_NOT));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("inStock", "N"), Occur.MUST));
+            booleanFilter.Add(new FilterClause(GetTermsFilter("price", "030"), Occur.MUST_NOT));
             TstFilterCard("MUST_NOT wins over MUST for same docs", 0, booleanFilter);
         }
     }

Modified: incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs Fri Apr  6 23:37:48 2012
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search.Similar
             for (int i = 0; i < clauses.Count; i++)
             {
                 BooleanClause clause = (BooleanClause)clauses[i];
-                TermQuery tq = (TermQuery)clause.GetQuery();
+                TermQuery tq = (TermQuery)clause.Query;
                 float termBoost = (float)originalValues[tq.Term.Text];
                 Assert.IsNotNull(termBoost,"Expected term " + tq.Term.Text);
 
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search.Similar
             for (int i = 0; i < clauses.Count; i++)
             {
                 BooleanClause clause = (BooleanClause)clauses[i];
-                TermQuery tq = (TermQuery)clause.GetQuery();
+                TermQuery tq = (TermQuery)clause.Query;
                 originalValues.Add(tq.Term.Text, tq.Boost);
             }
             return originalValues;

Modified: incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs Fri Apr  6 23:37:48 2012
@@ -24,6 +24,7 @@ using System.IO;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Tokenattributes;
 using Lucene.Net.Index;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Lucene.Net.Analysis;
 using FlagsAttribute = Lucene.Net.Analysis.Tokenattributes.FlagsAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs Fri Apr  6 23:37:48 2012
@@ -16,13 +16,12 @@
  */
 
 using System;
-
+using Lucene.Net.Analysis;
+using Lucene.Net.Util;
 using NUnit.Framework;
-
 using Lucene.Net.Analysis.Tokenattributes;
-using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 
-namespace Lucene.Net.Analysis
+namespace Lucene.Net.Test.Analysis
 {
 	
 	/// <summary>Base class for all Lucene unit tests that use TokenStreams.</summary>

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using OffsetAttribute = Lucene.Net.Analysis.Tokenattributes.OffsetAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using OffsetAttribute = Lucene.Net.Analysis.Tokenattributes.OffsetAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestMappingCharFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestMappingCharFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestMappingCharFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestMappingCharFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using PositionIncrementAttribute = Lucene.Net.Analysis.Tokenattributes.PositionIncrementAttribute;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using PositionIncrementAttribute = Lucene.Net.Analysis.Tokenattributes.PositionIncrementAttribute;

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 using StandardFilter = Lucene.Net.Analysis.Standard.StandardFilter;

Modified: incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs Fri Apr  6 23:37:48 2012
@@ -37,7 +37,7 @@ using Store = Lucene.Net.Documents.Field
 using TermVector = Lucene.Net.Documents.Field.TermVector;
 using RAMDirectory = Lucene.Net.Store.RAMDirectory;
 using AttributeSource = Lucene.Net.Util.AttributeSource;
-using BaseTokenStreamTestCase = Lucene.Net.Analysis.BaseTokenStreamTestCase;
+using BaseTokenStreamTestCase = Lucene.Net.Test.Analysis.BaseTokenStreamTestCase;
 using _TestUtil = Lucene.Net.Util._TestUtil;
 
 namespace Lucene.Net.Index

Modified: incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs Fri Apr  6 23:37:48 2012
@@ -139,8 +139,8 @@ namespace Lucene.Net.Index
 			}
 			
 			int NUM_DOCS = 3;
-			
-			TermDocs td = reader.TermDocs(null);
+
+            TermDocs td = reader.TermDocs(null);
 			for (int i = 0; i < NUM_DOCS; i++)
 			{
 				Assert.IsTrue(td.Next());

Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Fri Apr  6 23:37:48 2012
@@ -46,7 +46,7 @@ using MockRAMDirectory = Lucene.Net.Stor
 using RAMDirectory = Lucene.Net.Store.RAMDirectory;
 using SingleInstanceLockFactory = Lucene.Net.Store.SingleInstanceLockFactory;
 using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
-using BaseTokenStreamTestCase = Lucene.Net.Analysis.BaseTokenStreamTestCase;
+using BaseTokenStreamTestCase = Lucene.Net.Test.Analysis.BaseTokenStreamTestCase;
 using IndexSearcher = Lucene.Net.Search.IndexSearcher;
 using PhraseQuery = Lucene.Net.Search.PhraseQuery;
 using Query = Lucene.Net.Search.Query;
@@ -59,7 +59,7 @@ using System.Collections.Generic;
 namespace Lucene.Net.Index
 {
     [TestFixture]
-    public class TestIndexWriter : BaseTokenStreamTestCase
+    public class TestIndexWriter : Test.Analysis.BaseTokenStreamTestCase
     {
         //public TestIndexWriter(System.String name)
         //    : base(name)

Modified: incubator/lucene.net/trunk/test/core/Index/TestOmitTf.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestOmitTf.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestOmitTf.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestOmitTf.cs Fri Apr  6 23:37:48 2012
@@ -32,7 +32,7 @@ using Scorer = Lucene.Net.Search.Scorer;
 using Searcher = Lucene.Net.Search.Searcher;
 using Similarity = Lucene.Net.Search.Similarity;
 using TermQuery = Lucene.Net.Search.TermQuery;
-using Occur = Lucene.Net.Search.BooleanClause.Occur;
+using Occur = Lucene.Net.Search.Occur;
 using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 using _TestUtil = Lucene.Net.Util._TestUtil;
 

Modified: incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs Fri Apr  6 23:37:48 2012
@@ -32,7 +32,7 @@ using Query = Lucene.Net.Search.Query;
 using ScoreDoc = Lucene.Net.Search.ScoreDoc;
 using Searcher = Lucene.Net.Search.Searcher;
 using TermQuery = Lucene.Net.Search.TermQuery;
-using Occur = Lucene.Net.Search.BooleanClause.Occur;
+using Occur = Lucene.Net.Search.Occur;
 using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 
 namespace Lucene.Net.Index
@@ -222,7 +222,7 @@ namespace Lucene.Net.Index
             pr.Add(IndexReader.Open(dir1, false));
             pr.Add(IndexReader.Open(dir2, false));
 			int NUM_DOCS = 2;
-			TermDocs td = pr.TermDocs(null);
+            TermDocs td = pr.TermDocs(null);
 			for (int i = 0; i < NUM_DOCS; i++)
 			{
 				Assert.IsTrue(td.Next());

Modified: incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs Fri Apr  6 23:37:48 2012
@@ -239,7 +239,7 @@ namespace Lucene.Net.Index
 			System.Text.StringBuilder sb = new System.Text.StringBuilder();
 			for (int i = 0; i < terms.Length; i++)
 			{
-				sb.Append(terms[i].text);
+				sb.Append(terms[i].Text);
 				sb.Append(" ");
 			}
 			System.String content = sb.ToString();
@@ -584,7 +584,7 @@ namespace Lucene.Net.Index
 					for (int i = 0; i < freq; i++)
 					{
 						tp.NextPosition();
-						Assert.AreEqual(pool.BytesToString(tp.GetPayload(new byte[5], 0)), terms.Term().text);
+						Assert.AreEqual(pool.BytesToString(tp.GetPayload(new byte[5], 0)), terms.Term().Text);
 					}
 				}
 				tp.Close();

Modified: incubator/lucene.net/trunk/test/core/Index/TestTerm.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTerm.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTerm.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTerm.cs Fri Apr  6 23:37:48 2012
@@ -31,16 +31,21 @@ namespace Lucene.Net.Index
 		[Test]
 		public virtual void  TestEquals()
 		{
-			Term base_Renamed = new Term("same", "same");
+			Term original = new Term("same", "same");
 			Term same = new Term("same", "same");
 			Term differentField = new Term("different", "same");
 			Term differentText = new Term("same", "different");
 			System.String differentType = "AString";
-			Assert.AreEqual(base_Renamed, base_Renamed);
-			Assert.AreEqual(base_Renamed, same);
-			Assert.IsFalse(base_Renamed.Equals(differentField));
-			Assert.IsFalse(base_Renamed.Equals(differentText));
-			Assert.IsFalse(base_Renamed.Equals(differentType));
+
+			Assert.AreEqual(original, original);
+			Assert.AreEqual(original, same);
+
+		    Assert.AreNotEqual(original, null);
+            Assert.IsTrue(null == null);
+
+			Assert.IsFalse(original.Equals(differentField));
+			Assert.IsFalse(original.Equals(differentText));
+			Assert.IsFalse(original.Equals(differentType));
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -28,7 +28,7 @@ using OffsetAttribute = Lucene.Net.Analy
 using PositionIncrementAttribute = Lucene.Net.Analysis.Tokenattributes.PositionIncrementAttribute;
 using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute;
 using TypeAttribute = Lucene.Net.Analysis.Tokenattributes.TypeAttribute;
-using BaseTokenStreamTestCase = Lucene.Net.Analysis.BaseTokenStreamTestCase;
+using BaseTokenStreamTestCase = Lucene.Net.Test.Analysis.BaseTokenStreamTestCase;
 using Query = Lucene.Net.Search.Query;
 
 namespace Lucene.Net.QueryParsers
@@ -40,7 +40,7 @@ namespace Lucene.Net.QueryParsers
 	/// 
 	/// </summary>
     [TestFixture]
-	public class TestMultiAnalyzer:BaseTokenStreamTestCase
+	public class TestMultiAnalyzer:Test.Analysis.BaseTokenStreamTestCase
 	{
 		
 		private static int multiToken = 0;

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestMultiFieldQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestMultiFieldQueryParser.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestMultiFieldQueryParser.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestMultiFieldQueryParser.cs Fri Apr  6 23:37:48 2012
@@ -28,12 +28,12 @@ using Field = Lucene.Net.Documents.Field
 using IndexWriter = Lucene.Net.Index.IndexWriter;
 using Directory = Lucene.Net.Store.Directory;
 using RAMDirectory = Lucene.Net.Store.RAMDirectory;
-using BaseTokenStreamTestCase = Lucene.Net.Analysis.BaseTokenStreamTestCase;
+using BaseTokenStreamTestCase = Lucene.Net.Test.Analysis.BaseTokenStreamTestCase;
 using BooleanClause = Lucene.Net.Search.BooleanClause;
 using IndexSearcher = Lucene.Net.Search.IndexSearcher;
 using Query = Lucene.Net.Search.Query;
 using ScoreDoc = Lucene.Net.Search.ScoreDoc;
-using Occur = Lucene.Net.Search.BooleanClause.Occur;
+using Occur = Lucene.Net.Search.Occur;
 
 namespace Lucene.Net.QueryParsers
 {
@@ -210,7 +210,7 @@ namespace Lucene.Net.QueryParsers
 		public virtual void  TestStaticMethod2()
 		{
 			System.String[] fields = new System.String[]{"b", "t"};
-			BooleanClause.Occur[] flags = new BooleanClause.Occur[]{BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT};
+			Occur[] flags = new Occur[]{Occur.MUST, Occur.MUST_NOT};
 			Query q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, "one", fields, flags, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 			Assert.AreEqual("+b:one -t:one", q.ToString());
 			
@@ -219,7 +219,7 @@ namespace Lucene.Net.QueryParsers
 			
 			try
 			{
-				BooleanClause.Occur[] flags2 = new BooleanClause.Occur[]{BooleanClause.Occur.MUST};
+				Occur[] flags2 = new Occur[]{Occur.MUST};
 				q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, "blah", fields, flags2, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 				Assert.Fail();
 			}
@@ -234,7 +234,7 @@ namespace Lucene.Net.QueryParsers
 		{
 			System.String[] fields = new System.String[]{"b", "t"};
 			//int[] flags = {MultiFieldQueryParser.REQUIRED_FIELD, MultiFieldQueryParser.PROHIBITED_FIELD};
-			BooleanClause.Occur[] flags = new BooleanClause.Occur[]{BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT};
+			Occur[] flags = new Occur[]{Occur.MUST, Occur.MUST_NOT};
             MultiFieldQueryParser parser = new MultiFieldQueryParser(Util.Version.LUCENE_CURRENT, fields, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 			
 			Query q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, "one", fields, flags, new StandardAnalyzer(Util.Version.LUCENE_CURRENT)); //, fields, flags, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
@@ -245,7 +245,7 @@ namespace Lucene.Net.QueryParsers
 			
 			try
 			{
-				BooleanClause.Occur[] flags2 = new BooleanClause.Occur[]{BooleanClause.Occur.MUST};
+				Occur[] flags2 = new Occur[]{Occur.MUST};
 				q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, "blah", fields, flags2, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 				Assert.Fail();
 			}
@@ -260,13 +260,13 @@ namespace Lucene.Net.QueryParsers
 		{
 			System.String[] queries = new System.String[]{"one", "two", "three"};
 			System.String[] fields = new System.String[]{"f1", "f2", "f3"};
-			BooleanClause.Occur[] flags = new BooleanClause.Occur[]{BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT, BooleanClause.Occur.SHOULD};
+			Occur[] flags = new Occur[]{Occur.MUST, Occur.MUST_NOT, Occur.SHOULD};
             Query q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, queries, fields, flags, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 			Assert.AreEqual("+f1:one -f2:two f3:three", q.ToString());
 			
 			try
 			{
-				BooleanClause.Occur[] flags2 = new BooleanClause.Occur[]{BooleanClause.Occur.MUST};
+				Occur[] flags2 = new Occur[]{Occur.MUST};
                 q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, queries, fields, flags2, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 				Assert.Fail();
 			}
@@ -281,13 +281,13 @@ namespace Lucene.Net.QueryParsers
 		{
 			System.String[] queries = new System.String[]{"one", "two"};
 			System.String[] fields = new System.String[]{"b", "t"};
-			BooleanClause.Occur[] flags = new BooleanClause.Occur[]{BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT};
+			Occur[] flags = new Occur[]{Occur.MUST, Occur.MUST_NOT};
             Query q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, queries, fields, flags, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 			Assert.AreEqual("+b:one -t:two", q.ToString());
 			
 			try
 			{
-				BooleanClause.Occur[] flags2 = new BooleanClause.Occur[]{BooleanClause.Occur.MUST};
+				Occur[] flags2 = new Occur[]{Occur.MUST};
                 q = MultiFieldQueryParser.Parse(Util.Version.LUCENE_CURRENT, queries, fields, flags2, new StandardAnalyzer(Util.Version.LUCENE_CURRENT));
 				Assert.Fail();
 			}

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs Fri Apr  6 23:37:48 2012
@@ -1101,8 +1101,8 @@ namespace Lucene.Net.QueryParsers
 			Assert.AreEqual(new MatchAllDocsQuery(), qp.Parse("*:*"));
 			Assert.AreEqual(new MatchAllDocsQuery(), qp.Parse("(*:*)"));
 			BooleanQuery bq = (BooleanQuery) qp.Parse("+*:* -*:*");
-			Assert.IsTrue(bq.GetClauses()[0].GetQuery() is MatchAllDocsQuery);
-			Assert.IsTrue(bq.GetClauses()[1].GetQuery() is MatchAllDocsQuery);
+			Assert.IsTrue(bq.GetClauses()[0].Query is MatchAllDocsQuery);
+			Assert.IsTrue(bq.GetClauses()[1].Query is MatchAllDocsQuery);
 		}
 		
 		private void  AssertHits(int expected, System.String query, IndexSearcher is_Renamed)

Modified: incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs Fri Apr  6 23:37:48 2012
@@ -330,8 +330,8 @@ namespace Lucene.Net.Search.Payloads
 		{
 			PayloadTermQuery q1 = new PayloadTermQuery(new Term(PayloadHelper.NO_PAYLOAD_FIELD, "zero"), new MaxPayloadFunction());
 			PayloadTermQuery q2 = new PayloadTermQuery(new Term(PayloadHelper.NO_PAYLOAD_FIELD, "foo"), new MaxPayloadFunction());
-			BooleanClause c1 = new BooleanClause(q1, BooleanClause.Occur.MUST);
-			BooleanClause c2 = new BooleanClause(q2, BooleanClause.Occur.MUST_NOT);
+			BooleanClause c1 = new BooleanClause(q1, Occur.MUST);
+			BooleanClause c2 = new BooleanClause(q2, Occur.MUST_NOT);
 			BooleanQuery query = new BooleanQuery();
 			query.Add(c1);
 			query.Add(c2);

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs Fri Apr  6 23:37:48 2012
@@ -110,8 +110,8 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestBoolean()
 		{
 			BooleanQuery query = new BooleanQuery();
-			query.Add(new TermQuery(new Term("field", "seventy")), BooleanClause.Occur.MUST);
-			query.Add(new TermQuery(new Term("field", "seven")), BooleanClause.Occur.MUST);
+			query.Add(new TermQuery(new Term("field", "seventy")), Occur.MUST);
+			query.Add(new TermQuery(new Term("field", "seven")), Occur.MUST);
 			CheckHits(query, new int[]{77, 777, 177, 277, 377, 477, 577, 677, 770, 771, 772, 773, 774, 775, 776, 778, 779, 877, 977});
 		}
 		
@@ -119,8 +119,8 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestBoolean2()
 		{
 			BooleanQuery query = new BooleanQuery();
-			query.Add(new TermQuery(new Term("field", "sevento")), BooleanClause.Occur.MUST);
-			query.Add(new TermQuery(new Term("field", "sevenly")), BooleanClause.Occur.MUST);
+			query.Add(new TermQuery(new Term("field", "sevento")), Occur.MUST);
+			query.Add(new TermQuery(new Term("field", "sevenly")), Occur.MUST);
 			CheckHits(query, new int[]{});
 		}
 		

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs Fri Apr  6 23:37:48 2012
@@ -116,8 +116,8 @@ namespace Lucene.Net.Search.Spans
 			
 			Query spanQuery = new SpanTermQuery(new Term(FIELD_TEXT, "work"));
 			BooleanQuery query = new BooleanQuery();
-			query.Add(spanQuery, BooleanClause.Occur.MUST);
-			query.Add(spanQuery, BooleanClause.Occur.MUST);
+			query.Add(spanQuery, Occur.MUST);
+			query.Add(spanQuery, Occur.MUST);
 			System.String[] expectedIds = new System.String[]{"1", "2", "3", "4"};
 			float[] expectedScores = new float[]{expectedScore, expectedScore, expectedScore, expectedScore};
 			assertHits(s, query, "two span queries", expectedIds, expectedScores);

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs Fri Apr  6 23:37:48 2012
@@ -92,8 +92,8 @@ namespace Lucene.Net.Search.Spans
 			Query spanQuery1 = new SpanTermQuery(new Term(FIELD_TEXT, "should"));
 			Query spanQuery2 = new SpanTermQuery(new Term(FIELD_TEXT, "we"));
 			BooleanQuery query = new BooleanQuery();
-			query.Add(spanQuery1, BooleanClause.Occur.MUST);
-			query.Add(spanQuery2, BooleanClause.Occur.MUST);
+			query.Add(spanQuery1, Occur.MUST);
+			query.Add(spanQuery2, Occur.MUST);
 			System.String[] expectedIds = new System.String[]{"D", "A"};
 			// these values were pre LUCENE-413
 			// final float[] expectedScores = new float[] { 0.93163157f, 0.20698164f };

Modified: incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs Fri Apr  6 23:37:48 2012
@@ -275,8 +275,8 @@ namespace Lucene.Net.Search
 					CheckHits.CheckEqual(q1, hits1, hits2);
 
                     BooleanQuery q3 = new BooleanQuery();
-				    q3.Add(q1, BooleanClause.Occur.SHOULD);
-                    q3.Add(new PrefixQuery(new Term("field2", "b")), BooleanClause.Occur.SHOULD);
+				    q3.Add(q1, Occur.SHOULD);
+                    q3.Add(new PrefixQuery(new Term("field2", "b")), Occur.SHOULD);
 				    TopDocs hits4 = bigSearcher.Search(q3, 1);
 				    Assert.AreEqual(mulFactor*collector.totalHits + NUM_EXTRA_DOCS/2, hits4.TotalHits);
 				}
@@ -326,18 +326,18 @@ namespace Lucene.Net.Search
                 }
 
 			    int r = rnd.Next(10);
-				BooleanClause.Occur occur;
+				Occur occur;
                 if (r < 2)
                 {
-                    occur = BooleanClause.Occur.MUST_NOT;
+                    occur = Occur.MUST_NOT;
                 }
                 else if (r < 5)
                 {
-                    occur = allowMust ? BooleanClause.Occur.MUST : BooleanClause.Occur.SHOULD;
+                    occur = allowMust ? Occur.MUST : Occur.SHOULD;
                 }
                 else
                 {
-                    occur = BooleanClause.Occur.SHOULD;
+                    occur = Occur.SHOULD;
                 }
 				
 				current.Add(q, occur);

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs Fri Apr  6 23:37:48 2012
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
 				int opt = 0;
 				for (int i = 0; i < c.Length; i++)
 				{
-					if (c[i].GetOccur() == BooleanClause.Occur.SHOULD)
+					if (c[i].Occur == Occur.SHOULD)
 						opt++;
 				}
 				q.SetMinimumNumberShouldMatch(rnd.Next(opt + 2));
@@ -125,7 +125,7 @@ namespace Lucene.Net.Search
 			BooleanQuery q = new BooleanQuery();
 			for (int i = 1; i <= 4; i++)
 			{
-				q.Add(new TermQuery(new Term("data", "" + i)), BooleanClause.Occur.SHOULD); //false, false);
+				q.Add(new TermQuery(new Term("data", "" + i)), Occur.SHOULD); //false, false);
 			}
 			q.SetMinimumNumberShouldMatch(2); // match at least two of 4
 			VerifyNrHits(q, 2);
@@ -137,10 +137,10 @@ namespace Lucene.Net.Search
 			
 			/* one required, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.SHOULD); //false, false);
 			
 			q.SetMinimumNumberShouldMatch(2); // 2 of 3 optional 
 			
@@ -153,11 +153,11 @@ namespace Lucene.Net.Search
 			
 			/* two required, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.SHOULD); //false, false);
 			
 			q.SetMinimumNumberShouldMatch(2); // 2 of 3 optional 
 			
@@ -170,10 +170,10 @@ namespace Lucene.Net.Search
 			
 			/* one prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
 			
 			q.SetMinimumNumberShouldMatch(2); // 2 of 3 optional 
 			
@@ -186,11 +186,11 @@ namespace Lucene.Net.Search
 			
 			/* two prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "C")), BooleanClause.Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "C")), Occur.MUST_NOT); //false, true );
 			
 			q.SetMinimumNumberShouldMatch(2); // 2 of 3 optional 
 			
@@ -203,12 +203,12 @@ namespace Lucene.Net.Search
 			
 			/* one required, one prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); // true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); // true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
 			
 			q.SetMinimumNumberShouldMatch(3); // 3 of 4 optional 
 			
@@ -221,13 +221,13 @@ namespace Lucene.Net.Search
 			
 			/* two required, one prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
 			
 			q.SetMinimumNumberShouldMatch(3); // 3 of 4 optional 
 			
@@ -240,13 +240,13 @@ namespace Lucene.Net.Search
 			
 			/* one required, two prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "C")), BooleanClause.Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "C")), Occur.MUST_NOT); //false, true );
 			
 			q.SetMinimumNumberShouldMatch(3); // 3 of 4 optional 
 			
@@ -259,14 +259,14 @@ namespace Lucene.Net.Search
 			
 			/* two required, two prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "C")), BooleanClause.Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "C")), Occur.MUST_NOT); //false, true );
 			
 			q.SetMinimumNumberShouldMatch(3); // 3 of 4 optional 
 			
@@ -279,14 +279,14 @@ namespace Lucene.Net.Search
 			
 			/* two required, two prohibited, some optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "5")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "4")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST_NOT); //false, true );
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "C")), BooleanClause.Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "5")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "4")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST_NOT); //false, true );
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "1")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "C")), Occur.MUST_NOT); //false, true );
 			
 			q.SetMinimumNumberShouldMatch(90); // 90 of 4 optional ?!?!?!
 			
@@ -299,10 +299,10 @@ namespace Lucene.Net.Search
 			
 			/* two required, two optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "6")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "6")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "2")), Occur.SHOULD); //false, false);
 			
 			q.SetMinimumNumberShouldMatch(2); // 2 of 2 optional 
 			
@@ -315,9 +315,9 @@ namespace Lucene.Net.Search
 			
 			/* two required, one optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "3")), BooleanClause.Occur.SHOULD); //false, false);
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "3")), Occur.SHOULD); //false, false);
+			q.Add(new TermQuery(new Term("data", "2")), Occur.MUST); //true,  false);
 			
 			q.SetMinimumNumberShouldMatch(1); // 1 of 1 optional 
 			
@@ -330,8 +330,8 @@ namespace Lucene.Net.Search
 			
 			/* two required, no optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
-			q.Add(new TermQuery(new Term("data", "2")), BooleanClause.Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("data", "2")), Occur.MUST); //true,  false);
 			
 			q.SetMinimumNumberShouldMatch(1); // 1 of 0 optional 
 			
@@ -344,7 +344,7 @@ namespace Lucene.Net.Search
 			
 			/* one required, no optional */
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new TermQuery(new Term("all", "all")), BooleanClause.Occur.MUST); //true,  false);
+			q.Add(new TermQuery(new Term("all", "all")), Occur.MUST); //true,  false);
 			
 			q.SetMinimumNumberShouldMatch(1); // 1 of 0 optional 
 			

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanOr.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanOr.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanOr.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanOr.cs Fri Apr  6 23:37:48 2012
@@ -68,10 +68,10 @@ namespace Lucene.Net.Search
 		public virtual void  TestFlat()
 		{
 			BooleanQuery q = new BooleanQuery();
-			q.Add(new BooleanClause(t1, BooleanClause.Occur.SHOULD));
-			q.Add(new BooleanClause(t2, BooleanClause.Occur.SHOULD));
-			q.Add(new BooleanClause(c1, BooleanClause.Occur.SHOULD));
-			q.Add(new BooleanClause(c2, BooleanClause.Occur.SHOULD));
+			q.Add(new BooleanClause(t1, Occur.SHOULD));
+			q.Add(new BooleanClause(t2, Occur.SHOULD));
+			q.Add(new BooleanClause(c1, Occur.SHOULD));
+			q.Add(new BooleanClause(c2, Occur.SHOULD));
 			Assert.AreEqual(1, Search(q));
 		}
 		
@@ -84,14 +84,14 @@ namespace Lucene.Net.Search
 		public virtual void  TestParenthesisMust()
 		{
 			BooleanQuery q3 = new BooleanQuery();
-			q3.Add(new BooleanClause(t1, BooleanClause.Occur.SHOULD));
-			q3.Add(new BooleanClause(t2, BooleanClause.Occur.SHOULD));
+			q3.Add(new BooleanClause(t1, Occur.SHOULD));
+			q3.Add(new BooleanClause(t2, Occur.SHOULD));
 			BooleanQuery q4 = new BooleanQuery();
-			q4.Add(new BooleanClause(c1, BooleanClause.Occur.MUST));
-			q4.Add(new BooleanClause(c2, BooleanClause.Occur.MUST));
+			q4.Add(new BooleanClause(c1, Occur.MUST));
+			q4.Add(new BooleanClause(c2, Occur.MUST));
 			BooleanQuery q2 = new BooleanQuery();
-			q2.Add(q3, BooleanClause.Occur.SHOULD);
-			q2.Add(q4, BooleanClause.Occur.SHOULD);
+			q2.Add(q3, Occur.SHOULD);
+			q2.Add(q4, Occur.SHOULD);
 			Assert.AreEqual(1, Search(q2));
 		}
 		
@@ -104,14 +104,14 @@ namespace Lucene.Net.Search
 		public virtual void  TestParenthesisMust2()
 		{
 			BooleanQuery q3 = new BooleanQuery();
-			q3.Add(new BooleanClause(t1, BooleanClause.Occur.SHOULD));
-			q3.Add(new BooleanClause(t2, BooleanClause.Occur.SHOULD));
+			q3.Add(new BooleanClause(t1, Occur.SHOULD));
+			q3.Add(new BooleanClause(t2, Occur.SHOULD));
 			BooleanQuery q4 = new BooleanQuery();
-			q4.Add(new BooleanClause(c1, BooleanClause.Occur.SHOULD));
-			q4.Add(new BooleanClause(c2, BooleanClause.Occur.SHOULD));
+			q4.Add(new BooleanClause(c1, Occur.SHOULD));
+			q4.Add(new BooleanClause(c2, Occur.SHOULD));
 			BooleanQuery q2 = new BooleanQuery();
-			q2.Add(q3, BooleanClause.Occur.SHOULD);
-			q2.Add(q4, BooleanClause.Occur.MUST);
+			q2.Add(q3, Occur.SHOULD);
+			q2.Add(q4, Occur.MUST);
 			Assert.AreEqual(1, Search(q2));
 		}
 		
@@ -124,14 +124,14 @@ namespace Lucene.Net.Search
 		public virtual void  TestParenthesisShould()
 		{
 			BooleanQuery q3 = new BooleanQuery();
-			q3.Add(new BooleanClause(t1, BooleanClause.Occur.SHOULD));
-			q3.Add(new BooleanClause(t2, BooleanClause.Occur.SHOULD));
+			q3.Add(new BooleanClause(t1, Occur.SHOULD));
+			q3.Add(new BooleanClause(t2, Occur.SHOULD));
 			BooleanQuery q4 = new BooleanQuery();
-			q4.Add(new BooleanClause(c1, BooleanClause.Occur.SHOULD));
-			q4.Add(new BooleanClause(c2, BooleanClause.Occur.SHOULD));
+			q4.Add(new BooleanClause(c1, Occur.SHOULD));
+			q4.Add(new BooleanClause(c2, Occur.SHOULD));
 			BooleanQuery q2 = new BooleanQuery();
-			q2.Add(q3, BooleanClause.Occur.SHOULD);
-			q2.Add(q4, BooleanClause.Occur.SHOULD);
+			q2.Add(q3, Occur.SHOULD);
+			q2.Add(q4, Occur.SHOULD);
 			Assert.AreEqual(1, Search(q2));
 		}
 		

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs Fri Apr  6 23:37:48 2012
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search
 				rw1 = query.Rewrite(reader);
 				
 				BooleanQuery bq = new BooleanQuery();
-				bq.Add(query, BooleanClause.Occur.MUST);
+				bq.Add(query, Occur.MUST);
 				
 				rw2 = bq.Rewrite(reader);
 			}



Mime
View raw message