Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDKTestWorkflowRule wasn't calling shutdown #2243

Merged
merged 2 commits into from
Oct 1, 2024
Merged

SDKTestWorkflowRule wasn't calling shutdown #2243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7593463
Fixed SDKTestWorkflowRule to call shutdown
mfateev Sep 28, 2024
6d1d463
Fixed test broken after rule fix
mfateev Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions temporal-sdk/src/test/java/io/temporal/workflow/SagaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public void testSaga() {
"activity customActivity1",
"executeChildWorkflow TestNoArgsWorkflowFunc",
"interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
"registerUpdateHandlers update",
"newThread workflow-method",
"executeActivity ThrowIO",
"activity ThrowIO",
Expand Down
1 change: 0 additions & 1 deletion ...ral-sdk/src/test/java/io/temporal/workflow/activityTests/ParallelLocalActivitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public void testParallelLocalActivities() {
expected.add("newThread workflow-method");
for (int i = 0; i < TestParallelLocalActivitiesWorkflowImpl.COUNT; i++) {
expected.add("executeLocalActivity SleepActivity");
expected.add("currentTimeMillis");
}
for (int i = 0; i < TestParallelLocalActivitiesWorkflowImpl.COUNT; i++) {
expected.add("local activity SleepActivity");
Expand Down
4 changes: 0 additions & 4 deletions temporal-sdk/src/test/java/io/temporal/workflow/activityTests/TestLocalActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ public void testLocalActivity() {
"interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
"newThread workflow-method",
"executeLocalActivity ThrowIO",
"currentTimeMillis",
"local activity ThrowIO",
"local activity ThrowIO",
"local activity ThrowIO",
"executeLocalActivity Activity2",
"currentTimeMillis",
"local activity Activity2",
"executeActivity Activity2",
"activity Activity2");
Expand Down Expand Up @@ -115,12 +113,10 @@ public void testLocalActivityNoInput() {
"interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
"newThread workflow-method",
"executeLocalActivity ThrowIO",
"currentTimeMillis",
"local activity ThrowIO",
"local activity ThrowIO",
"local activity ThrowIO",
"executeLocalActivity Activity2",
"currentTimeMillis",
"local activity Activity2",
"executeActivity Activity2",
"activity Activity2");
Expand Down
8 changes: 6 additions & 2 deletions ...al-sdk/src/test/java/io/temporal/workflow/searchattributes/UpsertSearchAttributeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,12 @@ public void testUpsertSearchAttributes() {
"interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
"newThread workflow-method",
"upsertSearchAttributes",
"executeActivity Activity",
"activity Activity");
"sleep PT0.1S",
"upsertSearchAttributes",
"sleep PT0.1S",
"upsertSearchAttributes",
"upsertSearchAttributes",
"sleep PT0.1S");
testWorkflowRule.assertHistoryEvent(
execution.getWorkflowId(), EventType.EVENT_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES);
}
Expand Down
13 changes: 10 additions & 3 deletions ...k/src/test/java/io/temporal/workflow/searchattributes/UpsertTypedSearchAttributeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,16 @@ public void testUpsertSearchAttributes() {
.setExpected(
"interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
"newThread workflow-method",
"upsertSearchAttributes",
"executeActivity Activity",
"activity Activity");
"upsertTypedSearchAttributes",
"sleep PT0.1S",
"upsertTypedSearchAttributes",
"sleep PT0.1S",
"upsertTypedSearchAttributes",
"upsertTypedSearchAttributes",
"sleep PT0.1S",
"upsertTypedSearchAttributes",
"upsertTypedSearchAttributes",
"upsertTypedSearchAttributes");
testWorkflowRule.assertHistoryEvent(
execution.getWorkflowId(), EventType.EVENT_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES);
}
Expand Down
9 changes: 8 additions & 1 deletion temporal-testing/src/main/java/io/temporal/testing/internal/SDKTestWorkflowRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,14 @@ public SDKTestWorkflowRule build() {
}

public Statement apply(@Nonnull Statement base, Description description) {
Statement testWorkflowStatement = base;
Statement testWorkflowStatement =
new Statement() {
@Override
public void evaluate() throws Throwable {
base.evaluate();
shutdown();
}
};

Test annotation = description.getAnnotation(Test.class);
boolean timeoutIsOverriddenOnTestAnnotation = annotation != null && annotation.timeout() > 0;
Expand Down
Loading