From 8d39c67dbfa0374f0faac324213f5e5d0952c0f0 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Fri, 15 Sep 2023 13:28:34 +0200 Subject: Add test bundle emulating a vespa bundle using a non-public api. --- .../src/test/java/com/yahoo/container/plugin/BundleTest.java | 2 +- .../java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'bundle-plugin-test/integration-test') 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 a9b482377fa..9645ee91f3a 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 @@ -123,7 +123,7 @@ public class BundleTest { assertNotNull(nonPublicApiAttribute); var nonPublicApi = Arrays.stream(nonPublicApiAttribute.split(",")).collect(Collectors.toSet()); - var expected = List.of("ai.vespa.lib.non_public", "com.yahoo.lib.non_public", "com.yahoo.non_public"); + var expected = List.of("ai.vespa.internal", "ai.vespa.lib.non_public", "com.yahoo.lib.non_public", "com.yahoo.non_public"); assertEquals(expected.size(), nonPublicApi.size()); expected.forEach(pkg -> assertTrue(nonPublicApi.contains(pkg), "Non-public api did not contain %s".formatted(pkg))); } diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java index 046f26432ac..ad6a2798376 100644 --- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java +++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java @@ -41,7 +41,8 @@ public class NonPublicApiDetectionTest { assertNotNull(nonPublicApiAttribute); var usedNonPublicApi = Arrays.stream(nonPublicApiAttribute.split(",")).collect(Collectors.toSet()); - assertEquals(2, usedNonPublicApi.size()); + assertEquals(3, usedNonPublicApi.size()); + assertTrue(usedNonPublicApi.contains("ai.vespa.internal")); assertTrue(usedNonPublicApi.contains("ai.vespa.lib.non_public")); assertTrue(usedNonPublicApi.contains("com.yahoo.lib.non_public")); } -- cgit v1.2.3