|
7 | 7 | using Xunit.Abstractions; |
8 | 8 | using Xunit.Sdk; |
9 | 9 |
|
| 10 | +using CoreSubOrchestrationFailedException = DurableTask.Core.Exceptions.SubOrchestrationFailedException; |
| 11 | + |
10 | 12 | namespace Microsoft.DurableTask.Grpc.Tests; |
11 | 13 |
|
12 | 14 | /// <summary> |
@@ -427,7 +429,7 @@ public async Task RetrySubOrchestratorFailuresCustomLogic(int expectedNumberOfAt |
427 | 429 | } |
428 | 430 |
|
429 | 431 | // This handler only works with CustomException |
430 | | - if (!retryContext.LastFailure.IsCausedBy(exceptionType)) |
| 432 | + if (!retryContext.LastFailure.IsCausedBy(typeof(CoreSubOrchestrationFailedException))) |
431 | 433 | { |
432 | 434 | return false; |
433 | 435 | } |
@@ -543,8 +545,8 @@ static void ValidateInnermostFailureDetailsChain(TaskFailureDetails? failureDeta |
543 | 545 | { |
544 | 546 | // Outer failure represents the orchestration failure |
545 | 547 | Assert.NotNull(ex.FailureDetails); |
546 | | - Assert.True(ex.FailureDetails.IsCausedBy<TaskFailedException>()); |
547 | | - Assert.Contains("ThrowException", ex.FailureDetails.ErrorMessage); |
| 548 | + Assert.True(ex.FailureDetails.IsCausedBy<CoreSubOrchestrationFailedException>()); |
| 549 | + Assert.Contains("Exception of type", ex.FailureDetails.ErrorMessage); |
548 | 550 |
|
549 | 551 | // Inner failure represents the original exception thrown by the activity |
550 | 552 | ValidateInnermostFailureDetailsChain(ex.FailureDetails.InnerFailure); |
@@ -583,8 +585,8 @@ static void ValidateInnermostFailureDetailsChain(TaskFailureDetails? failureDeta |
583 | 585 | Assert.True(metadata.FailureDetails!.IsCausedBy<TaskFailedException>()); |
584 | 586 | Assert.Contains("Sub", metadata.FailureDetails.ErrorMessage); |
585 | 587 | Assert.NotNull(metadata.FailureDetails.InnerFailure); |
586 | | - Assert.True(metadata.FailureDetails.InnerFailure!.IsCausedBy<TaskFailedException>()); |
587 | | - Assert.Contains("ThrowException", metadata.FailureDetails.InnerFailure.ErrorMessage); |
| 588 | + Assert.True(metadata.FailureDetails.InnerFailure!.IsCausedBy<CoreSubOrchestrationFailedException>()); |
| 589 | + Assert.Contains("Exception of type", metadata.FailureDetails.InnerFailure.ErrorMessage); |
588 | 590 |
|
589 | 591 | ValidateInnermostFailureDetailsChain(metadata.FailureDetails.InnerFailure.InnerFailure); |
590 | 592 | } |
|
0 commit comments