Skip to content

Commit a9f5a8b

Browse files
mayya-sharipovamayya-sharipova
committed
Fix tests
1 parent 7beadf3 commit a9f5a8b

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -624,41 +624,41 @@ public void testMultiLevelNestedSorting() throws IOException {
624624
assertThat(topFields.totalHits.value(), equalTo(5L));
625625
StoredFields storedFields = searcher.storedFields();
626626
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("2"));
627-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76L));
627+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76));
628628
assertThat(storedFields.document(topFields.scoreDocs[1].doc).get("_id"), equalTo("4"));
629-
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(87L));
629+
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(87));
630630
assertThat(storedFields.document(topFields.scoreDocs[2].doc).get("_id"), equalTo("1"));
631-
assertThat(((FieldDoc) topFields.scoreDocs[2]).fields[0], equalTo(234L));
631+
assertThat(((FieldDoc) topFields.scoreDocs[2]).fields[0], equalTo(234));
632632
assertThat(storedFields.document(topFields.scoreDocs[3].doc).get("_id"), equalTo("3"));
633-
assertThat(((FieldDoc) topFields.scoreDocs[3]).fields[0], equalTo(976L));
633+
assertThat(((FieldDoc) topFields.scoreDocs[3]).fields[0], equalTo(976));
634634
assertThat(storedFields.document(topFields.scoreDocs[4].doc).get("_id"), equalTo("5"));
635-
assertThat(((FieldDoc) topFields.scoreDocs[4]).fields[0], equalTo(Long.MAX_VALUE));
635+
assertThat(((FieldDoc) topFields.scoreDocs[4]).fields[0], equalTo(Integer.MAX_VALUE));
636636

637637
// Specific genre
638638
{
639639
queryBuilder = new TermQueryBuilder("genre", "romance");
640640
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
641641
assertThat(topFields.totalHits.value(), equalTo(1L));
642642
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("2"));
643-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76L));
643+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76));
644644

645645
queryBuilder = new TermQueryBuilder("genre", "science fiction");
646646
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
647647
assertThat(topFields.totalHits.value(), equalTo(1L));
648648
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("1"));
649-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(234L));
649+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(234));
650650

651651
queryBuilder = new TermQueryBuilder("genre", "horror");
652652
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
653653
assertThat(topFields.totalHits.value(), equalTo(1L));
654654
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("3"));
655-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(976L));
655+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(976));
656656

657657
queryBuilder = new TermQueryBuilder("genre", "cooking");
658658
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
659659
assertThat(topFields.totalHits.value(), equalTo(1L));
660660
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("4"));
661-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87L));
661+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87));
662662
}
663663

664664
// reverse sort order
@@ -668,15 +668,15 @@ public void testMultiLevelNestedSorting() throws IOException {
668668
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
669669
assertThat(topFields.totalHits.value(), equalTo(5L));
670670
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("3"));
671-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(976L));
671+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(976));
672672
assertThat(storedFields.document(topFields.scoreDocs[1].doc).get("_id"), equalTo("1"));
673-
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(849L));
673+
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(849));
674674
assertThat(storedFields.document(topFields.scoreDocs[2].doc).get("_id"), equalTo("4"));
675-
assertThat(((FieldDoc) topFields.scoreDocs[2]).fields[0], equalTo(180L));
675+
assertThat(((FieldDoc) topFields.scoreDocs[2]).fields[0], equalTo(180));
676676
assertThat(storedFields.document(topFields.scoreDocs[3].doc).get("_id"), equalTo("2"));
677-
assertThat(((FieldDoc) topFields.scoreDocs[3]).fields[0], equalTo(76L));
677+
assertThat(((FieldDoc) topFields.scoreDocs[3]).fields[0], equalTo(76));
678678
assertThat(storedFields.document(topFields.scoreDocs[4].doc).get("_id"), equalTo("5"));
679-
assertThat(((FieldDoc) topFields.scoreDocs[4]).fields[0], equalTo(Long.MIN_VALUE));
679+
assertThat(((FieldDoc) topFields.scoreDocs[4]).fields[0], equalTo(Integer.MIN_VALUE));
680680
}
681681

682682
// Specific genre and reverse sort order
@@ -685,25 +685,25 @@ public void testMultiLevelNestedSorting() throws IOException {
685685
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
686686
assertThat(topFields.totalHits.value(), equalTo(1L));
687687
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("2"));
688-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76L));
688+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76));
689689

690690
queryBuilder = new TermQueryBuilder("genre", "science fiction");
691691
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
692692
assertThat(topFields.totalHits.value(), equalTo(1L));
693693
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("1"));
694-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(849L));
694+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(849));
695695

696696
queryBuilder = new TermQueryBuilder("genre", "horror");
697697
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
698698
assertThat(topFields.totalHits.value(), equalTo(1L));
699699
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("3"));
700-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(976L));
700+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(976));
701701

702702
queryBuilder = new TermQueryBuilder("genre", "cooking");
703703
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
704704
assertThat(topFields.totalHits.value(), equalTo(1L));
705705
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("4"));
706-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(180L));
706+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(180));
707707
}
708708

709709
// Nested filter + query
@@ -721,9 +721,9 @@ public void testMultiLevelNestedSorting() throws IOException {
721721
);
722722
assertThat(topFields.totalHits.value(), equalTo(2L));
723723
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("2"));
724-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76L));
724+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76));
725725
assertThat(storedFields.document(topFields.scoreDocs[1].doc).get("_id"), equalTo("4"));
726-
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(87L));
726+
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(87));
727727

728728
sortBuilder.order(SortOrder.DESC);
729729
topFields = search(
@@ -734,9 +734,9 @@ public void testMultiLevelNestedSorting() throws IOException {
734734
);
735735
assertThat(topFields.totalHits.value(), equalTo(2L));
736736
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("4"));
737-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87L));
737+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87));
738738
assertThat(storedFields.document(topFields.scoreDocs[1].doc).get("_id"), equalTo("2"));
739-
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(76L));
739+
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(76));
740740
}
741741

742742
// Multiple Nested filters + query
@@ -759,9 +759,9 @@ public void testMultiLevelNestedSorting() throws IOException {
759759
);
760760
assertThat(topFields.totalHits.value(), equalTo(2L));
761761
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("4"));
762-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87L));
762+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87));
763763
assertThat(storedFields.document(topFields.scoreDocs[1].doc).get("_id"), equalTo("2"));
764-
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(Long.MAX_VALUE));
764+
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(Integer.MAX_VALUE));
765765

766766
sortBuilder.order(SortOrder.DESC);
767767
topFields = search(
@@ -772,9 +772,9 @@ public void testMultiLevelNestedSorting() throws IOException {
772772
);
773773
assertThat(topFields.totalHits.value(), equalTo(2L));
774774
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("4"));
775-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87L));
775+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87));
776776
assertThat(storedFields.document(topFields.scoreDocs[1].doc).get("_id"), equalTo("2"));
777-
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(Long.MIN_VALUE));
777+
assertThat(((FieldDoc) topFields.scoreDocs[1]).fields[0], equalTo(Integer.MIN_VALUE));
778778
}
779779

780780
// Nested filter + Specific genre
@@ -789,25 +789,25 @@ public void testMultiLevelNestedSorting() throws IOException {
789789
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
790790
assertThat(topFields.totalHits.value(), equalTo(1L));
791791
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("2"));
792-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76L));
792+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(76));
793793

794794
queryBuilder = new TermQueryBuilder("genre", "science fiction");
795795
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
796796
assertThat(topFields.totalHits.value(), equalTo(1L));
797797
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("1"));
798-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(Long.MAX_VALUE));
798+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(Integer.MAX_VALUE));
799799

800800
queryBuilder = new TermQueryBuilder("genre", "horror");
801801
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
802802
assertThat(topFields.totalHits.value(), equalTo(1L));
803803
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("3"));
804-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(Long.MAX_VALUE));
804+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(Integer.MAX_VALUE));
805805

806806
queryBuilder = new TermQueryBuilder("genre", "cooking");
807807
topFields = search(queryBuilder, sortBuilder, searchExecutionContext, searcher);
808808
assertThat(topFields.totalHits.value(), equalTo(1L));
809809
assertThat(storedFields.document(topFields.scoreDocs[0].doc).get("_id"), equalTo("4"));
810-
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87L));
810+
assertThat(((FieldDoc) topFields.scoreDocs[0]).fields[0], equalTo(87));
811811
}
812812

813813
searcher.getIndexReader().close();

‎server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ public void testGetMaxNumericSortValue() throws IOException {
468468
}
469469
case INTEGER -> {
470470
int v2 = randomInt();
471-
values[i] = (long) v2;
471+
values[i] = v2;
472472
doc.add(new IntPoint(fieldName, v2));
473473
}
474474
case DOUBLE -> {
@@ -488,12 +488,12 @@ public void testGetMaxNumericSortValue() throws IOException {
488488
}
489489
case BYTE -> {
490490
byte v6 = randomByte();
491-
values[i] = (long) v6;
491+
values[i] = (int) v6;
492492
doc.add(new IntPoint(fieldName, v6));
493493
}
494494
case SHORT -> {
495495
short v7 = randomShort();
496-
values[i] = (long) v7;
496+
values[i] = (int) v7;
497497
doc.add(new IntPoint(fieldName, v7));
498498
}
499499
default -> throw new AssertionError("unknown type " + numberType);

0 commit comments

Comments
 (0)