2 files changed, 86 insertions, 5 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/Artifacts.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/Artifacts.java
index a0d0e143724..bc6a970140d 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/Artifacts.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/Artifacts.java
@@ -18,7 +18,10 @@ class Artifacts {
         private final List<Artifact> jarArtifactsProvided;
         private final List<Artifact> nonJarArtifacts;
 
-        private ArtifactSet(List<Artifact> jarArtifactsToInclude, List<Artifact> jarArtifactsProvided, List<Artifact> nonJarArtifacts) {
+        private ArtifactSet(
+                List<Artifact> jarArtifactsToInclude,
+                List<Artifact> jarArtifactsProvided,
+                List<Artifact> nonJarArtifacts) {
             this.jarArtifactsToInclude = jarArtifactsToInclude;
             this.jarArtifactsProvided = jarArtifactsProvided;
             this.nonJarArtifacts = nonJarArtifacts;
@@ -37,19 +40,24 @@ class Artifacts {
         }
     }
 
-    static ArtifactSet getArtifacts(MavenProject project) {
+    static ArtifactSet getArtifacts(MavenProject project) { return getArtifacts(project, false, null); }
 
+    static ArtifactSet getArtifacts(MavenProject project, boolean includeTestArtifacts, String testProvidedConfig) {
+        TestProvidedArtifacts testProvidedArtifacts = TestProvidedArtifacts.from(project.getArtifactMap(), testProvidedConfig);
         List<Artifact> jarArtifactsToInclude = new ArrayList<>();
         List<Artifact> jarArtifactsProvided = new ArrayList<>();
         List<Artifact> nonJarArtifactsToInclude = new ArrayList<>();
         List<Artifact> nonJarArtifactsProvided = new ArrayList<>();
-
         for (Artifact artifact : project.getArtifacts()) {
             if ("jar".equals(artifact.getType())) {
-                if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())) {
+                if (includeTestArtifacts && testProvidedArtifacts.isTestProvided(artifact)) {
+                    jarArtifactsProvided.add(artifact);
+                } else if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())) {
                     jarArtifactsToInclude.add(artifact);
                 } else if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) {
                     jarArtifactsProvided.add(artifact);
+                } else if (includeTestArtifacts && Artifact.SCOPE_TEST.equals(artifact.getScope())) {
+                    jarArtifactsToInclude.add(artifact);
                 }
             } else {
                 if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())) {
@@ -64,6 +72,6 @@ class Artifacts {
     }
 
     static Collection<Artifact> getArtifactsToInclude(MavenProject project) {
-        return getArtifacts(project).getJarArtifactsToInclude();
+        return getArtifacts(project, false, null).getJarArtifactsToInclude();
     }
 }
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java
new file mode 100644
index 00000000000..6f9e305f8d9
--- /dev/null
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestProvidedArtifacts.java
@@ -0,0 +1,73 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.container.plugin.mojo;
+
+import org.apache.maven.artifact.Artifact;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * Determines the test dependencies that are provided by the Vespa/JDisc test runtime based on the resolved dependency graph and a config string.
+ * "Test provided" dependencies are treated as "provided" scope dependencies when building a test bundle.
+ *
+ * @author bjorncs
+ */
+class TestProvidedArtifacts {
+
+    private final List<Artifact> artifacts;
+
+    private TestProvidedArtifacts(List<Artifact> artifacts) { this.artifacts = artifacts; }
+
+    boolean isTestProvided(Artifact artifact) { return artifacts.contains(artifact); }
+
+    static TestProvidedArtifacts from(Map<String, Artifact> artifacts, String configString) {
+        if (configString == null || configString.isBlank()) return new TestProvidedArtifacts(List.of());
+        return new TestProvidedArtifacts(getTestProvidedArtifacts(artifacts, configString));
+    }
+
+    private static List<Artifact> getTestProvidedArtifacts(Map<String, Artifact> artifacts, String configString) {
+        List<String> testProvidedArtifactStringIds = toTestProvidedArtifactStringIds(configString);
+        List<Artifact> testProvidedArtifacts = new ArrayList<>();
+        for (Artifact artifact : artifacts.values()) {
+            boolean hasTestProvidedArtifactAsParent =
+                    dependencyTrail(artifact, artifacts)
+                            .anyMatch(parent -> testProvidedArtifactStringIds.contains(toArtifactStringId(parent)));
+            boolean isBlacklisted = testProvidedArtifactStringIds.contains(toBlacklistedArtifactStringId(artifact));
+            if (hasTestProvidedArtifactAsParent && !isBlacklisted) {
+                testProvidedArtifacts.add(artifact);
+            }
+        }
+        return testProvidedArtifacts;
+    }
+
+    private static List<String> toTestProvidedArtifactStringIds(String commaSeparatedString) {
+        if (commaSeparatedString == null || commaSeparatedString.isBlank()) return List.of();
+        return Arrays.stream(commaSeparatedString.split(","))
+                .map(String::strip)
+                .filter(s -> !s.isBlank())
+                .collect(toList());
+    }
+
+    private static Stream<Artifact> dependencyTrail(Artifact artifact, Map<String, Artifact> otherArtifacts) {
+        return artifact.getDependencyTrail().stream()
+                .map(parentId -> otherArtifacts.get(stripVersionAndScope(parentId)))
+                .filter(Objects::nonNull);
+    }
+
+    private static String stripVersionAndScope(String fullArtifactIdentifier) {
+        int firstDelimiter = fullArtifactIdentifier.indexOf(':');
+        int secondDelimiter = fullArtifactIdentifier.indexOf(':', firstDelimiter + 1);
+        return fullArtifactIdentifier.substring(0, secondDelimiter);
+    }
+
+    private static String toArtifactStringId(Artifact artifact) { return artifact.getGroupId() + ":" + artifact.getArtifactId(); }
+
+    private static String toBlacklistedArtifactStringId(Artifact artifact) { return "!" + toArtifactStringId(artifact); }
+
+}