From faa1bea57f5471b884621af76148595284ae1ccf Mon Sep 17 00:00:00 2001
From: Timur Sultanov <timur.sultanov@akvelon.com>
Date: Tue, 23 May 2023 16:56:51 +0400
Subject: [PATCH] Use source directory as a working dir to better support
 multifile examples

---
 playground/backend/configs/SDK_JAVA.json                      | 2 +-
 .../backend/internal/code_processing/code_processing_test.go  | 2 +-
 .../backend/internal/setup_tools/builder/setup_builder.go     | 2 +-
 .../internal/setup_tools/builder/setup_builder_test.go        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/playground/backend/configs/SDK_JAVA.json b/playground/backend/configs/SDK_JAVA.json
index 6e7c87fed01b..77858de12d19 100644
--- a/playground/backend/configs/SDK_JAVA.json
+++ b/playground/backend/configs/SDK_JAVA.json
@@ -10,7 +10,7 @@
   ],
   "run_args": [
     "-cp",
-    "bin:",
+    "../bin:",
     "-Djava.util.logging.config.file={logConfigFile}"
   ],
   "test_args": [
diff --git a/playground/backend/internal/code_processing/code_processing_test.go b/playground/backend/internal/code_processing/code_processing_test.go
index d9722d2be4d2..cbf7a8d83ac0 100644
--- a/playground/backend/internal/code_processing/code_processing_test.go
+++ b/playground/backend/internal/code_processing/code_processing_test.go
@@ -47,7 +47,7 @@ import (
 )
 
 const (
-	javaConfig      = "{\n  \"compile_cmd\": \"javac\",\n  \"run_cmd\": \"java\",\n  \"test_cmd\": \"java\",\n  \"compile_args\": [\n    \"-d\",\n    \"bin\",\n    \"-parameters\",\n    \"-classpath\"\n  ],\n  \"run_args\": [\n    \"-cp\",\n    \"bin:\"\n  ],\n  \"test_args\": [\n    \"-cp\",\n    \"bin:\",\n    \"JUnit\"\n  ]\n}"
+	javaConfig      = "{\n  \"compile_cmd\": \"javac\",\n  \"run_cmd\": \"java\",\n  \"test_cmd\": \"java\",\n  \"compile_args\": [\n    \"-d\",\n    \"bin\",\n    \"-parameters\",\n    \"-classpath\"\n  ],\n  \"run_args\": [\n    \"-cp\",\n    \"../bin:\"\n  ],\n  \"test_args\": [\n    \"-cp\",\n    \"bin:\",\n    \"JUnit\"\n  ]\n}"
 	pythonConfig    = "{\n  \"compile_cmd\": \"\",\n  \"run_cmd\": \"python3\",\n  \"compile_args\": [],\n  \"run_args\": []\n}"
 	goConfig        = "{\n  \"compile_cmd\": \"go\",\n  \"run_cmd\": \"\",\n  \"compile_args\": [\n    \"build\",\n    \"-o\",\n    \"bin\"\n  ],\n  \"run_args\": [\n  ]\n}"
 	pipelinesFolder = "executable_files"
diff --git a/playground/backend/internal/setup_tools/builder/setup_builder.go b/playground/backend/internal/setup_tools/builder/setup_builder.go
index f7d68582b064..15bc84e5ad72 100644
--- a/playground/backend/internal/setup_tools/builder/setup_builder.go
+++ b/playground/backend/internal/setup_tools/builder/setup_builder.go
@@ -113,7 +113,7 @@ func Runner(ctx context.Context, paths *fs_tool.LifeCyclePaths, pipelineOptions
 	executorConfig := sdkEnv.ExecutorConfig
 	builder := executors.NewExecutorBuilder().
 		WithRunner().
-		WithWorkingDir(paths.AbsoluteBaseFolderPath).
+		WithWorkingDir(paths.AbsoluteSourceFileFolderPath).
 		WithCommand(executorConfig.RunCmd).
 		WithArgs(executorConfig.RunArgs).
 		ExecutorBuilder
diff --git a/playground/backend/internal/setup_tools/builder/setup_builder_test.go b/playground/backend/internal/setup_tools/builder/setup_builder_test.go
index 2387a0c91647..fe5a07e0b988 100644
--- a/playground/backend/internal/setup_tools/builder/setup_builder_test.go
+++ b/playground/backend/internal/setup_tools/builder/setup_builder_test.go
@@ -484,14 +484,14 @@ func TestRunnerBuilder(t *testing.T) {
 	wantJavaExecutor := executors.NewExecutorBuilder().
 		WithRunner().
 		WithExecutableFileNames(javaClassName).
-		WithWorkingDir(javaPaths.AbsoluteBaseFolderPath).
+		WithWorkingDir(javaPaths.AbsoluteSourceFileFolderPath).
 		WithCommand(javaSdkEnv.ExecutorConfig.RunCmd).
 		WithArgs(arg).
 		WithPipelineOptions(strings.Split("", " "))
 
 	wantGoExecutor := executors.NewExecutorBuilder().
 		WithRunner().
-		WithWorkingDir(goPaths.AbsoluteBaseFolderPath).
+		WithWorkingDir(goPaths.AbsoluteSourceFileFolderPath).
 		WithCommand(goPaths.AbsoluteExecutableFilePath).
 		WithExecutableFileNames("").
 		WithArgs(goSdkEnv.ExecutorConfig.RunArgs).