diff options
author | jonmv <venstad@gmail.com> | 2022-10-10 10:54:21 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-10-10 12:33:57 +0200 |
commit | b121927ba9f5252cb2adc0b7bee1fda44b31841e (patch) | |
tree | 17089dda76717f15b8a062d040f38cec99b30ba2 /zkfacade/src/test/java/com | |
parent | 762483d3e51b899a6b24f7675a861c0f6d0f2a59 (diff) |
No inheritance on AbstractComponent
Diffstat (limited to 'zkfacade/src/test/java/com')
-rw-r--r-- | zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java index 6767dd7e1a8..131222e62f8 100644 --- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java +++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java @@ -88,7 +88,7 @@ public class CuratorWrapperTest { assertTrue(singleton.isActive); assertTrue(wrapped.exists(lockPath)); assertTrue(curator.isActive(singleton.id())); - singleton.deconstruct(); + singleton.shutdown(); assertFalse(singleton.isActive); // ... and deactivated as a result of unregistering again. @@ -143,12 +143,12 @@ public class CuratorWrapperTest { assertFalse(newSingleton.isActive); assertFalse(singleton.isActive); - singleton.deconstruct(); + singleton.shutdown(); assertTrue(newerSingleton.isActive); assertFalse(newSingleton.isActive); assertFalse(singleton.isActive); - newerSingleton.deconstruct(); + newerSingleton.shutdown(); assertFalse(newerSingleton.isActive); assertTrue(newSingleton.isActive); assertFalse(singleton.isActive); @@ -182,7 +182,7 @@ public class CuratorWrapperTest { stunning.arriveAndAwaitAdvance(); // Failing component is done cleaning up after itself. assertTrue(newSingleton.isActive); assertEquals("failed to register failing singleton", thrownMessage.get()); - newSingleton.deconstruct(); + newSingleton.shutdown(); curator.deconstruct(); } @@ -226,7 +226,7 @@ public class CuratorWrapperTest { singleton.phaser.arriveAndAwaitAdvance(); assertTrue(singleton.isActive); singleton.phaser.arriveAndDeregister(); - singleton.deconstruct(); + singleton.shutdown(); assertFalse(singleton.isActive); curator.deconstruct(); @@ -237,10 +237,10 @@ public class CuratorWrapperTest { Singleton(VespaCurator curator) { register(curator, Duration.ofSeconds(2)); } boolean isActive; Phaser phaser = new Phaser(1); - @Override protected String id() { return "singleton"; } // ... lest anonymous subclasses get different IDs ... ƪ(`▿▿▿▿´ƪ) + @Override public String id() { return "singleton"; } // ... lest anonymous subclasses get different IDs ... ƪ(`▿▿▿▿´ƪ) @Override public void activate() { isActive = true; phaser.arriveAndAwaitAdvance(); } @Override public void deactivate() { isActive = false; phaser.arriveAndAwaitAdvance(); } - @Override public void deconstruct() { unregister(Duration.ofSeconds(2)); } + public void shutdown() { unregister(Duration.ofSeconds(2)); } } } |