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

Fix invalid behavior for the cloud build option for the test and run commands #43941

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix invalid behavior for the cloud build option for the test and run commands #43941

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
429719d
Override cloud value for run command to empty
gayaldassanayake Mar 25, 2025
1c3a4f0
Check for cloud=docker for skipping tests
gayaldassanayake Mar 25, 2025
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 cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 5 additions & 6 deletions cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
Expand All @@ -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();

Expand Down
5 changes: 0 additions & 5 deletions cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunTestsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
35 changes: 29 additions & 6 deletions cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/TestCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand All @@ -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");
Expand Down Expand Up @@ -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");
Expand Down
8 changes: 6 additions & 2 deletions .../modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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("./");
Expand Down Expand Up @@ -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");
}
}
Loading