Skip to content

Commit 113d3ed

Browse files
karenyrxkarenyrx
committed
fix tests
Signed-off-by: Karen Xu <[email protected]>
1 parent d920cde commit 113d3ed

File tree

5 files changed

+117
-50
lines changed

5 files changed

+117
-50
lines changed

‎modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public static UpdateRequest buildUpdateRequest(
463463
* @param ifPrimaryTermFromOperation The primary term
464464
* @return The populated UpdateRequest
465465
*/
466-
private static UpdateRequest fromProto(
466+
static UpdateRequest fromProto(
467467
UpdateRequest updateRequest,
468468
ByteString documentBytes,
469469
BulkRequestBody bulkRequestBody,

‎modules/transport-grpc/src/test/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtilsTests.java‎

Lines changed: 100 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ public void testBuildCreateRequest() {
5454
"default-pipeline",
5555
1L,
5656
2L,
57-
false
57+
false,
58+
null,
59+
true
5860
);
5961

6062
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -97,7 +99,9 @@ public void testBuildIndexRequest() {
9799
"default-pipeline",
98100
1L,
99101
2L,
100-
false
102+
false,
103+
null,
104+
true
101105
);
102106

103107
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -132,7 +136,9 @@ public void testBuildIndexRequestWithOpType() {
132136
"default-pipeline",
133137
SequenceNumbers.UNASSIGNED_SEQ_NO,
134138
UNASSIGNED_PRIMARY_TERM,
135-
false
139+
false,
140+
null,
141+
true
136142
);
137143

138144
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -160,7 +166,9 @@ public void testBuildDeleteRequest() {
160166
1L,
161167
VersionType.INTERNAL,
162168
1L,
163-
2L
169+
2L,
170+
null,
171+
true
164172
);
165173

166174
assertNotNull("DeleteRequest should not be null", deleteRequest);
@@ -194,7 +202,7 @@ public void testBuildUpdateRequest() {
194202

195203
UpdateRequest updateRequest = BulkRequestParserProtoUtils.buildUpdateRequest(
196204
updateOperation,
197-
document,
205+
ByteString.copyFrom(document),
198206
bulkRequestBody,
199207
"default-index",
200208
"default-id",
@@ -204,7 +212,9 @@ public void testBuildUpdateRequest() {
204212
"default-pipeline",
205213
1L,
206214
2L,
207-
false
215+
false,
216+
null,
217+
true
208218
);
209219

210220
assertNotNull("UpdateRequest should not be null", updateRequest);
@@ -257,7 +267,8 @@ public void testGetDocWriteRequests() {
257267
"default-routing",
258268
null,
259269
"default-pipeline",
260-
false
270+
false,
271+
true
261272
);
262273

263274
assertNotNull("Requests should not be null", requests);
@@ -301,7 +312,8 @@ public void testGetDocWriteRequestsWithInvalidOperation() {
301312
"default-routing",
302313
null,
303314
"default-pipeline",
304-
false
315+
false,
316+
true
305317
)
306318
);
307319
}
@@ -322,7 +334,9 @@ public void testBuildCreateRequestWithDefaults() {
322334
"default-pipeline",
323335
1L,
324336
2L,
325-
false
337+
false,
338+
null,
339+
true
326340
);
327341

328342
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -349,7 +363,9 @@ public void testBuildCreateRequestWithPipeline() {
349363
"default-pipeline",
350364
1L,
351365
2L,
352-
false
366+
false,
367+
null,
368+
true
353369
);
354370

355371
assertEquals("Pipeline should use custom value", "custom-pipeline", indexRequest.getPipeline());
@@ -382,7 +398,9 @@ public void testBuildIndexRequestWithAllFields() {
382398
"default-pipeline",
383399
1L,
384400
2L,
385-
false
401+
false,
402+
null,
403+
true
386404
);
387405

388406
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -415,7 +433,9 @@ public void testBuildIndexRequestWithNullOpType() {
415433
"default-pipeline",
416434
1L,
417435
2L,
418-
false
436+
false,
437+
null,
438+
true
419439
);
420440

421441
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -454,7 +474,7 @@ public void testBuildUpdateRequestWithScript() {
454474

455475
UpdateRequest updateRequest = BulkRequestParserProtoUtils.buildUpdateRequest(
456476
updateOperation,
457-
document,
477+
ByteString.copyFrom(document),
458478
bulkRequestBody,
459479
"default-index",
460480
"default-id",
@@ -464,7 +484,9 @@ public void testBuildUpdateRequestWithScript() {
464484
"default-pipeline",
465485
1L,
466486
2L,
467-
false
487+
false,
488+
null,
489+
true
468490
);
469491

470492
assertNotNull("UpdateRequest should not be null", updateRequest);
@@ -486,7 +508,7 @@ public void testBuildUpdateRequestWithUpsert() {
486508

487509
UpdateRequest updateRequest = BulkRequestParserProtoUtils.buildUpdateRequest(
488510
updateOperation,
489-
document,
511+
ByteString.copyFrom(document),
490512
bulkRequestBody,
491513
"default-index",
492514
"default-id",
@@ -496,7 +518,9 @@ public void testBuildUpdateRequestWithUpsert() {
496518
"default-pipeline",
497519
1L,
498520
2L,
499-
false
521+
false,
522+
null,
523+
true
500524
);
501525

502526
assertNotNull("UpdateRequest should not be null", updateRequest);
@@ -516,7 +540,7 @@ public void testBuildUpdateRequestWithScriptedUpsert() {
516540

517541
UpdateRequest updateRequest = BulkRequestParserProtoUtils.buildUpdateRequest(
518542
updateOperation,
519-
document,
543+
ByteString.copyFrom(document),
520544
bulkRequestBody,
521545
"default-index",
522546
"default-id",
@@ -526,7 +550,9 @@ public void testBuildUpdateRequestWithScriptedUpsert() {
526550
"default-pipeline",
527551
1L,
528552
2L,
529-
false
553+
false,
554+
null,
555+
true
530556
);
531557

532558
assertNotNull("UpdateRequest should not be null", updateRequest);
@@ -550,7 +576,7 @@ public void testBuildUpdateRequestWithFetchSource() {
550576

551577
UpdateRequest updateRequest = BulkRequestParserProtoUtils.buildUpdateRequest(
552578
updateOperation,
553-
document,
579+
ByteString.copyFrom(document),
554580
bulkRequestBody,
555581
"default-index",
556582
"default-id",
@@ -560,7 +586,9 @@ public void testBuildUpdateRequestWithFetchSource() {
560586
"default-pipeline",
561587
1L,
562588
2L,
563-
false
589+
false,
590+
null,
591+
true
564592
);
565593

566594
assertNotNull("UpdateRequest should not be null", updateRequest);
@@ -579,7 +607,7 @@ public void testBuildUpdateRequestWithoutUpdateAction() {
579607

580608
UpdateRequest updateRequest = BulkRequestParserProtoUtils.buildUpdateRequest(
581609
updateOperation,
582-
document,
610+
ByteString.copyFrom(document),
583611
bulkRequestBody,
584612
"default-index",
585613
"default-id",
@@ -589,7 +617,9 @@ public void testBuildUpdateRequestWithoutUpdateAction() {
589617
"default-pipeline",
590618
1L,
591619
2L,
592-
false
620+
false,
621+
null,
622+
true
593623
);
594624

595625
assertNotNull("UpdateRequest should not be null", updateRequest);
@@ -608,7 +638,9 @@ public void testBuildDeleteRequestWithDefaults() {
608638
1L,
609639
VersionType.INTERNAL,
610640
1L,
611-
2L
641+
2L,
642+
null,
643+
true
612644
);
613645

614646
assertNotNull("DeleteRequest should not be null", deleteRequest);
@@ -642,7 +674,8 @@ public void testGetDocWriteRequestsWithGlobalValues() {
642674
null, // Pass null to test global routing
643675
null,
644676
null, // Pass null to test global pipeline
645-
null // Pass null to test global requireAlias
677+
null, // Pass null to test global requireAlias
678+
true
646679
);
647680

648681
assertNotNull("Requests should not be null", requests);
@@ -666,7 +699,8 @@ public void testGetDocWriteRequestsWithEmptyList() {
666699
"default-routing",
667700
null,
668701
"default-pipeline",
669-
false
702+
false,
703+
true
670704
);
671705

672706
assertNotNull("Requests should not be null", requests);
@@ -705,7 +739,13 @@ public void testFromProtoWithAllUpdateActionFields() {
705739

706740
UpdateOperation updateOperation = UpdateOperation.newBuilder().setIfSeqNo(123L).setIfPrimaryTerm(456L).build();
707741

708-
UpdateRequest result = BulkRequestParserProtoUtils.fromProto(updateRequest, document, bulkRequestBody, updateOperation);
742+
UpdateRequest result = BulkRequestParserProtoUtils.fromProto(
743+
updateRequest,
744+
ByteString.copyFrom(document),
745+
bulkRequestBody,
746+
123L,
747+
456L
748+
);
709749

710750
assertNotNull("Result should not be null", result);
711751
assertNotNull("Script should be set", result.script());
@@ -735,7 +775,9 @@ public void testBuildCreateRequestWithSmileContent() throws Exception {
735775
null,
736776
SequenceNumbers.UNASSIGNED_SEQ_NO,
737777
UNASSIGNED_PRIMARY_TERM,
738-
false
778+
false,
779+
null,
780+
true
739781
);
740782

741783
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -763,7 +805,9 @@ public void testBuildCreateRequestWithCborContent() throws Exception {
763805
null,
764806
SequenceNumbers.UNASSIGNED_SEQ_NO,
765807
UNASSIGNED_PRIMARY_TERM,
766-
false
808+
false,
809+
null,
810+
true
767811
);
768812

769813
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -792,7 +836,9 @@ public void testBuildIndexRequestWithSmileContent() throws Exception {
792836
null,
793837
SequenceNumbers.UNASSIGNED_SEQ_NO,
794838
UNASSIGNED_PRIMARY_TERM,
795-
false
839+
false,
840+
null,
841+
true
796842
);
797843

798844
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -820,7 +866,9 @@ public void testBuildIndexRequestWithCborContent() throws Exception {
820866
null,
821867
SequenceNumbers.UNASSIGNED_SEQ_NO,
822868
UNASSIGNED_PRIMARY_TERM,
823-
false
869+
false,
870+
null,
871+
true
824872
);
825873

826874
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -843,7 +891,13 @@ public void testUpdateRequestWithCborUpsert() throws Exception {
843891

844892
UpdateOperation updateOperation = UpdateOperation.newBuilder().build();
845893

846-
UpdateRequest result = BulkRequestParserProtoUtils.fromProto(updateRequest, document, bulkRequestBody, updateOperation);
894+
UpdateRequest result = BulkRequestParserProtoUtils.fromProto(
895+
updateRequest,
896+
ByteString.copyFrom(document),
897+
bulkRequestBody,
898+
SequenceNumbers.UNASSIGNED_SEQ_NO,
899+
SequenceNumbers.UNASSIGNED_PRIMARY_TERM
900+
);
847901

848902
assertNotNull("Result should not be null", result);
849903
assertNotNull("Upsert should be set", result.upsertRequest());
@@ -865,7 +919,9 @@ public void testBuildCreateRequestWithEmptyDocument() {
865919
null,
866920
SequenceNumbers.UNASSIGNED_SEQ_NO,
867921
UNASSIGNED_PRIMARY_TERM,
868-
false
922+
false,
923+
null,
924+
true
869925
);
870926

871927
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -891,7 +947,9 @@ public void testBuildCreateRequestWithJsonContent() throws Exception {
891947
null,
892948
SequenceNumbers.UNASSIGNED_SEQ_NO,
893949
UNASSIGNED_PRIMARY_TERM,
894-
false
950+
false,
951+
null,
952+
true
895953
);
896954

897955
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -919,7 +977,9 @@ public void testBuildCreateRequestWithYamlContent() throws Exception {
919977
null,
920978
SequenceNumbers.UNASSIGNED_SEQ_NO,
921979
UNASSIGNED_PRIMARY_TERM,
922-
false
980+
false,
981+
null,
982+
true
923983
);
924984

925985
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -948,7 +1008,9 @@ public void testBuildIndexRequestWithJsonContent() throws Exception {
9481008
null,
9491009
SequenceNumbers.UNASSIGNED_SEQ_NO,
9501010
UNASSIGNED_PRIMARY_TERM,
951-
false
1011+
false,
1012+
null,
1013+
true
9521014
);
9531015

9541016
assertNotNull("IndexRequest should not be null", indexRequest);
@@ -976,7 +1038,9 @@ public void testBuildIndexRequestWithYamlContent() throws Exception {
9761038
null,
9771039
SequenceNumbers.UNASSIGNED_SEQ_NO,
9781040
UNASSIGNED_PRIMARY_TERM,
979-
false
1041+
false,
1042+
null,
1043+
true
9801044
);
9811045

9821046
assertNotNull("IndexRequest should not be null", indexRequest);

0 commit comments

Comments
 (0)