@@ -284,10 +284,9 @@ public void testDisjunctionScoring() {
284284
285285 // Matches full text query and non pushable query
286286 assertThat ((Double ) values .get (0 ).get (1 ), greaterThan (1.0 ));
287- // Matches just non pushable query
288287 assertThat ((Double ) values .get (1 ).get (1 ), greaterThan (1.0 ));
289- // Matches just full text query
290- assertThat ((Double ) values .get (2 ).get (1 ), equalTo (0 .0 ));
288+ // Matches just non pushable query
289+ assertThat ((Double ) values .get (2 ).get (1 ), equalTo (1 .0 ));
291290 }
292291 }
293292
@@ -308,12 +307,12 @@ public void testDisjunctionScoringMultipleNonPushableFunctions() {
308307 assertThat (values .get (0 ).get (0 ), equalTo (1 ));
309308 assertThat (values .get (1 ).get (0 ), equalTo (6 ));
310309
311- // Matches the full text query and a non pushable query
312- assertThat ((Double ) values .get (0 ).get (1 ), greaterThan (1 .0 ));
313- assertThat ((Double ) values .get (0 ).get (1 ), lessThan (2 .0 ));
310+ // Matches the full text query and a two pushable query
311+ assertThat ((Double ) values .get (0 ).get (1 ), greaterThan (2 .0 ));
312+ assertThat ((Double ) values .get (0 ).get (1 ), lessThan (3 .0 ));
314313 // Matches just the match function
315- assertThat ((Double ) values .get (1 ).get (1 ), lessThan (1 .0 ));
316- assertThat ((Double ) values .get (1 ).get (1 ), greaterThan (0 .0 ));
314+ assertThat ((Double ) values .get (1 ).get (1 ), lessThan (2 .0 ));
315+ assertThat ((Double ) values .get (1 ).get (1 ), greaterThan (1 .0 ));
317316 }
318317 }
319318
@@ -335,10 +334,10 @@ public void testDisjunctionScoringWithNot() {
335334 assertThat (values .get (1 ).get (0 ), equalTo (4 ));
336335 assertThat (values .get (2 ).get (0 ), equalTo (5 ));
337336
338- // Matches NOT and non pushable query gets score of 0 .0
339- assertThat ((Double ) values .get (0 ).get (1 ), equalTo (0 .0 ));
340- assertThat ((Double ) values .get (1 ).get (1 ), equalTo (0 .0 ));
341- assertThat ((Double ) values .get (2 ).get (1 ), equalTo (0 .0 ));
337+ // Matches NOT gets 0.0 and default score is 1 .0
338+ assertThat ((Double ) values .get (0 ).get (1 ), equalTo (1 .0 ));
339+ assertThat ((Double ) values .get (1 ).get (1 ), equalTo (1 .0 ));
340+ assertThat ((Double ) values .get (2 ).get (1 ), equalTo (1 .0 ));
342341 }
343342 }
344343
0 commit comments