You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/09/11 21:30:34 UTC
[03/50] [abbrv] lucenenet git commit: Refactoring to ensure that the
abstract members are available in the context of the base class test
(otherwise many of the tests get a NotImplementedException on the
QueryParserTestBase).
Refactoring to ensure that the abstract members are available in the context of the base class test (otherwise many of the tests get a NotImplementedException on the QueryParserTestBase).
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d5c43723
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d5c43723
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d5c43723
Branch: refs/heads/master
Commit: d5c43723df31652ca9dd814f06f0a8ba7ea50853
Parents: 6d71156
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Jul 31 17:12:18 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Sep 2 22:29:42 2016 +0700
----------------------------------------------------------------------
.../Classic/TestQueryParser.cs | 140 ++++++++++---------
.../Util/QueryParserTestBase.cs | 42 ++++--
2 files changed, 108 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d5c43723/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
----------------------------------------------------------------------
diff --git a/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs b/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
index 0130bca..35acad2 100644
--- a/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
+++ b/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
@@ -50,71 +50,81 @@ namespace Lucene.Net.QueryParser.Classic
}
- public QueryParser GetParser(Analyzer a)
- {
- if (a == null) a = new MockAnalyzer(Random(), MockTokenizer.SIMPLE, true);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, DefaultField, a);
- qp.DefaultOperator = (QueryParserBase.OR_OPERATOR);
- return qp;
- }
-
- public override ICommonQueryParserConfiguration GetParserConfig(Analyzer a)
- {
- return GetParser(a);
- }
-
- public override Query GetQuery(string query, ICommonQueryParserConfiguration cqpC)
- {
- Debug.Assert(cqpC != null, "Parameter must not be null");
- Debug.Assert(cqpC is QueryParser, "Parameter must be instance of QueryParser");
- QueryParser qp = (QueryParser)cqpC;
- return qp.Parse(query);
- }
-
- public override Query GetQuery(string query, Analyzer a)
- {
- return GetParser(a).Parse(query);
- }
-
- public override bool IsQueryParserException(Exception exception)
- {
- return exception is ParseException;
- }
-
- public override void SetDefaultOperatorOR(ICommonQueryParserConfiguration cqpC)
- {
- Debug.Assert(cqpC is QueryParser);
- QueryParser qp = (QueryParser)cqpC;
- qp.DefaultOperator = QueryParserBase.Operator.OR;
- }
-
- public override void SetDefaultOperatorAND(ICommonQueryParserConfiguration cqpC)
- {
- Debug.Assert(cqpC is QueryParser);
- QueryParser qp = (QueryParser)cqpC;
- qp.DefaultOperator = QueryParserBase.Operator.AND;
- }
-
- public override void SetAnalyzeRangeTerms(ICommonQueryParserConfiguration cqpC, bool value)
- {
- Debug.Assert(cqpC is QueryParser);
- QueryParser qp = (QueryParser)cqpC;
- qp.AnalyzeRangeTerms = (value);
- }
-
- public override void SetAutoGeneratePhraseQueries(ICommonQueryParserConfiguration cqpC, bool value)
- {
- Debug.Assert(cqpC is QueryParser);
- QueryParser qp = (QueryParser)cqpC;
- qp.AutoGeneratePhraseQueries = value;
- }
-
- public override void SetDateResolution(ICommonQueryParserConfiguration cqpC, ICharSequence field, DateTools.Resolution value)
- {
- Debug.Assert(cqpC is QueryParser);
- QueryParser qp = (QueryParser)cqpC;
- qp.SetDateResolution(field.toString(), value);
- }
+ // Moved to QueryParserTestBase
+ //public QueryParser GetParser(Analyzer a)
+ //{
+ // if (a == null) a = new MockAnalyzer(Random(), MockTokenizer.SIMPLE, true);
+ // QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, DefaultField, a);
+ // qp.DefaultOperator = (QueryParserBase.OR_OPERATOR);
+ // return qp;
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override ICommonQueryParserConfiguration GetParserConfig(Analyzer a)
+ //{
+ // return GetParser(a);
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override Query GetQuery(string query, ICommonQueryParserConfiguration cqpC)
+ //{
+ // Debug.Assert(cqpC != null, "Parameter must not be null");
+ // Debug.Assert(cqpC is QueryParser, "Parameter must be instance of QueryParser");
+ // QueryParser qp = (QueryParser)cqpC;
+ // return qp.Parse(query);
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override Query GetQuery(string query, Analyzer a)
+ //{
+ // return GetParser(a).Parse(query);
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override bool IsQueryParserException(Exception exception)
+ //{
+ // return exception is ParseException;
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override void SetDefaultOperatorOR(ICommonQueryParserConfiguration cqpC)
+ //{
+ // Debug.Assert(cqpC is QueryParser);
+ // QueryParser qp = (QueryParser)cqpC;
+ // qp.DefaultOperator = QueryParserBase.Operator.OR;
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override void SetDefaultOperatorAND(ICommonQueryParserConfiguration cqpC)
+ //{
+ // Debug.Assert(cqpC is QueryParser);
+ // QueryParser qp = (QueryParser)cqpC;
+ // qp.DefaultOperator = QueryParserBase.Operator.AND;
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override void SetAnalyzeRangeTerms(ICommonQueryParserConfiguration cqpC, bool value)
+ //{
+ // Debug.Assert(cqpC is QueryParser);
+ // QueryParser qp = (QueryParser)cqpC;
+ // qp.AnalyzeRangeTerms = (value);
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override void SetAutoGeneratePhraseQueries(ICommonQueryParserConfiguration cqpC, bool value)
+ //{
+ // Debug.Assert(cqpC is QueryParser);
+ // QueryParser qp = (QueryParser)cqpC;
+ // qp.AutoGeneratePhraseQueries = value;
+ //}
+
+ // Moved to QueryParserTestBase
+ //public override void SetDateResolution(ICommonQueryParserConfiguration cqpC, ICharSequence field, DateTools.Resolution value)
+ //{
+ // Debug.Assert(cqpC is QueryParser);
+ // QueryParser qp = (QueryParser)cqpC;
+ // qp.SetDateResolution(field.toString(), value);
+ //}
[Test]
public override void TestDefaultOperator()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d5c43723/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
----------------------------------------------------------------------
diff --git a/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs b/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index 40aa777..f8e290e 100644
--- a/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -12,6 +12,7 @@ using Lucene.Net.Util.Automaton;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Text;
@@ -112,58 +113,81 @@ namespace Lucene.Net.QueryParser.Util
originalMaxClauses = BooleanQuery.MaxClauseCount;
}
+ // Moved from TestQueryParser
+ public Classic.QueryParser GetParser(Analyzer a)
+ {
+ if (a == null) a = new MockAnalyzer(Random(), MockTokenizer.SIMPLE, true);
+ Classic.QueryParser qp = new Classic.QueryParser(TEST_VERSION_CURRENT, DefaultField, a);
+ qp.DefaultOperator = (QueryParserBase.OR_OPERATOR);
+ return qp;
+ }
+
// Moved to AbstractQueryParserTestBase
public override ICommonQueryParserConfiguration GetParserConfig(Analyzer a)
{
- throw new NotImplementedException();
+ return GetParser(a);
}
// Moved to AbstractQueryParserTestBase
public override void SetDefaultOperatorOR(ICommonQueryParserConfiguration cqpC)
{
- throw new NotImplementedException();
+ Debug.Assert(cqpC is Classic.QueryParser);
+ Classic.QueryParser qp = (Classic.QueryParser)cqpC;
+ qp.DefaultOperator = QueryParserBase.Operator.OR;
}
// Moved to AbstractQueryParserTestBase
public override void SetDefaultOperatorAND(ICommonQueryParserConfiguration cqpC)
{
- throw new NotImplementedException();
+ Debug.Assert(cqpC is Classic.QueryParser);
+ Classic.QueryParser qp = (Classic.QueryParser)cqpC;
+ qp.DefaultOperator = QueryParserBase.Operator.AND;
}
// Moved to AbstractQueryParserTestBase
public override void SetAnalyzeRangeTerms(ICommonQueryParserConfiguration cqpC, bool value)
{
- throw new NotImplementedException();
+ Debug.Assert(cqpC is Classic.QueryParser);
+ Classic.QueryParser qp = (Classic.QueryParser)cqpC;
+ qp.AnalyzeRangeTerms = (value);
}
// Moved to AbstractQueryParserTestBase
public override void SetAutoGeneratePhraseQueries(ICommonQueryParserConfiguration cqpC, bool value)
{
- throw new NotImplementedException();
+ Debug.Assert(cqpC is Classic.QueryParser);
+ Classic.QueryParser qp = (Classic.QueryParser)cqpC;
+ qp.AutoGeneratePhraseQueries = value;
}
// Moved to AbstractQueryParserTestBase
public override void SetDateResolution(ICommonQueryParserConfiguration cqpC, ICharSequence field, DateTools.Resolution value)
{
- throw new NotImplementedException();
+ Debug.Assert(cqpC is Classic.QueryParser);
+ Classic.QueryParser qp = (Classic.QueryParser)cqpC;
+ qp.SetDateResolution(field.toString(), value);
}
// Moved to AbstractQueryParserTestBase
public override Query GetQuery(string query, ICommonQueryParserConfiguration cqpC)
{
- throw new NotImplementedException();
+ Debug.Assert(cqpC != null, "Parameter must not be null");
+ Debug.Assert(cqpC is Classic.QueryParser, "Parameter must be instance of QueryParser");
+ Classic.QueryParser qp = (Classic.QueryParser)cqpC;
+ return qp.Parse(query);
}
// Moved to AbstractQueryParserTestBase
public override Query GetQuery(string query, Analyzer a)
{
- throw new NotImplementedException();
+ return GetParser(a).Parse(query);
}
+
// Moved to AbstractQueryParserTestBase
public override bool IsQueryParserException(Exception exception)
{
- throw new NotImplementedException();
+ return exception is ParseException;
}
public Query GetQuery(string query)