Skip to content

Commit c7070b3

Browse files
shijieshengshijiesheng
committed
fix unit test related to queryconsistency
1 parent c724977 commit c7070b3

File tree

10 files changed

+77
-37
lines changed

10 files changed

+77
-37
lines changed

‎src/gen/java/com/uber/cadence/DescribeWorkflowExecutionRequest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
public class DescribeWorkflowExecutionRequest {
1010
private String domain;
1111
private WorkflowExecution execution;
12+
private QueryConsistencyLevel queryConsistencyLevel;
1213
}

‎src/main/java/com/uber/cadence/internal/compatibility/proto/mappers/RequestMapper.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ public static DescribeWorkflowExecutionRequest describeWorkflowExecutionRequest(
403403
return DescribeWorkflowExecutionRequest.newBuilder()
404404
.setDomain(t.getDomain())
405405
.setWorkflowExecution(workflowExecution(t.getExecution()))
406+
.setQueryConsistencyLevel(queryConsistencyLevel(t.getQueryConsistencyLevel()))
406407
.build();
407408
}
408409

@@ -418,7 +419,8 @@ public static GetWorkflowExecutionHistoryRequest getWorkflowExecutionHistoryRequ
418419
.setPageSize(t.getMaximumPageSize())
419420
.setWaitForNewEvent(t.isWaitForNewEvent())
420421
.setHistoryEventFilterType(eventFilterType(t.getHistoryEventFilterType()))
421-
.setSkipArchival(t.isSkipArchival());
422+
.setSkipArchival(t.isSkipArchival())
423+
.setQueryConsistencyLevel(queryConsistencyLevel(t.getQueryConsistencyLevel()));
422424
if (t.getNextPageToken() != null) {
423425
builder.setNextPageToken(arrayToByteString(t.getNextPageToken()));
424426
}

‎src/main/java/com/uber/cadence/internal/sync/TestActivityEnvironmentInternal.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,8 @@ public CountWorkflowExecutionsResponse CountWorkflowExecutions(
520520

521521
@Override
522522
public GetSearchAttributesResponse GetSearchAttributes()
523-
throws InternalServiceError, ServiceBusyError, ClientVersionNotSupportedError, CadenceError {
523+
throws InternalServiceError, ServiceBusyError, ClientVersionNotSupportedError,
524+
CadenceError {
524525
return impl.GetSearchAttributes();
525526
}
526527

@@ -559,7 +560,8 @@ public DescribeTaskListResponse DescribeTaskList(DescribeTaskListRequest request
559560
}
560561

561562
@Override
562-
public ClusterInfo GetClusterInfo() throws InternalServiceError, ServiceBusyError, CadenceError {
563+
public ClusterInfo GetClusterInfo()
564+
throws InternalServiceError, ServiceBusyError, CadenceError {
563565
return impl.GetClusterInfo();
564566
}
565567

@@ -580,13 +582,15 @@ public void RefreshWorkflowTasks(RefreshWorkflowTasksRequest request)
580582

581583
@Override
582584
public void RegisterDomain(
583-
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler) throws CadenceError {
585+
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler)
586+
throws CadenceError {
584587
impl.RegisterDomain(registerRequest, resultHandler);
585588
}
586589

587590
@Override
588591
public void DescribeDomain(
589-
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler) throws CadenceError {
592+
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler)
593+
throws CadenceError {
590594
impl.DescribeDomain(describeRequest, resultHandler);
591595
}
592596

@@ -625,7 +629,8 @@ public void RestartWorkflowExecution(
625629

626630
@Override
627631
public void GetTaskListsByDomain(
628-
GetTaskListsByDomainRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
632+
GetTaskListsByDomainRequest request, AsyncMethodCallback resultHandler)
633+
throws CadenceError {
629634
impl.GetTaskListsByDomain(request, resultHandler);
630635
}
631636

@@ -902,13 +907,15 @@ public void GetClusterInfo(AsyncMethodCallback resultHandler) throws CadenceErro
902907

903908
@Override
904909
public void ListTaskListPartitions(
905-
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
910+
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler)
911+
throws CadenceError {
906912
impl.ListTaskListPartitions(request, resultHandler);
907913
}
908914

909915
@Override
910916
public void RefreshWorkflowTasks(
911-
RefreshWorkflowTasksRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
917+
RefreshWorkflowTasksRequest request, AsyncMethodCallback resultHandler)
918+
throws CadenceError {
912919
impl.RefreshWorkflowTasks(request, resultHandler);
913920
}
914921

‎src/main/java/com/uber/cadence/internal/sync/TestWorkflowEnvironmentInternal.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ public DescribeTaskListResponse DescribeTaskList(DescribeTaskListRequest request
446446
}
447447

448448
@Override
449-
public ClusterInfo GetClusterInfo() throws InternalServiceError, ServiceBusyError, CadenceError {
449+
public ClusterInfo GetClusterInfo()
450+
throws InternalServiceError, ServiceBusyError, CadenceError {
450451
return impl.GetClusterInfo();
451452
}
452453

@@ -465,13 +466,15 @@ public void RefreshWorkflowTasks(RefreshWorkflowTasksRequest request)
465466

466467
@Override
467468
public void RegisterDomain(
468-
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler) throws CadenceError {
469+
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler)
470+
throws CadenceError {
469471
impl.RegisterDomain(registerRequest, resultHandler);
470472
}
471473

472474
@Override
473475
public void DescribeDomain(
474-
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler) throws CadenceError {
476+
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler)
477+
throws CadenceError {
475478
impl.DescribeDomain(describeRequest, resultHandler);
476479
}
477480

@@ -510,7 +513,8 @@ public void RestartWorkflowExecution(
510513

511514
@Override
512515
public void GetTaskListsByDomain(
513-
GetTaskListsByDomainRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
516+
GetTaskListsByDomainRequest request, AsyncMethodCallback resultHandler)
517+
throws CadenceError {
514518
impl.GetTaskListsByDomain(request, resultHandler);
515519
}
516520

@@ -792,13 +796,15 @@ public void GetClusterInfo(AsyncMethodCallback resultHandler) throws CadenceErro
792796

793797
@Override
794798
public void ListTaskListPartitions(
795-
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
799+
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler)
800+
throws CadenceError {
796801
impl.ListTaskListPartitions(request, resultHandler);
797802
}
798803

799804
@Override
800805
public void RefreshWorkflowTasks(
801-
RefreshWorkflowTasksRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
806+
RefreshWorkflowTasksRequest request, AsyncMethodCallback resultHandler)
807+
throws CadenceError {
802808
impl.RefreshWorkflowTasks(request, resultHandler);
803809
}
804810

‎src/main/java/com/uber/cadence/internal/testservice/TestWorkflowService.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -834,13 +834,15 @@ public void RefreshWorkflowTasks(RefreshWorkflowTasksRequest request)
834834

835835
@Override
836836
public void RegisterDomain(
837-
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler) throws CadenceError {
837+
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler)
838+
throws CadenceError {
838839
throw new UnsupportedOperationException("not implemented");
839840
}
840841

841842
@Override
842843
public void DescribeDomain(
843-
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler) throws CadenceError {
844+
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler)
845+
throws CadenceError {
844846
throw new UnsupportedOperationException("not implemented");
845847
}
846848

@@ -865,7 +867,8 @@ public void UpdateDomain(UpdateDomainRequest updateRequest, AsyncMethodCallback
865867

866868
@Override
867869
public void DeprecateDomain(
868-
DeprecateDomainRequest deprecateRequest, AsyncMethodCallback resultHandler) throws CadenceError {
870+
DeprecateDomainRequest deprecateRequest, AsyncMethodCallback resultHandler)
871+
throws CadenceError {
869872
throw new UnsupportedOperationException("not implemented");
870873
}
871874

@@ -972,7 +975,8 @@ public CompletableFuture<Boolean> isHealthy() {
972975

973976
@Override
974977
public void PollForDecisionTask(
975-
PollForDecisionTaskRequest pollRequest, AsyncMethodCallback resultHandler) throws CadenceError {
978+
PollForDecisionTaskRequest pollRequest, AsyncMethodCallback resultHandler)
979+
throws CadenceError {
976980
throw new UnsupportedOperationException("not implemented");
977981
}
978982

@@ -992,7 +996,8 @@ public void RespondDecisionTaskFailed(
992996

993997
@Override
994998
public void PollForActivityTask(
995-
PollForActivityTaskRequest pollRequest, AsyncMethodCallback resultHandler) throws CadenceError {
999+
PollForActivityTaskRequest pollRequest, AsyncMethodCallback resultHandler)
1000+
throws CadenceError {
9961001
throw new UnsupportedOperationException("not implemented");
9971002
}
9981003

@@ -1167,7 +1172,8 @@ public void RespondQueryTaskCompleted(
11671172

11681173
@Override
11691174
public void ResetStickyTaskList(
1170-
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler) throws CadenceError {
1175+
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler)
1176+
throws CadenceError {
11711177
throw new UnsupportedOperationException("not implemented");
11721178
}
11731179

@@ -1197,7 +1203,8 @@ public void GetClusterInfo(AsyncMethodCallback resultHandler) throws CadenceErro
11971203

11981204
@Override
11991205
public void ListTaskListPartitions(
1200-
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
1206+
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler)
1207+
throws CadenceError {
12011208
throw new UnsupportedOperationException("not implemented");
12021209
}
12031210

‎src/main/java/com/uber/cadence/migration/MigrationIWorkflowService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,8 @@ public ListClosedWorkflowExecutionsResponse ListClosedWorkflowExecutions(
419419
}
420420

421421
@Override
422-
public QueryWorkflowResponse QueryWorkflow(QueryWorkflowRequest queryRequest) throws CadenceError {
422+
public QueryWorkflowResponse QueryWorkflow(QueryWorkflowRequest queryRequest)
423+
throws CadenceError {
423424

424425
try {
425426
if (shouldStartInNew(queryRequest.getExecution().getWorkflowId()))

‎src/main/java/com/uber/cadence/serviceclient/IWorkflowService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,8 @@ GetTaskListsByDomainResponse GetTaskListsByDomain(GetTaskListsByDomainRequest re
606606
* @param request
607607
*/
608608
ListTaskListPartitionsResponse ListTaskListPartitions(ListTaskListPartitionsRequest request)
609-
throws BadRequestError, EntityNotExistsError, LimitExceededError, ServiceBusyError, CadenceError;
609+
throws BadRequestError, EntityNotExistsError, LimitExceededError, ServiceBusyError,
610+
CadenceError;
610611

611612
/**
612613
* RefreshWorkflowTasks refreshes all tasks of a workflow

‎src/main/java/com/uber/cadence/serviceclient/IWorkflowServiceBase.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,20 +373,22 @@ public void RefreshWorkflowTasks(RefreshWorkflowTasksRequest request)
373373

374374
@Override
375375
public void RegisterDomain(
376-
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler) throws CadenceError {
376+
RegisterDomainRequest registerRequest, AsyncMethodCallback resultHandler)
377+
throws CadenceError {
377378
throw new UnsupportedOperationException("unimplemented");
378379
}
379380

380381
@Override
381382
public void DescribeDomain(
382-
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler) throws CadenceError {
383+
DescribeDomainRequest describeRequest, AsyncMethodCallback resultHandler)
384+
throws CadenceError {
383385
throw new UnsupportedOperationException("unimplemented");
384386
}
385387

386388
@Override
387389
public void DiagnoseWorkflowExecution(
388390
DiagnoseWorkflowExecutionRequest diagnoseRequest, AsyncMethodCallback resultHandler)
389-
throws TException {
391+
throws CadenceError {
390392
throw new UnsupportedOperationException("DiagnoseWorkflowExecution is not implemented");
391393
}
392394

@@ -404,7 +406,8 @@ public void UpdateDomain(UpdateDomainRequest updateRequest, AsyncMethodCallback
404406

405407
@Override
406408
public void DeprecateDomain(
407-
DeprecateDomainRequest deprecateRequest, AsyncMethodCallback resultHandler) throws CadenceError {
409+
DeprecateDomainRequest deprecateRequest, AsyncMethodCallback resultHandler)
410+
throws CadenceError {
408411
throw new UnsupportedOperationException("unimplemented");
409412
}
410413

@@ -438,7 +441,8 @@ public void GetWorkflowExecutionHistory(
438441

439442
@Override
440443
public void PollForDecisionTask(
441-
PollForDecisionTaskRequest pollRequest, AsyncMethodCallback resultHandler) throws CadenceError {
444+
PollForDecisionTaskRequest pollRequest, AsyncMethodCallback resultHandler)
445+
throws CadenceError {
442446
throw new UnsupportedOperationException("unimplemented");
443447
}
444448

@@ -458,7 +462,8 @@ public void RespondDecisionTaskFailed(
458462

459463
@Override
460464
public void PollForActivityTask(
461-
PollForActivityTaskRequest pollRequest, AsyncMethodCallback resultHandler) throws CadenceError {
465+
PollForActivityTaskRequest pollRequest, AsyncMethodCallback resultHandler)
466+
throws CadenceError {
462467
throw new UnsupportedOperationException("unimplemented");
463468
}
464469

@@ -618,7 +623,8 @@ public void RespondQueryTaskCompleted(
618623

619624
@Override
620625
public void ResetStickyTaskList(
621-
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler) throws CadenceError {
626+
ResetStickyTaskListRequest resetRequest, AsyncMethodCallback resultHandler)
627+
throws CadenceError {
622628
throw new UnsupportedOperationException("unimplemented");
623629
}
624630

@@ -654,7 +660,8 @@ public void GetTaskListsByDomain(
654660

655661
@Override
656662
public void ListTaskListPartitions(
657-
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler) throws CadenceError {
663+
ListTaskListPartitionsRequest request, AsyncMethodCallback resultHandler)
664+
throws CadenceError {
658665
throw new UnsupportedOperationException("unimplemented");
659666
}
660667

‎src/test/java/com/uber/cadence/internal/compatibility/ClientObjects.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,10 @@ public class ClientObjects {
851851
.setQuery("query");
852852

853853
public static final DescribeWorkflowExecutionRequest DESCRIBE_WORKFLOW_EXECUTION_REQUEST =
854-
new DescribeWorkflowExecutionRequest().setDomain("domain").setExecution(WORKFLOW_EXECUTION);
854+
new DescribeWorkflowExecutionRequest()
855+
.setDomain("domain")
856+
.setExecution(WORKFLOW_EXECUTION)
857+
.setQueryConsistencyLevel(QueryConsistencyLevel.STRONG);
855858

856859
public static final GetWorkflowExecutionHistoryRequest GET_WORKFLOW_EXECUTION_HISTORY_REQUEST =
857860
new GetWorkflowExecutionHistoryRequest()
@@ -861,7 +864,8 @@ public class ClientObjects {
861864
.setWaitForNewEvent(true)
862865
.setHistoryEventFilterType(HistoryEventFilterType.CLOSE_EVENT)
863866
.setSkipArchival(true)
864-
.setNextPageToken(utf8("nextPageToken"));
867+
.setNextPageToken(utf8("nextPageToken"))
868+
.setQueryConsistencyLevel(QueryConsistencyLevel.STRONG);
865869

866870
public static final StartWorkflowExecutionRequest START_WORKFLOW_EXECUTION =
867871
new StartWorkflowExecutionRequest()

‎src/test/java/com/uber/cadence/internal/replay/ReplaceDeciderDecisionTaskWithHistoryIteratorTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ public void setUp() {
113113

114114
@Test
115115
public void testGetHistoryWithSinglePageOfEvents()
116-
throws CadenceError, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
116+
throws CadenceError, NoSuchMethodException, InvocationTargetException,
117+
IllegalAccessException {
117118
// Arrange
118119
List<HistoryEvent> events = Arrays.asList(createMockHistoryEvent(2), createMockHistoryEvent(3));
119120
History mockHistory = new History().setEvents(events);
@@ -141,7 +142,8 @@ public void testGetHistoryWithSinglePageOfEvents()
141142

142143
@Test
143144
public void testGetHistoryWithMultiplePages()
144-
throws CadenceError, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
145+
throws CadenceError, NoSuchMethodException, InvocationTargetException,
146+
IllegalAccessException {
145147
// First page events
146148
List<HistoryEvent> firstPageEvents =
147149
Arrays.asList(createMockHistoryEvent(1), createMockHistoryEvent(2));
@@ -191,7 +193,8 @@ public void testGetHistoryWithMultiplePages()
191193

192194
@Test(expected = Error.class)
193195
public void testGetHistoryFailure()
194-
throws InvocationTargetException, IllegalAccessException, NoSuchMethodException, CadenceError {
196+
throws InvocationTargetException, IllegalAccessException, NoSuchMethodException,
197+
CadenceError {
195198
when(mockService.GetWorkflowExecutionHistory(
196199
new GetWorkflowExecutionHistoryRequest()
197200
.setDomain(DOMAIN)
@@ -212,7 +215,8 @@ public void testGetHistoryFailure()
212215

213216
@Test(expected = Error.class)
214217
public void testEmptyHistory()
215-
throws InvocationTargetException, IllegalAccessException, NoSuchMethodException, CadenceError {
218+
throws InvocationTargetException, IllegalAccessException, NoSuchMethodException,
219+
CadenceError {
216220
when(mockService.GetWorkflowExecutionHistory(
217221
new GetWorkflowExecutionHistoryRequest()
218222
.setDomain(DOMAIN)

0 commit comments

Comments
 (0)