diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-06 14:39:42 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-06 14:59:21 +0200 |
commit | 3234aba2bf97ff2d90c5218edb5a9894d156f084 (patch) | |
tree | 679e3f394539af41b8d9694029966a60f7606a15 /bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo | |
parent | a56e3edad71c5c457cfee6b585be3763759f9ff5 (diff) |
Redesign dependency scopes are handled when constructing a test bundle
Introduce concept of translating dependency scopes.
Change test bundle config in bundle-plugin to take a list of overrides for dependency scopes.
Diffstat (limited to 'bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo')
2 files changed, 101 insertions, 68 deletions
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/TestBundleDependencyScopeTranslatorTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/TestBundleDependencyScopeTranslatorTest.java new file mode 100644 index 00000000000..c0e1c9b4b9a --- /dev/null +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/TestBundleDependencyScopeTranslatorTest.java @@ -0,0 +1,101 @@ +// 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 org.apache.maven.artifact.DefaultArtifact; +import org.apache.maven.artifact.handler.DefaultArtifactHandler; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import static org.junit.Assert.assertEquals; + +/** + * @author bjorncs + */ +public class TestBundleDependencyScopeTranslatorTest { + + private static final String GROUP_ID = "com.test"; + + @Test + public void findsAllTestProvidedDependencies() { + Map<String, Artifact> artifacts = new TreeMap<>(); + Artifact a = createArtifact(artifacts, "a", "compile", List.of()); + Artifact aa = createArtifact(artifacts, "a-a", "compile", List.of("a")); + Artifact ab = createArtifact(artifacts, "a-b", "runtime", List.of("a")); + Artifact aba = createArtifact(artifacts, "a-b-a", "runtime", List.of("a", "a-b")); + Artifact ac = createArtifact(artifacts, "a-c", "runtime", List.of("a")); + Artifact ad = createArtifact(artifacts, "a-d", "compile", List.of("a")); + Artifact ada = createArtifact(artifacts, "a-d-a", "compile", List.of("a", "a-d")); + Artifact adb = createArtifact(artifacts, "a-d-b", "compile", List.of("a", "a-d")); + Artifact b = createArtifact(artifacts, "b", "provided", List.of()); + Artifact ba = createArtifact(artifacts, "b-a", "provided", List.of("b")); + Artifact bb = createArtifact(artifacts, "b-b", "provided", List.of("b")); + Artifact c = createArtifact(artifacts, "c", "runtime", List.of()); + Artifact ca = createArtifact(artifacts, "c-a", "runtime", List.of("c")); + Artifact d = createArtifact(artifacts, "d", "test", List.of()); + Artifact da = createArtifact(artifacts, "d-a", "test", List.of("d")); + Artifact daa = createArtifact(artifacts, "d-a-a", "test", List.of("d", "d-a")); + Artifact db = createArtifact(artifacts, "d-b", "test", List.of("d")); + Artifact dc = createArtifact(artifacts, "d-c", "test", List.of("d")); + Artifact dca = createArtifact(artifacts, "d-c-a", "test", List.of("d", "d-c")); + + String configString = + "com.test:a-d:compile," + + "com.test:a:provided," + + "com.test:d-a:test," + + "com.test:d-c:compile," + + "com.test:d:runtime"; + TestBundleDependencyScopeTranslator translator = TestBundleDependencyScopeTranslator.from(artifacts, configString); + assertScope(translator, a, "provided"); + assertScope(translator, aa, "provided"); + assertScope(translator, ab, "provided"); + assertScope(translator, aba, "provided"); + assertScope(translator, ac, "provided"); + assertScope(translator, ad, "compile"); + assertScope(translator, ada, "compile"); + assertScope(translator, adb, "compile"); + assertScope(translator, b, "provided"); + assertScope(translator, ba, "provided"); + assertScope(translator, bb, "provided"); + assertScope(translator, c, "runtime"); + assertScope(translator, ca, "runtime"); + assertScope(translator, d, "runtime"); + assertScope(translator, da, "test"); + assertScope(translator, daa, "test"); + assertScope(translator, db, "runtime"); + assertScope(translator, dc, "compile"); + assertScope(translator, dca, "compile"); + } + + private static Artifact createArtifact( + Map<String, Artifact> artifacts, String artifactId, String scope, List<String> transitiveDependents) { + Artifact artifact = createArtifact(artifactId, scope, transitiveDependents); + artifacts.put(simpleId(artifactId), artifact); + return artifact; + } + + private static Artifact createArtifact(String artifactId, String scope, List<String> transitiveDependents) { + Artifact artifact = new DefaultArtifact( + GROUP_ID, artifactId, "1.0", scope, "jar", /*classifier*/null, new DefaultArtifactHandler("jar")); + List<String> dependencyTrail = new ArrayList<>(); + dependencyTrail.add(GROUP_ID + "my-project:container-plugin:1-SNAPSHOT"); + transitiveDependents.forEach(dependent -> dependencyTrail.add(fullId(dependent))); + dependencyTrail.add(fullId(artifactId)); + artifact.setDependencyTrail(dependencyTrail); + return artifact; + } + + private static void assertScope( + TestBundleDependencyScopeTranslator translator, Artifact artifact, String expectedScope) { + assertEquals(expectedScope, translator.scopeOf(artifact)); + } + + private static String fullId(String artifactId) { return simpleId(artifactId) + ":jar:1.0"; } + private static String simpleId(String artifactId) { return GROUP_ID + ":" + artifactId; } + +}
\ No newline at end of file diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/TestProvidedArtifactsTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/TestProvidedArtifactsTest.java deleted file mode 100644 index b60bce794f5..00000000000 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/TestProvidedArtifactsTest.java +++ /dev/null @@ -1,68 +0,0 @@ -// 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 org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.handler.DefaultArtifactHandler; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -/** - * @author bjorncs - */ -public class TestProvidedArtifactsTest { - - private static final String GROUP_ID = "com.test"; - - @Test - public void findsAllTestProvidedDependencies() { - Map<String, Artifact> artifacts = new TreeMap<>(); - Artifact a = createArtifact(artifacts, "a"); - Artifact aa = createArtifact(artifacts, "a-a", "a"); - Artifact ab = createArtifact(artifacts, "a-b", "a"); - Artifact aaa = createArtifact(artifacts, "a-a-a", "a", "a-a"); - Artifact b = createArtifact(artifacts, "b"); - Artifact ba = createArtifact(artifacts, "b-a", "b"); - Artifact c = createArtifact(artifacts, "c"); - - String configString = "com.test:a,com.test:b-a,!com.test:a-b"; - TestProvidedArtifacts testProvidedArtifacts = TestProvidedArtifacts.from(artifacts, configString); - - assertTrue(testProvidedArtifacts.isTestProvided(a)); - assertTrue(testProvidedArtifacts.isTestProvided(aa)); - assertFalse(testProvidedArtifacts.isTestProvided(ab)); - assertTrue(testProvidedArtifacts.isTestProvided(aaa)); - assertFalse(testProvidedArtifacts.isTestProvided(b)); - assertTrue(testProvidedArtifacts.isTestProvided(ba)); - assertFalse(testProvidedArtifacts.isTestProvided(c)); - } - - private static Artifact createArtifact(Map<String, Artifact> artifacts, String artifactId, String... dependents) { - Artifact artifact = createArtifact(artifactId, dependents); - artifacts.put(simpleId(artifactId), artifact); - return artifact; - } - - private static Artifact createArtifact(String artifactId, String... dependents) { - Artifact artifact = new DefaultArtifact(GROUP_ID, artifactId, "1.0", "test", "jar", "deploy", new DefaultArtifactHandler("jar")); - List<String> dependencyTrail = new ArrayList<>(); - dependencyTrail.add(fullId("bundle-plugin")); - Arrays.stream(dependents).forEach(dependent -> dependencyTrail.add(fullId(dependent))); - dependencyTrail.add(fullId(artifactId)); - artifact.setDependencyTrail(dependencyTrail); - return artifact; - } - - private static String fullId(String artifactId) { return simpleId(artifactId) + ":1.0:compile"; } - private static String simpleId(String artifactId) { return GROUP_ID + ":" + artifactId; } - -}
\ No newline at end of file |