Restore assertion on discount overlaps in SimilarityTests

javanna · javanna · commit 0b396a0c5e5f · 2019-01-15T16:43:09.000+01:00
This assertion was commented out as the getDiscountOverlaps getter was
missing from LegacyBm25Similarity. That has been fixed in lucene.
diff --git a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
@@ -99,8 +99,7 @@ public void testResolveSimilaritiesFromMapping_bm25() throws IOException {
         LegacyBM25Similarity similarity = (LegacyBM25Similarity) mapperService.fullName("field1").similarity().get();
         assertThat(similarity.getK1(), equalTo(2.0f));
         assertThat(similarity.getB(), equalTo(0.5f));
-        // TODO: re-enable when we switch back to BM25Similarity
-        // assertThat(similarity.getDiscountOverlaps(), equalTo(false));
+        assertThat(similarity.getDiscountOverlaps(), equalTo(false));
     }
 
     public void testResolveSimilaritiesFromMapping_boolean() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,7 @@ public void testResolveSimilaritiesFromMapping_bm25() throws IOException {`
`99`	`99`	`LegacyBM25Similarity similarity = (LegacyBM25Similarity) mapperService.fullName("field1").similarity().get();`
`100`	`100`	`assertThat(similarity.getK1(), equalTo(2.0f));`
`101`	`101`	`assertThat(similarity.getB(), equalTo(0.5f));`
`102`		`- // TODO: re-enable when we switch back to BM25Similarity`
`103`		`- // assertThat(similarity.getDiscountOverlaps(), equalTo(false));`
	`102`	`+ assertThat(similarity.getDiscountOverlaps(), equalTo(false));`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`public void testResolveSimilaritiesFromMapping_boolean() throws IOException {`