diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-06 17:56:42 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-06 17:56:42 +0100 |
commit | a18713785342e4708a3fda04fa20ea9bee062aa7 (patch) | |
tree | a89988b761f78d99a7767d2cda840c734e79d02a /container-disc/src/test | |
parent | c14153031e48b71bf4b7c66fab88cb37b8d49788 (diff) |
Take ManualClock as constructor argument
Diffstat (limited to 'container-disc/src/test')
-rw-r--r-- | container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java index d13d86553c6..fd38e589d10 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java @@ -46,16 +46,17 @@ public class AthenzIdentityProviderImplTest { public void athenz_credentials_are_retrieved_after_component_contruction_completed() { ServiceProviderApi serviceProviderApi = mock(ServiceProviderApi.class); AthenzService athenzService = mock(AthenzService.class); - MockScheduler scheduler = new MockScheduler(); + ManualClock clock = new ManualClock(Instant.EPOCH); + MockScheduler scheduler = new MockScheduler(clock); when(serviceProviderApi.getSignedIdentityDocument()).thenReturn(getIdentityDocument()); when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn( new InstanceIdentity(null, "TOKEN")); AthenzCredentialsService credentialService = - new AthenzCredentialsService(IDENTITY_CONFIG, serviceProviderApi, athenzService, scheduler.clock()); + new AthenzCredentialsService(IDENTITY_CONFIG, serviceProviderApi, athenzService, clock); AthenzIdentityProvider identityProvider = - new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, scheduler.clock()); + new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, clock); List<MockScheduler.CompletedTask> expectedTasks = Arrays.asList( @@ -79,9 +80,10 @@ public class AthenzIdentityProviderImplTest { .thenThrow(new RuntimeException("#5")) .thenReturn(new AthenzCredentials("TOKEN", null, null, null, Instant.now())); - MockScheduler scheduler = new MockScheduler(); + ManualClock clock = new ManualClock(Instant.EPOCH); + MockScheduler scheduler = new MockScheduler(clock); AthenzIdentityProvider identityProvider = - new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, scheduler.clock()); + new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, clock); List<MockScheduler.CompletedTask> expectedTasks = Arrays.asList( @@ -103,7 +105,8 @@ public class AthenzIdentityProviderImplTest { public void failed_credentials_updates_will_schedule_retries() { ServiceProviderApi serviceProviderApi = mock(ServiceProviderApi.class); AthenzService athenzService = mock(AthenzService.class); - MockScheduler scheduler = new MockScheduler(); + ManualClock clock = new ManualClock(Instant.EPOCH); + MockScheduler scheduler = new MockScheduler(clock); when(serviceProviderApi.getSignedIdentityDocument()).thenReturn(getIdentityDocument()); when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn( @@ -115,10 +118,10 @@ public class AthenzIdentityProviderImplTest { .thenThrow(new RuntimeException("#3")) .thenReturn(new InstanceIdentity(null, "TOKEN")); AthenzCredentialsService credentialService = - new AthenzCredentialsService(IDENTITY_CONFIG, serviceProviderApi, athenzService, scheduler.clock()); + new AthenzCredentialsService(IDENTITY_CONFIG, serviceProviderApi, athenzService, clock); AthenzIdentityProvider identityProvider = - new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, scheduler.clock()); + new AthenzIdentityProviderImpl(IDENTITY_CONFIG, credentialService, scheduler, clock); List<MockScheduler.CompletedTask> expectedTasks = Arrays.asList( @@ -153,7 +156,11 @@ public class AthenzIdentityProviderImplTest { private static class MockScheduler implements Scheduler { private final PriorityQueue<DelayedTask> tasks = new PriorityQueue<>(); - private final ManualClock clock = new ManualClock(Instant.EPOCH); + private final ManualClock clock; + + MockScheduler(ManualClock clock) { + this.clock = clock; + } @Override public void schedule(RunnableWithTag task, Duration delay) { @@ -174,10 +181,6 @@ public class AthenzIdentityProviderImplTest { return completedTasks; } - public ManualClock clock() { - return clock; - } - private static class DelayedTask implements Comparable<DelayedTask> { final RunnableWithTag runnableWithTag; final Duration delay; |