diff options
author | Tor Brede Vekterli <vekterli@oath.com> | 2018-03-08 15:25:07 +0100 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@oath.com> | 2018-03-08 15:25:07 +0100 |
commit | 3870caacffdb6156b8ab2bd8709df328020bd108 (patch) | |
tree | 345620a92d8a05edc80bd4f108f2b2d0d52365bb /clustercontroller-core | |
parent | 7ab8b249ff0672348bde4d801f97ef51338211a3 (diff) |
Update constraint mock variable naming
Diffstat (limited to 'clustercontroller-core')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java index 3b052a1bcb2..294c57d520c 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java @@ -20,11 +20,11 @@ public class MaintenanceWhenPendingGlobalMergesTest { private static class Fixture { MergePendingChecker mockPendingChecker = mock(MergePendingChecker.class); - MaintenanceTransitionConstraint mockEligibilityChecker = mock(MaintenanceTransitionConstraint.class); - MaintenanceWhenPendingGlobalMerges deriver = new MaintenanceWhenPendingGlobalMerges(mockPendingChecker, mockEligibilityChecker); + MaintenanceTransitionConstraint mockTransitionConstraint = mock(MaintenanceTransitionConstraint.class); + MaintenanceWhenPendingGlobalMerges deriver = new MaintenanceWhenPendingGlobalMerges(mockPendingChecker, mockTransitionConstraint); Fixture() { - when(mockEligibilityChecker.maintenanceTransitionAllowed(anyInt())).thenReturn(true); + when(mockTransitionConstraint.maintenanceTransitionAllowed(anyInt())).thenReturn(true); } } @@ -111,7 +111,7 @@ public class MaintenanceWhenPendingGlobalMergesTest { public void node_with_pending_merges_only_set_to_maintenance_if_eligible() { Fixture f = new Fixture(); Arrays.asList(1, 2, 3).forEach(idx -> when(f.mockPendingChecker.mayHaveMergesPending(globalSpace(), idx)).thenReturn(true)); - Arrays.asList(1, 2, 4).forEach(idx -> when(f.mockEligibilityChecker.maintenanceTransitionAllowed(idx)).thenReturn(false)); + Arrays.asList(1, 2, 4).forEach(idx -> when(f.mockTransitionConstraint.maintenanceTransitionAllowed(idx)).thenReturn(false)); AnnotatedClusterState derived = f.deriver.derivedFrom(stateFromString("distributor:5 storage:5"), defaultSpace()); assertThat(derived, equalTo(AnnotatedClusterStateBuilder.ofState("distributor:5 storage:5 .3.s:m") .reason(MAY_HAVE_MERGES_PENDING, 3).build())); |