diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-01-24 10:21:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-24 10:21:26 +0100 |
commit | eec4962db2f6dc302f7195c1b20a6818dbc0178a (patch) | |
tree | 7302d1747a006ad32f7fa1df200fba548e089867 | |
parent | 03c33bce00052d8f07ab6278705e03ffe6669853 (diff) | |
parent | e6f7d288ae7a3cff093248663fc4f70059ef822f (diff) |
Merge pull request #25695 from vespa-engine/balder/move-test-utilities-to-test-scope
Move HandlersConfigurerTestWrapper to test scope.
-rw-r--r-- | container-search/src/test/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java (renamed from container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java) | 3 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java (renamed from container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java) | 0 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java (renamed from container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java) | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index 62d36ec34ec..e895343c4b1 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -111,8 +111,7 @@ public class HandlersConfigurerTestWrapper { private ComponentDeconstructor getTestDeconstructor() { return (generation, components, bundles) -> components.forEach(component -> { - if (component instanceof AbstractComponent) { - AbstractComponent abstractComponent = (AbstractComponent) component; + if (component instanceof AbstractComponent abstractComponent) { if (abstractComponent.isDeconstructable()) abstractComponent.deconstruct(); } if (! bundles.isEmpty()) throw new IllegalArgumentException("This test should not use bundles"); diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java index 7539369f551..7539369f551 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java +++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java index 11c14f8e581..11c14f8e581 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java +++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java |