Merge pull request #41033 from ShammiL/testonly-any-dependency

Mark platform as any for testOnly platform libs

cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/PackCommandTest.java

@@ -155,7 +155,7 @@ public void testPackStandaloneFile() throws IOException {
 
     @Test(description = "Pack a package with platform libs")
     public void testPackageWithPlatformLibs() throws IOException {
-        Path projectPath = this.testResources.resolve("validProjectWithPlatformLibs");
+        Path projectPath = this.testResources.resolve("validGraalvmCompatibleProjectWithPlatformLibs");
         System.setProperty("user.dir", projectPath.toString());
         PackCommand packCommand = new PackCommand(projectPath, printStream, printStream, false, true);
         new CommandLine(packCommand).parseArgs();
@@ -168,6 +168,36 @@ public void testPackageWithPlatformLibs() throws IOException {
                 .toFile().exists());
     }
 
+    @Test(description = "Pack a package with testOnly platform libs")
+    public void testPackageWithTestOnlyPlatformLibs() throws IOException {
+        Path projectPath = this.testResources.resolve("projectWithTestOnlyPlatformLibs");
+        System.setProperty("user.dir", projectPath.toString());
+        PackCommand packCommand = new PackCommand(projectPath, printStream, printStream, false, true);
+        new CommandLine(packCommand).parseArgs();
+        packCommand.execute();
+        String buildLog = readOutput(true);
+
+        Assert.assertEquals(buildLog.replaceAll("\r", ""),
+                getOutput("pack-project-with-test-only-platform-libs.txt"));
+        Assert.assertTrue(projectPath.resolve("target").resolve("bala").resolve("sameera-myproject-any-0.1.0.bala")
+                .toFile().exists());
+    }
+
+    @Test(description = "Pack a package with ballerina/java imports only in tests")
+    public void testPackageWithTestOnlyJavaImports() throws IOException {
+        Path projectPath = this.testResources.resolve("projectWithTestOnlyJavaImports");
+        System.setProperty("user.dir", projectPath.toString());
+        PackCommand packCommand = new PackCommand(projectPath, printStream, printStream, false, true);
+        new CommandLine(packCommand).parseArgs();
+        packCommand.execute();
+        String buildLog = readOutput(true);
+
+        Assert.assertEquals(buildLog.replaceAll("\r", ""),
+                getOutput("pack-project-with-test-only-platform-libs.txt"));
+        Assert.assertTrue(projectPath.resolve("target").resolve("bala").resolve("sameera-myproject-any-0.1.0.bala")
+                .toFile().exists());
+    }
+
     @Test(description = "Pack a package with an empty Dependencies.toml")
     public void testPackageWithEmptyDependenciesToml() throws IOException {
         Path projectPath = this.testResources.resolve("validProjectWithDependenciesToml");

cli/ballerina-cli/src/test/resources/test-resources/command-outputs/unix/pack-project-with-test-only-platform-libs.txt

@@ -0,0 +1,5 @@
+Compiling source
+	sameera/myproject:0.1.0
+
+Creating bala
+	target/bala/sameera-myproject-any-0.1.0.bala

cli/ballerina-cli/src/test/resources/test-resources/command-outputs/windows/pack-project-with-test-only-platform-libs.txt

@@ -0,0 +1,5 @@
+Compiling source
+	sameera/myproject:0.1.0
+
+Creating bala
+	target\bala\sameera-myproject-any-0.1.0.bala

cli/ballerina-cli/src/test/resources/test-resources/projectWithTestOnlyJavaImports/Ballerina.toml

@@ -0,0 +1,4 @@
+[package]
+org = "sameera"
+name = "myproject"
+version = "0.1.0"

cli/ballerina-cli/src/test/resources/test-resources/projectWithTestOnlyJavaImports/main.bal

@@ -0,0 +1,3 @@
+
+public function main() {
+}

cli/ballerina-cli/src/test/resources/test-resources/projectWithTestOnlyJavaImports/tests/main-test.bal

@@ -0,0 +1,7 @@
+import ballerina/jballerina.java;
+
+public function printInternal(handle receiver, handle strValue) = @java:Method {
+    name: "println",
+    'class: "java/io/PrintStream",
+    paramTypes: ["java.lang.String"]
+} external;

cli/ballerina-cli/src/test/resources/test-resources/projectWithTestOnlyPlatformLibs/Ballerina.toml

@@ -0,0 +1,12 @@
+[package]
+org = "sameera"
+name = "myproject"
+version = "0.1.0"
+
+[platform.java11]
+graalvmCompatible = true
+
+[[platform.java11.dependency]]
+path = "./libs/one-1.0.0.jar"
+scope = "testOnly"
+graalvmCompatible = true

cli/ballerina-cli/src/test/resources/test-resources/projectWithTestOnlyPlatformLibs/main.bal

@@ -0,0 +1,3 @@
+
+public function main() {
+}

cli/ballerina-cli/src/test/resources/test-resources/validGraalvmCompatibleProjectWithPlatformLibs/Ballerina.toml

@@ -0,0 +1,10 @@
+[package]
+org = "sameera"
+name = "myproject"
+version = "0.1.0"
+
+[platform.java11]
+graalvmCompatible = true
+
+[[platform.java11.dependency]]
+path = "./libs/one-1.0.0.jar"

cli/ballerina-cli/src/test/resources/test-resources/validGraalvmCompatibleProjectWithPlatformLibs/main.bal

@@ -0,0 +1,3 @@
+
+public function main() {
+}

compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBalaWriter.java

@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.zip.ZipOutputStream;
 
@@ -227,15 +228,18 @@ private CompilerBackend.TargetPlatform getTargetPlatform(PackageResolution pkgRe
         // 1) Check direct dependencies of imports in the package have any `ballerina/java` dependency
         for (ResolvedPackageDependency dependency : resolvedPackageDependencies) {
             if (dependency.packageInstance().packageOrg().value().equals(Names.BALLERINA_ORG.value) &&
-                    dependency.packageInstance().packageName().value().equals(Names.JAVA.value)) {
+                    dependency.packageInstance().packageName().value().equals(Names.JAVA.value) &&
+                    !dependency.scope().equals(PackageDependencyScope.TEST_ONLY)) {
                 return this.backend.targetPlatform();
             }
         }
 
         // 2) Check package has defined any platform dependency
         PackageManifest manifest = this.packageContext.project().currentPackage().manifest();
-        if (manifest.platform(this.backend.targetPlatform().code()) != null &&
-                !manifest.platform(this.backend.targetPlatform().code()).dependencies().isEmpty()) {
+        PackageManifest.Platform manifestPlatform = manifest.platform(this.backend.targetPlatform().code());
+        if (manifestPlatform != null &&
+                !manifestPlatform.dependencies().isEmpty() &&
+        !isPlatformDependenciesTestOnly(manifestPlatform.dependencies())) {
             return this.backend.targetPlatform();
         }
 
@@ -263,4 +267,13 @@ private Optional<BalToolDescriptor> readBalToolToml() {
         }
         return Optional.empty();
     }
+
+    private boolean isPlatformDependenciesTestOnly(List<Map<String, Object>> dependencies) {
+        for (Map<String, Object> dependency : dependencies) {
+            if (null == dependency.get("scope") || dependency.get("scope").equals("default")) {
+                return false;
+            }
+        }
+        return true;
+    }
 }