diff options
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java | 8 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java | 6 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java (renamed from configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java) | 4 |
3 files changed, 9 insertions, 9 deletions
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/MockRpcServer.java index 9f514d9996f..96518d535bf 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java @@ -23,7 +23,7 @@ import java.util.concurrent.CompletionService; * * @author Ulf Lilleengen */ -public class MockRpc extends RpcServer { +public class MockRpcServer extends RpcServer { public boolean forced = false; public RuntimeException exception = null; @@ -37,7 +37,7 @@ public class MockRpc extends RpcServer { public volatile JRTServerConfigRequest latestRequest = null; - public MockRpc(int port, File tempDir) { + public MockRpcServer(int port, File tempDir) { super(createConfig(port), null, Metrics.createTestMetrics(), |