From 6d83273fd48a41eb345502383aa2b97a04e961c0 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 12 Feb 2020 13:34:59 +0100 Subject: Remove constructor only used in test --- .../java/com/yahoo/vespa/config/TimingValues.java | 30 ++++++---------------- .../com/yahoo/vespa/config/TimingValuesTest.java | 25 ------------------ 2 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java (limited to 'config') diff --git a/config/src/main/java/com/yahoo/vespa/config/TimingValues.java b/config/src/main/java/com/yahoo/vespa/config/TimingValues.java index 113d561bf87..780cf657009 100644 --- a/config/src/main/java/com/yahoo/vespa/config/TimingValues.java +++ b/config/src/main/java/com/yahoo/vespa/config/TimingValues.java @@ -38,7 +38,6 @@ public class TimingValues { long configuredErrorDelay, long fixedDelay, int maxDelayMultiplier) { - this.successTimeout = successTimeout; this.errorTimeout = errorTimeout; this.initialTimeout = initialTimeout; @@ -51,15 +50,14 @@ public class TimingValues { } private TimingValues(long successTimeout, - long errorTimeout, - long initialTimeout, - long subscribeTimeout, - long unconfiguredDelay, - long configuredErrorDelay, - long fixedDelay, - int maxDelayMultiplier, - Random rand) { - + long errorTimeout, + long initialTimeout, + long subscribeTimeout, + long unconfiguredDelay, + long configuredErrorDelay, + long fixedDelay, + int maxDelayMultiplier, + Random rand) { this.successTimeout = successTimeout; this.errorTimeout = errorTimeout; this.initialTimeout = initialTimeout; @@ -71,18 +69,6 @@ public class TimingValues { this.rand = rand; } - public TimingValues(TimingValues tv) { - this(tv.successTimeout, - tv.errorTimeout, - tv.initialTimeout, - tv.subscribeTimeout, - tv.unconfiguredDelay, - tv.configuredErrorDelay, - tv.fixedDelay, - tv.maxDelayMultiplier, - tv.getRandom()); - } - public TimingValues(TimingValues tv, Random random) { this(tv.successTimeout, tv.errorTimeout, diff --git a/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java b/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java deleted file mode 100644 index 0be5e98ff0a..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config; - -import org.junit.Test; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertThat; - -/** - * Note: Most of the functionality is tested implicitly by other tests - * - * @author hmusum - */ -public class TimingValuesTest { - - @Test - public void basic() { - TimingValues tv = new TimingValues(); - TimingValues tv2 = new TimingValues(1L, 1L, 1L, 1L, 1L, 1L, 1L, 1); - assertThat(tv.getRandom(), is(not(tv2.getRandom()))); - TimingValues copy = new TimingValues(tv2); - assertThat(copy.toString(), is(tv2.toString())); // No equals method, just using toString to compare - } -} -- cgit v1.2.3