summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/index/query
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/test/java/org/elasticsearch/index/query')
-rw-r--r--core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java (renamed from core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java)23
-rw-r--r--core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java18
2 files changed, 12 insertions, 29 deletions
diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java b/core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java
index 5bd6a8a582..68f964e2c8 100644
--- a/core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java
@@ -20,17 +20,13 @@
package org.elasticsearch.index.query;
import org.elasticsearch.common.ParsingException;
-import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.search.SearchModule;
import org.elasticsearch.test.ESTestCase;
-import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import java.io.IOException;
@@ -38,7 +34,8 @@ import java.io.IOException;
import static java.util.Collections.emptyList;
import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
-public class QueryParseContextTests extends ESTestCase {
+public class AbstractQueryBuilderTests extends ESTestCase {
+
private static NamedXContentRegistry xContentRegistry;
@BeforeClass
@@ -51,20 +48,6 @@ public class QueryParseContextTests extends ESTestCase {
xContentRegistry = null;
}
- private ThreadContext threadContext;
-
- @Before
- public void beforeTest() throws IOException {
- this.threadContext = new ThreadContext(Settings.EMPTY);
- DeprecationLogger.setThreadContext(threadContext);
- }
-
- @After
- public void teardown() throws IOException {
- DeprecationLogger.removeThreadContext(this.threadContext);
- this.threadContext.close();
- }
-
public void testParseInnerQueryBuilder() throws IOException {
QueryBuilder query = new MatchQueryBuilder("foo", "bar");
String source = query.toString();
@@ -91,7 +74,6 @@ public class QueryParseContextTests extends ESTestCase {
source = "{ \"foo\" : \"bar\" }";
try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) {
- QueryParseContext context = new QueryParseContext(parser);
ParsingException exception = expectThrows(ParsingException.class, () -> parseInnerQueryBuilder(parser));
assertEquals("[foo] query malformed, no start_object after query name", exception.getMessage());
}
@@ -107,4 +89,5 @@ public class QueryParseContextTests extends ESTestCase {
protected NamedXContentRegistry xContentRegistry() {
return xContentRegistry;
}
+
}
diff --git a/core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java
index 4902aa8fa6..2f898481ed 100644
--- a/core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java
@@ -224,7 +224,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
/**
* Specifying a timezone together with a numeric range query should throw an exception.
*/
- public void testToQueryNonDateWithTimezone() throws QueryShardException, IOException {
+ public void testToQueryNonDateWithTimezone() throws QueryShardException {
RangeQueryBuilder query = new RangeQueryBuilder(INT_FIELD_NAME);
query.from(1).to(10).timeZone("UTC");
QueryShardException e = expectThrows(QueryShardException.class, () -> query.toQuery(createShardContext()));
@@ -234,7 +234,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
/**
* Specifying a timezone together with an unmapped field should throw an exception.
*/
- public void testToQueryUnmappedWithTimezone() throws QueryShardException, IOException {
+ public void testToQueryUnmappedWithTimezone() throws QueryShardException {
RangeQueryBuilder query = new RangeQueryBuilder("bogus_field");
query.from(1).to(10).timeZone("UTC");
QueryShardException e = expectThrows(QueryShardException.class, () -> query.toQuery(createShardContext()));
@@ -410,7 +410,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
String fieldName = randomAlphaOfLengthBetween(1, 20);
RangeQueryBuilder query = new RangeQueryBuilder(fieldName) {
@Override
- protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) throws IOException {
+ protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) {
return Relation.WITHIN;
}
};
@@ -431,7 +431,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
String fieldName = randomAlphaOfLengthBetween(1, 20);
RangeQueryBuilder query = new RangeQueryBuilder(fieldName) {
@Override
- protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) throws IOException {
+ protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) {
return Relation.WITHIN;
}
};
@@ -456,7 +456,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
String fieldName = randomAlphaOfLengthBetween(1, 20);
RangeQueryBuilder query = new RangeQueryBuilder(fieldName) {
@Override
- protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) throws IOException {
+ protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) {
return Relation.DISJOINT;
}
};
@@ -473,7 +473,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
String fieldName = randomAlphaOfLengthBetween(1, 20);
RangeQueryBuilder query = new RangeQueryBuilder(fieldName) {
@Override
- protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) throws IOException {
+ protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) {
return Relation.INTERSECTS;
}
};
@@ -490,7 +490,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
String fieldName = randomAlphaOfLengthBetween(1, 20);
RangeQueryBuilder query = new RangeQueryBuilder(fieldName) {
@Override
- protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) throws IOException {
+ protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteContext) {
return Relation.INTERSECTS;
}
};
@@ -499,7 +499,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
assertThat(rewritten, sameInstance(query));
}
- public void testParseFailsWithMultipleFields() throws IOException {
+ public void testParseFailsWithMultipleFields() {
String json =
"{\n" +
" \"range\": {\n" +
@@ -517,7 +517,7 @@ public class RangeQueryBuilderTests extends AbstractQueryTestCase<RangeQueryBuil
assertEquals("[range] query doesn't support multiple fields, found [age] and [price]", e.getMessage());
}
- public void testParseFailsWithMultipleFieldsWhenOneIsDate() throws IOException {
+ public void testParseFailsWithMultipleFieldsWhenOneIsDate() {
String json =
"{\n" +
" \"range\": {\n" +
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 04:18:38 +0000