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

Test continue as new with local activities #1922

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Test continue as new with local activities #1922

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
e08eaea
Test continue as new with local activities
Quinn-With-Two-Ns Nov 2, 2023
25e9ee7
Fix formatting
Quinn-With-Two-Ns Nov 3, 2023
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
13 changes: 8 additions & 5 deletions .../test/java/io/temporal/workflow/activityTests/LocalActivityInTheLastWorkflowTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ public class LocalActivityInTheLastWorkflowTaskTest {
.build();

@Test
@Parameters({"true", "false"})
public void testLocalActivityInTheLastWorkflowTask(boolean blockOnLA) {
@Parameters({"true, true", "false, true", "true, false", "false, false"})
public void testLocalActivityInTheLastWorkflowTask(boolean blockOnLA, boolean continueAsNew) {
TestWorkflow client = testWorkflowRule.newWorkflowStub(TestWorkflow.class);
assertEquals("done", client.execute(blockOnLA));
assertEquals("done", client.execute(blockOnLA, continueAsNew));
}

@WorkflowInterface
public interface TestWorkflow {
@WorkflowMethod
String execute(boolean blockOnLA);
String execute(boolean blockOnLA, boolean continueAsNew);
}

public static class TestWorkflowImpl implements TestWorkflow {
Expand All @@ -65,13 +65,16 @@ public static class TestWorkflowImpl implements TestWorkflow {
.build());

@Override
public String execute(boolean blockOnLA) {
public String execute(boolean blockOnLA, boolean continueAsNew) {
if (blockOnLA) {
Promise promise = Async.procedure(activities::sleepActivity, (long) 100, 0);
Async.procedure(activities::sleepActivity, (long) 1000, 0);
promise.get();
}
Async.procedure(activities::sleepActivity, (long) 1000, 0);
if (continueAsNew) {
Workflow.continueAsNew(blockOnLA, false);
}
return "done";
}
}
Expand Down
27 changes: 18 additions & 9 deletions ...va/io/temporal/workflow/signalTests/SignalWithLocalActivityInTheLastWorkflowTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,27 @@ public class SignalWithLocalActivityInTheLastWorkflowTaskTest {
.build();

@Test
@Parameters({"true", "false"})
public void testSignalWithLocalActivityInTheLastWorkflowTask(Boolean waitOnLA) {
@Parameters({"true, true", "false, true", "true, false", "false, false"})
public void testSignalWithLocalActivityInTheLastWorkflowTask(
Boolean waitOnLA, Boolean continueAsNew) {
TestSignaledWorkflow client = testWorkflowRule.newWorkflowStub(TestSignaledWorkflow.class);
WorkflowStub.fromTyped(client)
.signalWithStart("testSignal", new String[] {"signalValue"}, new Boolean[] {waitOnLA});
assertEquals("done", client.execute());
.signalWithStart("signal", new Boolean[] {waitOnLA, continueAsNew}, new Boolean[] {true});
assertEquals("done", client.execute(true));
}

@WorkflowInterface
public interface TestSignaledWorkflow {

@WorkflowMethod
String execute();
String execute(Boolean wait);

@SignalMethod
void signal(boolean waitOnLA);
void signal(boolean waitOnLA, boolean continueAsNew);
}

public static class TestSignalWorkflowImpl implements TestSignaledWorkflow {
boolean finish = false;

private final TestActivities.VariousTestActivities activities =
Workflow.newLocalActivityStub(
Expand All @@ -72,18 +74,25 @@ public static class TestSignalWorkflowImpl implements TestSignaledWorkflow {
.build());

@Override
public String execute() {
public String execute(Boolean wait) {
if (wait) {
Workflow.await(() -> finish);
}
return "done";
}

@Override
public void signal(boolean waitOnLA) {
public void signal(boolean waitOnLA, boolean continueAsNew) {
if (waitOnLA) {
Promise promise = Async.procedure(activities::sleepActivity, (long) 100, 0);
Async.procedure(activities::sleepActivity, (long) 1000, 0);
Async.procedure(activities::sleepActivity, (long) 10000, 0);
Copy link
Contributor

@mjameswh mjameswh Nov 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please just confirm this change is intentional? Its not immediately clear to me why you needed that.

promise.get();
}

if (continueAsNew) {
Workflow.continueAsNew(false);
}
finish = true;
activities.sleepActivity(1000, 0);
}
}
Expand Down
35 changes: 20 additions & 15 deletions ...ava/io/temporal/workflow/updateTest/UpdateWithLocalActivityInTheLastWorkflowTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,38 +44,37 @@ public class UpdateWithLocalActivityInTheLastWorkflowTaskTest {
.build();

@Test
@Parameters({"true", "false"})
public void testUpdateWithLocalActivityInTheLastWorkflowTask(Boolean waitOnLA)
throws InterruptedException {
@Parameters({"true, true", "false, true", "true, false", "false, false"})
public void testUpdateWithLocalActivityInTheLastWorkflowTask(
Boolean waitOnLA, Boolean continueAsNew) {
WorkflowWithUpdate client = testWorkflowRule.newWorkflowStub(WorkflowWithUpdate.class);

WorkflowStub.fromTyped(client).start();
WorkflowStub.fromTyped(client).start(true);
Thread asyncUpdate =
new Thread(
() -> {
try {
client.update(waitOnLA);
client.update(waitOnLA, continueAsNew);
} catch (Exception e) {
}
});
asyncUpdate.start();
assertEquals("done", client.execute());
assertEquals("done", client.execute(true));
asyncUpdate.interrupt();
}

@WorkflowInterface
public interface WorkflowWithUpdate {

@WorkflowMethod
String execute();
String execute(Boolean finish);

@UpdateMethod
String update(Boolean waitOnLA);
String update(Boolean waitOnLA, Boolean continueAsNew);
}

public static class WorkflowWithUpdateImpl implements WorkflowWithUpdate {
Boolean finish = false;

boolean finish = false;
private final TestActivities.VariousTestActivities activities =
Workflow.newLocalActivityStub(
TestActivities.VariousTestActivities.class,
Expand All @@ -84,18 +83,24 @@ public static class WorkflowWithUpdateImpl implements WorkflowWithUpdate {
.build());

@Override
public String execute() {
Workflow.await(() -> finish);
public String execute(Boolean wait) {
if (wait) {
Workflow.await(() -> finish);
}
return "done";
}

@Override
public String update(Boolean waitOnLA) {
public String update(Boolean waitOnLA, Boolean continueAsNew) {
if (waitOnLA) {
Promise promise = Async.procedure(activities::sleepActivity, (long) 100, 0);
Async.procedure(activities::sleepActivity, (long) 1000, 0);
Promise promise = Async.procedure(activities::sleepActivity, (long) 10, 0);
Async.procedure(activities::sleepActivity, (long) 10000, 0);
promise.get();
}

if (continueAsNew) {
Workflow.continueAsNew(false);
}
finish = true;
activities.sleepActivity(1000, 0);
return "update";
Expand Down
Loading