Skip to content

Commit

Permalink
AbstractQueryTestCase should run without type less often (#28936)
Browse files Browse the repository at this point in the history 
This commit changes the randomization to always create an index with a type.
It also adds a way to create a query shard context that maps to an index with
no type registered in order to explicitely test cases where there is no type.
  • Loading branch information
@jimczi
jimczi authored Jul 26, 2018
1 parent 57876bf commit 8e5f281
Show file tree
Hide file tree
Showing 26 changed files with 105 additions and 336 deletions.
15 changes: 5 additions & 10 deletions ...s/mapper-extras/src/test/java/org/elasticsearch/index/query/FeatureQueryBuilderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ public class FeatureQueryBuilderTests extends AbstractQueryTestCase<FeatureQuery

@Override
protected void initializeAdditionalMappings(MapperService mapperService) throws IOException {
for (String type : getCurrentTypes()) {
mapperService.merge(type, new CompressedXContent(Strings.toString(PutMappingRequest.buildFromSimplifiedDef(type,
"my_feature_field", "type=feature",
"my_negative_feature_field", "type=feature,positive_score_impact=false",
"my_feature_vector_field", "type=feature_vector"))), MapperService.MergeReason.MAPPING_UPDATE);
}
mapperService.merge("_doc", new CompressedXContent(Strings.toString(PutMappingRequest.buildFromSimplifiedDef("_doc",
"my_feature_field", "type=feature",
"my_negative_feature_field", "type=feature,positive_score_impact=false",
"my_feature_vector_field", "type=feature_vector"))), MapperService.MergeReason.MAPPING_UPDATE);
}

@Override
Expand Down Expand Up @@ -87,7 +85,7 @@ protected FeatureQueryBuilder doCreateTestQueryBuilder() {
if (mayUseNegativeField) {
fields.add("my_negative_feature_field");
}

final String field = randomFrom(fields);
return new FeatureQueryBuilder(field, function);
}
Expand All @@ -99,7 +97,6 @@ protected void doAssertLuceneQuery(FeatureQueryBuilder queryBuilder, Query query
}

public void testDefaultScoreFunction() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"feature\" : {\n" +
" \"field\": \"my_feature_field\"\n" +
Expand All @@ -110,7 +107,6 @@ public void testDefaultScoreFunction() throws IOException {
}

public void testIllegalField() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"feature\" : {\n" +
" \"field\": \"" + STRING_FIELD_NAME + "\"\n" +
Expand All @@ -121,7 +117,6 @@ public void testIllegalField() throws IOException {
}

public void testIllegalCombination() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"feature\" : {\n" +
" \"field\": \"my_negative_feature_field\",\n" +
Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ public void testIllegalArguments() {
}

public void testToQueryInnerPrefixQuery() throws Exception {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String queryAsString = "{\n" +
" \"dis_max\":{\n" +
" \"queries\":[\n" +
Expand Down
6 changes: 1 addition & 5 deletions server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ protected void doAssertLuceneQuery(ExistsQueryBuilder queryBuilder, Query query,
Collection<String> fields = context.getQueryShardContext().simpleMatchToIndexNames(fieldPattern);
Collection<String> mappedFields = fields.stream().filter((field) -> context.getQueryShardContext().getObjectMapper(field) != null
|| context.getQueryShardContext().getMapperService().fullName(field) != null).collect(Collectors.toList());
if (getCurrentTypes().length == 0) {
assertThat(query, instanceOf(MatchNoDocsQuery.class));
MatchNoDocsQuery matchNoDocsQuery = (MatchNoDocsQuery) query;
assertThat(matchNoDocsQuery.toString(null), containsString("Missing types in \"exists\" query."));
} else if (context.mapperService().getIndexSettings().getIndexVersionCreated().before(Version.V_6_1_0)) {
if (context.mapperService().getIndexSettings().getIndexVersionCreated().before(Version.V_6_1_0)) {
if (fields.size() == 1) {
assertThat(query, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) query;
Expand Down
5 changes: 0 additions & 5 deletions server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ public void testUnsupportedFuzzinessForStringType() throws IOException {
}

public void testToQueryWithStringField() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"fuzzy\":{\n" +
" \"" + STRING_FIELD_NAME + "\":{\n" +
Expand All @@ -128,7 +127,6 @@ public void testToQueryWithStringField() throws IOException {
}

public void testToQueryWithStringFieldDefinedFuzziness() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"fuzzy\":{\n" +
" \"" + STRING_FIELD_NAME + "\":{\n" +
Expand All @@ -151,7 +149,6 @@ public void testToQueryWithStringFieldDefinedFuzziness() throws IOException {
}

public void testToQueryWithStringFieldDefinedWrongFuzziness() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String queryMissingFuzzinessUpLimit = "{\n" +
" \"fuzzy\":{\n" +
" \"" + STRING_FIELD_NAME + "\":{\n" +
Expand Down Expand Up @@ -214,7 +211,6 @@ public void testToQueryWithStringFieldDefinedWrongFuzziness() throws IOException
}

public void testToQueryWithNumericField() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"fuzzy\":{\n" +
" \"" + INT_FIELD_NAME + "\":{\n" +
Expand Down Expand Up @@ -299,7 +295,6 @@ public void testParseFailsWithValueArray() {
}

public void testToQueryWithTranspositions() throws Exception {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
Query query = new FuzzyQueryBuilder(STRING_FIELD_NAME, "text").toQuery(createShardContext());
assertThat(query, instanceOf(FuzzyQuery.class));
assertEquals(FuzzyQuery.defaultTranspositions, ((FuzzyQuery)query).getTranspositions());
Expand Down
25 changes: 6 additions & 19 deletions server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.startsWith;

public class GeoBoundingBoxQueryBuilderTests extends AbstractQueryTestCase<GeoBoundingBoxQueryBuilder> {
/** Randomly generate either NaN or one of the two infinity values. */
Expand Down Expand Up @@ -110,16 +109,12 @@ public void testValidationNullTypeString() {
assertEquals("cannot parse type from null string", e.getMessage());
}

@Override
public void testToQuery() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
super.testToQuery();
}

public void testExceptionOnMissingTypes() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length == 0);
QueryShardException e = expectThrows(QueryShardException.class, super::testToQuery);
assertThat(e.getMessage(), startsWith("failed to find geo_point field [mapped_geo_point"));
public void testExceptionOnMissingTypes() {
QueryShardContext context = createShardContextWithNoType();
GeoBoundingBoxQueryBuilder qb = createTestQueryBuilder();
qb.ignoreUnmapped(false);
QueryShardException e = expectThrows(QueryShardException.class, () -> qb.toQuery(context));
assertEquals("failed to find geo_point field [" + qb.fieldName() + "]", e.getMessage());
}

public void testBrokenCoordinateCannotBeSet() {
Expand Down Expand Up @@ -295,7 +290,6 @@ public void fillIn(double coordinate, GeoBoundingBoxQueryBuilder qb) {
}

public void testParsingAndToQuery1() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\":{\n" +
" \"" + GEO_POINT_FIELD_NAME+ "\":{\n" +
Expand All @@ -308,7 +302,6 @@ public void testParsingAndToQuery1() throws IOException {
}

public void testParsingAndToQuery2() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\":{\n" +
" \"" + GEO_POINT_FIELD_NAME+ "\":{\n" +
Expand All @@ -327,7 +320,6 @@ public void testParsingAndToQuery2() throws IOException {
}

public void testParsingAndToQuery3() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\":{\n" +
" \"" + GEO_POINT_FIELD_NAME+ "\":{\n" +
Expand All @@ -340,7 +332,6 @@ public void testParsingAndToQuery3() throws IOException {
}

public void testParsingAndToQuery4() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\":{\n" +
" \"" + GEO_POINT_FIELD_NAME+ "\":{\n" +
Expand All @@ -353,7 +344,6 @@ public void testParsingAndToQuery4() throws IOException {
}

public void testParsingAndToQuery5() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\":{\n" +
" \"" + GEO_POINT_FIELD_NAME+ "\":{\n" +
Expand All @@ -366,7 +356,6 @@ public void testParsingAndToQuery5() throws IOException {
}

public void testParsingAndToQuery6() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\":{\n" +
" \"" + GEO_POINT_FIELD_NAME+ "\":{\n" +
Expand Down Expand Up @@ -513,7 +502,6 @@ public void testMalformedGeohashes() {
}

public void testHonorsCoercion() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_bounding_box\": {\n" +
" \"validation_method\": \"COERCE\",\n" +
Expand All @@ -534,7 +522,6 @@ public void testHonorsCoercion() throws IOException {

@Override
public void testMustRewrite() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
super.testMustRewrite();
}

Expand Down
20 changes: 0 additions & 20 deletions server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ public void testIllegalValues() {
*/
@Override
public void testToQuery() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
super.testToQuery();
}

Expand All @@ -148,7 +147,6 @@ protected void doAssertLuceneQuery(GeoDistanceQueryBuilder queryBuilder, Query q
}

public void testParsingAndToQuery1() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"12mi\",\n" +
Expand All @@ -162,7 +160,6 @@ public void testParsingAndToQuery1() throws IOException {
}

public void testParsingAndToQuery2() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"12mi\",\n" +
Expand All @@ -173,7 +170,6 @@ public void testParsingAndToQuery2() throws IOException {
}

public void testParsingAndToQuery3() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"12mi\",\n" +
Expand All @@ -184,7 +180,6 @@ public void testParsingAndToQuery3() throws IOException {
}

public void testParsingAndToQuery4() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"12mi\",\n" +
Expand All @@ -195,7 +190,6 @@ public void testParsingAndToQuery4() throws IOException {
}

public void testParsingAndToQuery5() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":12,\n" +
Expand All @@ -210,7 +204,6 @@ public void testParsingAndToQuery5() throws IOException {
}

public void testParsingAndToQuery6() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"12\",\n" +
Expand All @@ -225,7 +218,6 @@ public void testParsingAndToQuery6() throws IOException {
}

public void testParsingAndToQuery7() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"19.312128\",\n" +
Expand All @@ -239,7 +231,6 @@ public void testParsingAndToQuery7() throws IOException {
}

public void testParsingAndToQuery8() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":19.312128,\n" +
Expand All @@ -253,7 +244,6 @@ public void testParsingAndToQuery8() throws IOException {
}

public void testParsingAndToQuery9() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"19.312128\",\n" +
Expand All @@ -268,7 +258,6 @@ public void testParsingAndToQuery9() throws IOException {
}

public void testParsingAndToQuery10() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":19.312128,\n" +
Expand All @@ -283,7 +272,6 @@ public void testParsingAndToQuery10() throws IOException {
}

public void testParsingAndToQuery11() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"19.312128km\",\n" +
Expand All @@ -297,7 +285,6 @@ public void testParsingAndToQuery11() throws IOException {
}

public void testParsingAndToQuery12() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
String query = "{\n" +
" \"geo_distance\":{\n" +
" \"distance\":\"12mi\",\n" +
Expand All @@ -312,7 +299,6 @@ public void testParsingAndToQuery12() throws IOException {
}

private void assertGeoDistanceRangeQuery(String query, double lat, double lon, double distance, DistanceUnit distanceUnit) throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
Query parsedQuery = parseQuery(query).toQuery(createShardContext());
// TODO: what can we check?
}
Expand All @@ -336,12 +322,6 @@ public void testFromJson() throws IOException {
assertEquals(json, 12000.0, parsed.distance(), 0.0001);
}

@Override
public void testMustRewrite() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
super.testMustRewrite();
}

public void testIgnoreUnmapped() throws IOException {
final GeoDistanceQueryBuilder queryBuilder = new GeoDistanceQueryBuilder("unmapped").point(0.0, 0.0).distance("20m");
queryBuilder.ignoreUnmapped(true);
Expand Down
Loading

0 comments on commit 8e5f281

Please sign in to comment.