Add test to return options

Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com>

Author: mcruzdev

impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunShellExecutor.java

@@ -104,27 +104,7 @@ public void init(RunShell taskConfiguration, WorkflowDefinition definition) {
             Process process = processBuilder.start();
 
             if (taskConfiguration.isAwait()) {
-              StringBuilder stdout = new StringBuilder();
-              StringBuilder stderr = new StringBuilder();
-
-              process.getInputStream().transferTo(the(stdout));
-              process.getErrorStream().transferTo(the(stderr));
-              int exitCode = process.waitFor();
-
-              RunTaskConfiguration.ProcessReturnType returnType = taskConfiguration.getReturn();
-
-              WorkflowModelFactory modelFactory = definition.application().modelFactory();
-
-              return switch (returnType) {
-                case ALL ->
-                    modelFactory.fromAny(
-                        new ProcessResult(
-                            exitCode, stdout.toString().trim(), stderr.toString().trim()));
-                case NONE -> modelFactory.fromNull();
-                case CODE -> modelFactory.from(exitCode);
-                case STDOUT -> modelFactory.from(stdout.toString().trim());
-                case STDERR -> modelFactory.from(stderr.toString().trim());
-              };
+              return executeAwaiting(taskConfiguration, definition, process);
             } else {
               return input;
             }
@@ -135,6 +115,31 @@ public void init(RunShell taskConfiguration, WorkflowDefinition definition) {
         };
   }
 
+  private WorkflowModel executeAwaiting(
+      RunShell taskConfiguration, WorkflowDefinition definition, Process process)
+      throws IOException, InterruptedException {
+    StringBuilder stdout = new StringBuilder();
+    StringBuilder stderr = new StringBuilder();
+
+    process.getInputStream().transferTo(the(stdout));
+    process.getErrorStream().transferTo(the(stderr));
+    int exitCode = process.waitFor();
+
+    RunTaskConfiguration.ProcessReturnType returnType = taskConfiguration.getReturn();
+
+    WorkflowModelFactory modelFactory = definition.application().modelFactory();
+
+    return switch (returnType) {
+      case ALL ->
+          modelFactory.fromAny(
+              new ProcessResult(exitCode, stdout.toString().trim(), stderr.toString().trim()));
+      case NONE -> modelFactory.fromNull();
+      case CODE -> modelFactory.from(exitCode);
+      case STDOUT -> modelFactory.from(stdout.toString().trim());
+      case STDERR -> modelFactory.from(stderr.toString().trim());
+    };
+  }
+
   @Override
   public boolean accept(Class<? extends RunTaskConfiguration> clazz) {
     return RunShell.class.equals(clazz);

…impl/test/shell/RunTaskExecutorTest.java …flow/impl/test/RunShellExecutorTest.javaimpl/test/src/test/java/io/serverlessworkflow/impl/test/shell/RunTaskExecutorTest.java renamed to impl/test/src/test/java/io/serverlessworkflow/impl/test/RunShellExecutorTest.java impl/test/src/test/java/io/serverlessworkflow/impl/test/shell/RunTaskExecutorTest.java renamed to impl/test/src/test/java/io/serverlessworkflow/impl/test/RunShellExecutorTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.test.shell;
+package io.serverlessworkflow.impl.test;
 
 import io.serverlessworkflow.api.WorkflowReader;
 import io.serverlessworkflow.api.types.Workflow;
@@ -27,7 +27,7 @@
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
-public class RunTaskExecutorTest {
+public class RunShellExecutorTest {
 
   @Test
   void testEcho() throws IOException {
@@ -140,6 +140,61 @@ void testAwaitBehavior() throws IOException {
     }
   }
 
+  @Test
+  void testStderr() throws IOException {
+    Workflow workflow =
+        WorkflowReader.readWorkflowFromClasspath("workflows-samples/run-shell/echo-stderr.yaml");
+    try (WorkflowApplication appl = WorkflowApplication.builder().build()) {
+      Map<String, String> inputMap = Map.of();
+
+      WorkflowModel outputModel =
+          appl.workflowDefinition(workflow).instance(inputMap).start().join();
+
+      SoftAssertions.assertSoftly(
+          softly -> {
+            softly.assertThat(outputModel.asText()).isPresent();
+            softly.assertThat(outputModel.asText().get()).isNotEmpty();
+            softly.assertThat(outputModel.asText().get()).contains("ls: cannot access");
+            softly.assertThat(outputModel.asText().get()).contains("No such file or directory");
+          });
+    }
+  }
+
+  @Test
+  void testExitCode() throws IOException {
+    Workflow workflow =
+        WorkflowReader.readWorkflowFromClasspath("workflows-samples/run-shell/echo-exitcode.yaml");
+    try (WorkflowApplication appl = WorkflowApplication.builder().build()) {
+      Map<String, String> inputMap = Map.of();
+
+      WorkflowModel outputModel =
+          appl.workflowDefinition(workflow).instance(inputMap).start().join();
+
+      SoftAssertions.assertSoftly(
+          softly -> {
+            softly.assertThat(outputModel.asNumber()).isPresent();
+            softly.assertThat(outputModel.asNumber().get()).isNotEqualTo(0);
+          });
+    }
+  }
+
+  @Test
+  void testNone() throws IOException {
+    Workflow workflow =
+        WorkflowReader.readWorkflowFromClasspath("workflows-samples/run-shell/echo-none.yaml");
+    try (WorkflowApplication appl = WorkflowApplication.builder().build()) {
+      Map<String, String> inputMap = Map.of();
+
+      WorkflowModel outputModel =
+          appl.workflowDefinition(workflow).instance(inputMap).start().join();
+
+      SoftAssertions.assertSoftly(
+          softly -> {
+            softly.assertThat(outputModel.asJavaObject()).isNull();
+          });
+    }
+  }
+
   record Input(User user) {}
 
   record User(String name) {}

impl/test/src/test/resources/workflows-samples/run-shell/echo-exitcode.yaml

@@ -0,0 +1,11 @@
+document:
+  dsl: '1.0.1'
+  namespace: test
+  name: run-shell-example
+  version: '0.1.0'
+do:
+  - runShell:
+      run:
+        shell:
+          command: 'ls /nonexistent_directory'
+        return: code

impl/test/src/test/resources/workflows-samples/run-shell/echo-none.yaml

@@ -0,0 +1,11 @@
+document:
+  dsl: '1.0.1'
+  namespace: test
+  name: run-shell-example
+  version: '0.1.0'
+do:
+  - runShell:
+      run:
+        shell:
+          command: 'echo "Serverless Workflow"'
+        return: none

impl/test/src/test/resources/workflows-samples/run-shell/echo-stderr.yaml

@@ -0,0 +1,11 @@
+document:
+  dsl: '1.0.1'
+  namespace: test
+  name: run-shell-example
+  version: '0.1.0'
+do:
+  - runShell:
+      run:
+        shell:
+          command: 'ls /nonexistent_directory'
+        return: stderr