From e39e442cf78e477875fa6ca8ba271015c5f619e9 Mon Sep 17 00:00:00 2001 From: jonmv Date: Tue, 14 Jun 2022 12:15:16 +0200 Subject: Add test for multipel scopes --- .../TestBundleDependencyScopeTranslatorTest.java | 31 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'bundle-plugin/src/test') diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java index c0f2766b5ed..ada2f8d208a 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java @@ -107,16 +107,37 @@ public class TestBundleDependencyScopeTranslatorTest { assertScope(translator, bb, "provided"); } - private static Artifact createArtifact( - Set artifacts, String artifactId, String scope, List transitiveDependents) { - Artifact artifact = createArtifact(artifactId, scope, transitiveDependents); + @Test + public void different_classifiers_are_handled_separately() { + Set artifacts = new TreeSet<>(); + Artifact a = createArtifact(artifacts, "a", "test", List.of()); + Artifact ab = createArtifact(artifacts, "a-b", "provided", List.of("a")); + Artifact ac = createArtifact(artifacts, "a-c", "classy", "test", List.of("a")); + + TestBundleDependencyScopeTranslator withoutOverrides = TestBundleDependencyScopeTranslator.from(artifacts, ""); + assertScope(withoutOverrides, a, "compile"); + assertScope(withoutOverrides, ab, "provided"); + assertScope(withoutOverrides, ac, "compile"); + + TestBundleDependencyScopeTranslator withOverrides = TestBundleDependencyScopeTranslator.from(artifacts, "com.test:a:test"); + assertScope(withOverrides, a, "test"); + assertScope(withOverrides, ab, "provided"); + assertScope(withOverrides, ac, "test"); + } + + private static Artifact createArtifact(Set artifacts, String artifactId, String scope, List transitiveDependents) { + return createArtifact(artifacts, artifactId, null, scope, transitiveDependents); + } + + private static Artifact createArtifact(Set artifacts, String artifactId, String classifier, String scope, List transitiveDependents) { + Artifact artifact = createArtifact(artifactId, classifier, scope, transitiveDependents); artifacts.add(artifact); return artifact; } - private static Artifact createArtifact(String artifactId, String scope, List transitiveDependents) { + private static Artifact createArtifact(String artifactId, String classifier, String scope, List transitiveDependents) { Artifact artifact = new DefaultArtifact( - GROUP_ID, artifactId, "1.0", scope, "jar", /*classifier*/null, new DefaultArtifactHandler("jar")); + GROUP_ID, artifactId, "1.0", scope, "jar", classifier, new DefaultArtifactHandler("jar")); List dependencyTrail = new ArrayList<>(); dependencyTrail.add(GROUP_ID + "my-project:container-plugin:1-SNAPSHOT"); transitiveDependents.forEach(dependent -> dependencyTrail.add(fullId(dependent))); -- cgit v1.2.3