From 57443a7b09bab41cd4c2d8be3b898d244d0df94c Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 30 Jun 2020 11:25:59 +0200 Subject: MockRpc -> MockRpcServer --- .../config/server/ConfigServerBootstrapTest.java | 8 +- .../server/rpc/DelayedConfigResponseTest.java | 6 +- .../com/yahoo/vespa/config/server/rpc/MockRpc.java | 105 --------------------- .../vespa/config/server/rpc/MockRpcServer.java | 105 +++++++++++++++++++++ 4 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java create mode 100644 configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java (limited to 'configserver/src') diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java index 654d811a31f..23323d11f76 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java @@ -199,8 +199,8 @@ public class ConfigServerBootstrapTest { throw new RuntimeException(messageIfWaitingFails); } - private MockRpc createRpcServer(ConfigserverConfig configserverConfig) throws IOException { - return new MockRpc(configserverConfig.rpcport(), temporaryFolder.newFolder()); + private MockRpcServer createRpcServer(ConfigserverConfig configserverConfig) throws IOException { + return new MockRpcServer(configserverConfig.rpcport(), temporaryFolder.newFolder()); } private StateMonitor createStateMonitor() { @@ -241,11 +241,11 @@ public class ConfigServerBootstrapTest { stateMonitor); } - public static class MockRpc extends com.yahoo.vespa.config.server.rpc.MockRpc { + public static class MockRpcServer extends com.yahoo.vespa.config.server.rpc.MockRpcServer { volatile boolean isRunning = false; - MockRpc(int port, File tempDir) { + MockRpcServer(int port, File tempDir) { super(port, tempDir); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java index 87459228d0d..8c62fe77557 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java @@ -39,7 +39,7 @@ public class DelayedConfigResponseTest { @Test public void testDelayedConfigResponses() throws IOException { - MockRpc rpc = new MockRpc(13337, temporaryFolder.newFolder()); + MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder()); DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false); assertThat(responses.size(), is(0)); JRTServerConfigRequest req = createRequest("foo", "md5", "myid", "mymd5", 3, 1000000, "bar"); @@ -60,7 +60,7 @@ public class DelayedConfigResponseTest { @Test public void testDelayResponseRemove() throws IOException { GetConfigContext context = GetConfigContext.testContext(ApplicationId.defaultId()); - MockRpc rpc = new MockRpc(13337, temporaryFolder.newFolder()); + MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder()); DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false); responses.delayResponse(createRequest("foolio", "md5", "myid", "mymd5", 3, 100000, "bar"), context); assertThat(responses.size(), is(1)); @@ -70,7 +70,7 @@ public class DelayedConfigResponseTest { @Test public void testDelayedConfigResponse() throws IOException { - MockRpc rpc = new MockRpc(13337, temporaryFolder.newFolder()); + MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder()); DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false); assertThat(responses.size(), is(0)); assertThat(responses.toString(), is("DelayedConfigResponses. Average Size=0")); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java deleted file mode 100644 index 9f514d9996f..00000000000 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java +++ /dev/null @@ -1,105 +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.server.rpc; - -import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.component.Version; -import com.yahoo.vespa.config.protocol.ConfigResponse; -import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; -import com.yahoo.vespa.config.server.GetConfigContext; -import com.yahoo.vespa.config.server.filedistribution.FileServer; -import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker; -import com.yahoo.vespa.config.server.host.HostRegistries; -import com.yahoo.vespa.config.server.monitoring.Metrics; -import com.yahoo.vespa.config.server.rpc.security.NoopRpcAuthorizer; - -import java.io.File; -import java.time.Duration; -import java.time.Instant; -import java.util.Optional; -import java.util.concurrent.CompletionService; - -/** - * Test utility mocking an RPC server. - * - * @author Ulf Lilleengen - */ -public class MockRpc extends RpcServer { - - public boolean forced = false; - public RuntimeException exception = null; - public int errorCode = 0; - public ConfigResponse response = null; - - // Fields used to assert on the calls made to this from tests - public boolean tryResolveConfig = false; - public boolean tryRespond = false; - /** The last request received and responded to */ - public volatile JRTServerConfigRequest latestRequest = null; - - - public MockRpc(int port, File tempDir) { - super(createConfig(port), - null, - Metrics.createTestMetrics(), - new HostRegistries(), - new ConfigRequestHostLivenessTracker(), - new FileServer(tempDir), - new NoopRpcAuthorizer(), - new RpcRequestHandlerProvider()); - } - - private static ConfigserverConfig createConfig(int port) { - ConfigserverConfig.Builder b = new ConfigserverConfig.Builder(); - b.rpcport(port); - return new ConfigserverConfig(b); - } - - boolean waitUntilSet(Duration timeout) { - Instant end = Instant.now().plus(timeout); - while (Instant.now().isBefore(end)) { - if (latestRequest != null) - return true; - try { - Thread.sleep(10); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - return false; - } - - @Override - public Boolean addToRequestQueue(JRTServerConfigRequest request, boolean forceResponse, CompletionService completionService) { - latestRequest = request; - forced = forceResponse; - return true; - } - - @Override - public void respond(JRTServerConfigRequest request) { - latestRequest = request; - tryRespond = true; - errorCode = request.errorCode(); - } - - @Override - public ConfigResponse resolveConfig(JRTServerConfigRequest request, GetConfigContext context, Optional vespaVersion) { - tryResolveConfig = true; - if (exception != null) { - throw exception; - } - return response; - } - - @Override - public boolean isHostedVespa() { return true; } - - @Override - public boolean allTenantsLoaded() { return true; } - - @Override - public boolean isRunning() { - return true; - } - -} diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java new file mode 100644 index 00000000000..96518d535bf --- /dev/null +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java @@ -0,0 +1,105 @@ +// 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.server.rpc; + +import com.yahoo.cloud.config.ConfigserverConfig; +import com.yahoo.component.Version; +import com.yahoo.vespa.config.protocol.ConfigResponse; +import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; +import com.yahoo.vespa.config.server.GetConfigContext; +import com.yahoo.vespa.config.server.filedistribution.FileServer; +import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker; +import com.yahoo.vespa.config.server.host.HostRegistries; +import com.yahoo.vespa.config.server.monitoring.Metrics; +import com.yahoo.vespa.config.server.rpc.security.NoopRpcAuthorizer; + +import java.io.File; +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; +import java.util.concurrent.CompletionService; + +/** + * Test utility mocking an RPC server. + * + * @author Ulf Lilleengen + */ +public class MockRpcServer extends RpcServer { + + public boolean forced = false; + public RuntimeException exception = null; + public int errorCode = 0; + public ConfigResponse response = null; + + // Fields used to assert on the calls made to this from tests + public boolean tryResolveConfig = false; + public boolean tryRespond = false; + /** The last request received and responded to */ + public volatile JRTServerConfigRequest latestRequest = null; + + + public MockRpcServer(int port, File tempDir) { + super(createConfig(port), + null, + Metrics.createTestMetrics(), + new HostRegistries(), + new ConfigRequestHostLivenessTracker(), + new FileServer(tempDir), + new NoopRpcAuthorizer(), + new RpcRequestHandlerProvider()); + } + + private static ConfigserverConfig createConfig(int port) { + ConfigserverConfig.Builder b = new ConfigserverConfig.Builder(); + b.rpcport(port); + return new ConfigserverConfig(b); + } + + boolean waitUntilSet(Duration timeout) { + Instant end = Instant.now().plus(timeout); + while (Instant.now().isBefore(end)) { + if (latestRequest != null) + return true; + try { + Thread.sleep(10); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + return false; + } + + @Override + public Boolean addToRequestQueue(JRTServerConfigRequest request, boolean forceResponse, CompletionService completionService) { + latestRequest = request; + forced = forceResponse; + return true; + } + + @Override + public void respond(JRTServerConfigRequest request) { + latestRequest = request; + tryRespond = true; + errorCode = request.errorCode(); + } + + @Override + public ConfigResponse resolveConfig(JRTServerConfigRequest request, GetConfigContext context, Optional vespaVersion) { + tryResolveConfig = true; + if (exception != null) { + throw exception; + } + return response; + } + + @Override + public boolean isHostedVespa() { return true; } + + @Override + public boolean allTenantsLoaded() { return true; } + + @Override + public boolean isRunning() { + return true; + } + +} -- cgit v1.2.3