|
57 | 57 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; |
58 | 58 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailuresAndResponse; |
59 | 59 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse; |
| 60 | +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponses; |
60 | 61 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHitsWithoutFailures; |
61 | 62 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSecondHit; |
62 | 63 | import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId; |
@@ -772,26 +773,21 @@ public void testCrossFieldMode() throws ExecutionException, InterruptedException |
772 | 773 | ); |
773 | 774 | // counter example |
774 | 775 | assertHitCount( |
| 776 | + 0L, |
775 | 777 | prepareSearch("test").setQuery( |
776 | 778 | randomizeType( |
777 | 779 | multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( |
778 | 780 | randomBoolean() ? MultiMatchQueryBuilder.Type.CROSS_FIELDS : MultiMatchQueryBuilder.DEFAULT_TYPE |
779 | 781 | ).operator(Operator.AND) |
780 | 782 | ) |
781 | 783 | ), |
782 | | - 0L |
783 | | - ); |
784 | | - |
785 | | - // counter example |
786 | | - assertHitCount( |
787 | 784 | prepareSearch("test").setQuery( |
788 | 785 | randomizeType( |
789 | 786 | multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( |
790 | 787 | randomBoolean() ? MultiMatchQueryBuilder.Type.CROSS_FIELDS : MultiMatchQueryBuilder.DEFAULT_TYPE |
791 | 788 | ).operator(Operator.AND) |
792 | 789 | ) |
793 | | - ), |
794 | | - 0L |
| 790 | + ) |
795 | 791 | ); |
796 | 792 |
|
797 | 793 | // test if boosts work |
@@ -828,40 +824,21 @@ public void testCrossFieldMode() throws ExecutionException, InterruptedException |
828 | 824 | } |
829 | 825 | ); |
830 | 826 | // Test group based on numeric fields |
831 | | - assertResponse( |
| 827 | + assertResponses(response -> { |
| 828 | + assertHitCount(response, 1L); |
| 829 | + assertFirstHit(response, hasId("theone")); |
| 830 | + }, |
832 | 831 | prepareSearch("test").setQuery(randomizeType(multiMatchQuery("15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS))), |
833 | | - response -> { |
834 | | - assertHitCount(response, 1L); |
835 | | - assertFirstHit(response, hasId("theone")); |
836 | | - } |
837 | | - ); |
838 | | - assertResponse( |
839 | 832 | prepareSearch("test").setQuery( |
840 | 833 | randomizeType(multiMatchQuery("15", "skill", "first_name").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) |
841 | 834 | ), |
842 | | - response -> { |
843 | | - assertHitCount(response, 1L); |
844 | | - assertFirstHit(response, hasId("theone")); |
845 | | - } |
846 | | - ); |
847 | | - // Two numeric fields together caused trouble at one point! |
848 | | - assertResponse( |
| 835 | + // Two numeric fields together caused trouble at one point! |
849 | 836 | prepareSearch("test").setQuery( |
850 | 837 | randomizeType(multiMatchQuery("15", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) |
851 | 838 | ), |
852 | | - response -> { |
853 | | - assertHitCount(response, 1L); |
854 | | - assertFirstHit(response, hasId("theone")); |
855 | | - } |
856 | | - ); |
857 | | - assertResponse( |
858 | 839 | prepareSearch("test").setQuery( |
859 | 840 | randomizeType(multiMatchQuery("15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) |
860 | | - ), |
861 | | - response -> { |
862 | | - assertHitCount(response, 1L); |
863 | | - assertFirstHit(response, hasId("theone")); |
864 | | - } |
| 841 | + ) |
865 | 842 | ); |
866 | 843 | assertResponse( |
867 | 844 | prepareSearch("test").setQuery( |
|
0 commit comments