Browse Source

[TEST] re-enable boost assertions for queries that don't support it

This will be useful to find out whether we forgot to override `setFinalBoost`, otherwise any bost check is simply skipped.
javanna 10 years ago
parent
commit
6395349bc0

+ 1 - 1
core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java

@@ -320,7 +320,7 @@ public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> ext
             Query namedQuery = context.copyNamedQueries().get(queryBuilder.queryName());
             assertThat(namedQuery, equalTo(query));
         }
-        if (query != null && supportsBoostAndQueryName()) {
+        if (query != null) {
             assertBoost(queryBuilder, query);
         }
         doAssertLuceneQuery(queryBuilder, query, context);

+ 5 - 0
core/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java

@@ -62,6 +62,11 @@ public class WrapperQueryBuilderTests extends BaseQueryTestCase<WrapperQueryBuil
         }
     }
 
+    @Override
+    protected void assertBoost(WrapperQueryBuilder queryBuilder, Query query) throws IOException {
+        //no-op boost is checked already above as part of doAssertLuceneQuery as we rely on lucene equals impl
+    }
+
     @Test
     public void testValidate() {
         WrapperQueryBuilder wrapperQueryBuilder = new WrapperQueryBuilder((byte[]) null);