diff options
author | gjoranv <gv@yahooinc.com> | 2023-05-31 08:33:00 +0200 |
---|---|---|
committer | gjoranv <gv@yahooinc.com> | 2023-05-31 08:43:18 +0200 |
commit | 52277a34412a9cdaa3a0f6e0789975fce334060f (patch) | |
tree | cfb70a674048008e63b66030e9da2b43b1230a3e /bundle-plugin-test | |
parent | f7b4da0a647a82b488c3b1ea81e74d6de3ba389a (diff) |
Use 'defaults' instead of 'jrt' as compile scoped dep in test.
- Allows verifying that we include PublicApi packages from
embedded deps.
- Less bloated classpath
Diffstat (limited to 'bundle-plugin-test')
-rw-r--r-- | bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/BundleTest.java | 30 | ||||
-rw-r--r-- | bundle-plugin-test/test-bundles/main/pom.xml | 2 |
2 files changed, 15 insertions, 17 deletions
diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/BundleTest.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/BundleTest.java index e06ce45a5f5..673d7d8e09e 100644 --- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/BundleTest.java +++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/BundleTest.java @@ -30,9 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class BundleTest { static final String TEST_BUNDLE_PATH = System.getProperty("test.bundle.path", ".") + "/"; - // If bundle-plugin-test is compiled in a mvn command that also built dependencies, e.g. jrt, - // the artifact is jrt.jar, otherwise the installed and versioned artifact - // is used: jrt-7-SNAPSHOT.jar or e.g. jrt-7.123.45.jar. + // If bundle-plugin-test is compiled in a mvn command that also built dependencies, e.g. 'defaults', + // the artifact is defaults.jar, otherwise the installed and versioned artifact + // is used: defaults-7-SNAPSHOT.jar or e.g. defaults-7.123.45.jar. private static final String snapshotOrVersionOrNone = "(-\\d+((-SNAPSHOT)|((\\.\\d+(\\.\\d+)?)?))?)?\\.jar"; private JarFile jarFile; @@ -104,38 +104,36 @@ public class BundleTest { } @Test - void require_that_manifest_contains_public_api() { - assertEquals("com.yahoo.test", mainAttributes.getValue("X-JDisc-PublicApi-Package")); + void require_that_manifest_contains_public_api_for_this_bundle_and_embedded_bundles() { + assertEquals("com.yahoo.test,com.yahoo.vespa.defaults", mainAttributes.getValue("X-JDisc-PublicApi-Package")); } - // TODO: use another jar than jrt, which now pulls in a lot of dependencies that pollute the manifest of the - // generated bundle. (It's compile scoped in pom.xml to be added to the bundle-cp.) @Test void require_that_manifest_contains_bundle_class_path() { String bundleClassPath = mainAttributes.getValue("Bundle-ClassPath"); assertTrue(bundleClassPath.contains(".,")); - Pattern jrtPattern = Pattern.compile("dependencies/jrt" + snapshotOrVersionOrNone); - assertTrue(jrtPattern.matcher(bundleClassPath).find(), "Bundle class path did not contain jrt."); + Pattern jrtPattern = Pattern.compile("dependencies/defaults" + snapshotOrVersionOrNone); + assertTrue(jrtPattern.matcher(bundleClassPath).find(), "Bundle class path did not contain 'defaults''."); } @Test void require_that_component_jar_file_contains_compile_artifacts() { - String depJrt = "dependencies/jrt"; - Pattern jrtPattern = Pattern.compile(depJrt + snapshotOrVersionOrNone); - ZipEntry jrtEntry = null; + String requiredDep = "dependencies/defaults"; + Pattern depPattern = Pattern.compile(requiredDep + snapshotOrVersionOrNone); + ZipEntry depEntry = null; Enumeration<JarEntry> entries = jarFile.entries(); while (entries.hasMoreElements()) { var e = entries.nextElement(); - if (e.getName().startsWith(depJrt)) { - if (jrtPattern.matcher(e.getName()).matches()) { - jrtEntry = e; + if (e.getName().startsWith(requiredDep)) { + if (depPattern.matcher(e.getName()).matches()) { + depEntry = e; break; } } } - assertNotNull(jrtEntry, "Component jar file did not contain jrt dependency."); + assertNotNull(depEntry, "Component jar file did not contain 'defaults' dependency."); } diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml index 603e0e95aa4..a6cf45947f3 100644 --- a/bundle-plugin-test/test-bundles/main/pom.xml +++ b/bundle-plugin-test/test-bundles/main/pom.xml @@ -17,7 +17,7 @@ <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jrt</artifactId> + <artifactId>defaults</artifactId> <version>${project.version}</version> </dependency> <dependency> |