diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java index 14010c596033..fbffde7218a7 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java @@ -345,6 +345,7 @@ private BuildOptions constructBuildOptions() { .setSkipTests(true) .setTestReport(false) .setObservabilityIncluded(observabilityIncluded) + .setCloud("") // Skip the cloud import for the run command .setRemoteManagement(remoteManagement) .setSticky(sticky) .setDumpGraph(dumpGraph) diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java index 8240f19b876b..f9be3919bad0 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java @@ -361,6 +361,7 @@ public void execute() { this.outStream.println("WARNING: Test report generation is not supported with Ballerina cloud test"); } + boolean isTestingDelegated = project.buildOptions().cloud().equals("docker"); // Run pre-build tasks to have the project reloaded. // In code coverage generation, the module map is duplicated. @@ -369,7 +370,7 @@ public void execute() { // Hence, below tasks are executed before extracting the module map from the project. TaskExecutor preBuildTaskExecutor = new TaskExecutor.TaskBuilder() .addTask(new CleanTargetCacheDirTask(), isSingleFile) // clean the target cache dir(projects only) - .addTask(new CleanTargetBinTestsDirTask(), (isSingleFile || project.buildOptions().cloud().isEmpty())) + .addTask(new CleanTargetBinTestsDirTask(), (isSingleFile || !isTestingDelegated)) .addTask(new RunBuildToolsTask(outStream), isSingleFile) // run build tools .build(); preBuildTaskExecutor.executeTasks(project); @@ -391,16 +392,14 @@ public void execute() { isPackageModified, buildOptions.enableCache())) // .addTask(new CopyResourcesTask(), listGroups) // merged with CreateJarTask .addTask(new CreateTestExecutableTask(outStream, groupList, disableGroupList, testList, listGroups, - cliArgs, isParallelExecution), - project.buildOptions().cloud().isEmpty()) + cliArgs, isParallelExecution), !isTestingDelegated) .addTask(new RunTestsTask(outStream, errStream, rerunTests, groupList, disableGroupList, testList, includes, coverageFormat, moduleMap, listGroups, excludes, cliArgs, isParallelExecution), - (project.buildOptions().nativeImage() || - !project.buildOptions().cloud().isEmpty())) + (project.buildOptions().nativeImage() || isTestingDelegated)) .addTask(new RunNativeImageTestTask(outStream, rerunTests, groupList, disableGroupList, testList, includes, coverageFormat, moduleMap, listGroups, isParallelExecution), - (!project.buildOptions().nativeImage() || !project.buildOptions().cloud().isEmpty())) + (!project.buildOptions().nativeImage() || isTestingDelegated)) .addTask(new DumpBuildTimeTask(outStream), !project.buildOptions().dumpBuildTime()) .build(); diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunTestsTask.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunTestsTask.java index 802e8f7d4c11..1cf64587b806 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunTestsTask.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunTestsTask.java @@ -142,11 +142,6 @@ public RunTestsTask(PrintStream out, PrintStream err, boolean rerunTests, String public void execute(Project project) { long start = 0; - //do not execute if cloud option is given, we only use the object to use the properties and methods in it - if (!project.buildOptions().cloud().isEmpty()) { - return; - } - if (project.buildOptions().dumpBuildTime()) { start = System.currentTimeMillis(); } diff --git a/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/TestCommandTest.java b/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/TestCommandTest.java index fdf429d69190..6a28ecae9129 100644 --- a/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/TestCommandTest.java +++ b/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/TestCommandTest.java @@ -61,6 +61,7 @@ import static io.ballerina.cli.cmd.CommandOutputUtils.getOutput; import static io.ballerina.cli.cmd.CommandOutputUtils.readFileAsString; import static io.ballerina.cli.cmd.CommandOutputUtils.replaceDependenciesTomlContent; +import static io.ballerina.cli.cmd.CommandUtil.USER_HOME; import static io.ballerina.cli.utils.OsUtils.isWindows; import static io.ballerina.projects.util.ProjectConstants.BUILD_FILE; import static io.ballerina.projects.util.ProjectConstants.DEPENDENCIES_TOML; @@ -433,13 +434,35 @@ public void testTestEmptyProjectWithBuildTools() throws IOException { Assert.assertEquals(buildLog.replace("\r", ""), getOutput("test-empty-project-with-build-tools.txt")); } - @Test(description = "Test the emission of testable fat jar for a project with tests") + @Test(description = "Test --cloud=k8s flag with a project with tests") + public void testTestWithCloudK8s() throws IOException { + Path projectPath = this.testResources.resolve("validProjectWithTests"); + ProjectUtils.deleteDirectory(projectPath.resolve("target")); + System.setProperty(ProjectConstants.USER_DIR, projectPath.toString()); + Path mockedLocalRepo = this.testResources.resolve("mocked-local-repo"); + System.setProperty(USER_HOME, mockedLocalRepo.toString()); + TestCommand testCommand = new TestCommand(projectPath, printStream, printStream, false); + new CommandLine(testCommand).parseArgs("--cloud=k8s"); + testCommand.execute(); + + String buildLog = readOutput(true); + Assert.assertEquals(buildLog.replace("\r", ""), getOutput("test-project.txt")); + + Path targetDir = projectPath.resolve("target"); + Path testableJar = targetDir.resolve("bin/tests/winery-testable.jar"); + Assert.assertFalse(Files.exists(testableJar)); + Path mainArgsFile = testableJar.getParent().resolve(TEST_RUNTIME_MAIN_ARGS_FILE); + Assert.assertFalse(Files.exists(mainArgsFile)); + } + + @Test(description = "Test the emission of testable fat jar for a project with tests", + dependsOnMethods = "testTestWithCloudK8s") public void testTestableFatJarEmission() { Path projectPath = this.testResources.resolve("validProjectWithTests"); System.setProperty(ProjectConstants.USER_DIR, projectPath.toString()); Path mockedLocalRepo = this.testResources.resolve("mocked-local-repo"); - System.setProperty("user.home", mockedLocalRepo.toString()); + System.setProperty(USER_HOME, mockedLocalRepo.toString()); TestCommand testCommand = new TestCommand(projectPath, printStream, printStream, false); new CommandLine(testCommand).parseArgs("--cloud=docker"); @@ -494,7 +517,7 @@ public void testEmissionOfTestableFatJarForProjectWithMocking() throws IOExcepti System.setProperty(ProjectConstants.USER_DIR, projectPath.toString()); Path mockedLocalRepo = this.testResources.resolve("mocked-local-repo"); - System.setProperty("user.home", mockedLocalRepo.toString()); + System.setProperty(USER_HOME, mockedLocalRepo.toString()); TestCommand testCommand = new TestCommand(projectPath, printStream, printStream, false); new CommandLine(testCommand).parseArgs("--cloud=docker"); @@ -556,7 +579,7 @@ public void testEmissionOfSingleFatJarForCloudAndGraalVM() throws IOException { System.setProperty(ProjectConstants.USER_DIR, projectPath.toString()); Path mockedLocalRepo = this.testResources.resolve("mocked-local-repo"); - System.setProperty("user.home", mockedLocalRepo.toString()); + System.setProperty(USER_HOME, mockedLocalRepo.toString()); TestCommand testCommand = new TestCommand(projectPath, printStream, printStream, false); new CommandLine(testCommand).parseArgs("--cloud=docker", "--graalvm"); @@ -580,7 +603,7 @@ public void testEmissionOfMultipleFatJarsForProjectWithMockingForCloudAndGraalVM System.setProperty(ProjectConstants.USER_DIR, projectPath.toString()); Path mockedLocalRepo = this.testResources.resolve("mocked-local-repo"); - System.setProperty("user.home", mockedLocalRepo.toString()); + System.setProperty(USER_HOME, mockedLocalRepo.toString()); TestCommand testCommand = new TestCommand(projectPath, printStream, printStream, false); new CommandLine(testCommand).parseArgs("--cloud=docker", "--graalvm"); @@ -654,7 +677,7 @@ public void testEmissionOfTestableFatJarForSingleTestBalFile() { System.setProperty(ProjectConstants.USER_DIR, projectPath.toString()); Path mockedLocalRepo = this.testResources.resolve("mocked-local-repo"); - System.setProperty("user.home", mockedLocalRepo.toString()); + System.setProperty(USER_HOME, mockedLocalRepo.toString()); TestCommand testCommand = new TestCommand(projectPath, printStream, printStream, false); new CommandLine(testCommand).parseArgs("--cloud=docker", "main_tests.bal"); diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java index c5bb28854310..1d4503132bdf 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java @@ -154,7 +154,7 @@ private TestSuite generateTestSuite(Module module, JarResolver jarResolver) { } // If not a cloud build, add the test execution dependencies - if (module.project().buildOptions().cloud().isEmpty()) { + if (!areTestsDelegated(module)) { addTestExecutionDependencies(module, jarResolver, testSuite); } else if (module.project().buildOptions().nativeImage()) { // If it is a cloud build, add the test execution dependencies only if native image is enabled @@ -183,7 +183,7 @@ private TestSuite createTestSuite(Module module, String testModuleName) { module.descriptor().name().toString(), testSuite); testSuite.setPackageName(module.descriptor().packageName().toString()); - if (module.project().buildOptions().cloud().isEmpty()) { + if (!areTestsDelegated(module)) { testSuite.setSourceRootPath(module.project().sourceRoot().toString()); } else { testSuite.setSourceRootPath("./"); @@ -615,4 +615,8 @@ private String getExecutePath(Module module) { //TODO: Throw an exception for not generating the test execution file. Currently, this handles at BTestRunner return executePath; } + + private boolean areTestsDelegated(Module module) { + return module.project().buildOptions().cloud().equals("docker"); + } }