Use TemporaryFolder in more places

3 files changed, 17 insertions, 10 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
index ef742ae3d38..3cfe6aa7c6d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
@@ -48,7 +48,7 @@ public class RpcServerTest extends TestWithRpc {
         testEmptyConfigHostedVespa();
     }
 
-    private void testEmptyConfigHostedVespa() throws InterruptedException {
+    private void testEmptyConfigHostedVespa() throws InterruptedException, IOException {
         rpcServer.onTenantDelete(TenantName.defaultName());
         rpcServer.onTenantsLoaded();
         JRTClientConfigRequest clientReq = createSimpleRequest();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java
index eadf17a019d..845e7c0f914 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java
@@ -1,9 +1,7 @@
 // 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.google.common.io.Files;
 import com.yahoo.cloud.config.ConfigserverConfig;
-import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.provision.HostLivenessTracker;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.jrt.Request;
@@ -21,7 +19,10 @@ import com.yahoo.vespa.config.server.monitoring.Metrics;
 import com.yahoo.vespa.config.server.tenant.MockTenantProvider;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -37,8 +38,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Test running rpc server.
  *
- * @author lulf
- * @since 5.17
+ * @author Ulf Lilleengen
  */
 // TODO: Make this a Tester instead of a superclass
 public class TestWithRpc {
@@ -57,8 +57,11 @@ public class TestWithRpc {
 
     private List<Integer> allocatedPorts;
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Before
-    public void setupRpc() throws InterruptedException {
+    public void setupRpc() throws InterruptedException, IOException {
         allocatedPorts = new ArrayList<>();
         port = allocatePort();
         spec = createSpec(port);
@@ -81,7 +84,7 @@ public class TestWithRpc {
         return port;
     }
 
-    protected void createAndStartRpcServer(boolean hostedVespa) {
+    protected void createAndStartRpcServer(boolean hostedVespa) throws IOException {
         ConfigserverConfig configserverConfig = new ConfigserverConfig(new ConfigserverConfig.Builder());
         rpcServer = new RpcServer(new ConfigserverConfig(new ConfigserverConfig.Builder()
                                                                  .rpcport(port)
@@ -95,7 +98,7 @@ public class TestWithRpc {
                                                                        emptyNodeFlavors(),
                                                                        generationCounter)),
                                   Metrics.createTestMetrics(), new HostRegistries(),
-                                  hostLivenessTracker, new FileServer(Files.createTempDir()));
+                                  hostLivenessTracker, new FileServer(temporaryFolder.newFolder()));
         rpcServer.onTenantCreate(TenantName.from("default"), tenantProvider);
         t = new Thread(rpcServer);
         t.start();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
index cde0e1d0f53..987dd8a6c4d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
@@ -1,7 +1,6 @@
 // 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.session;
 
-import com.google.common.io.Files;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.test.ManualClock;
 import com.yahoo.config.provision.TenantName;
@@ -15,7 +14,9 @@ import com.yahoo.vespa.config.server.host.HostRegistry;
 import com.yahoo.vespa.config.server.http.SessionHandlerTest;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 import java.time.Duration;
@@ -35,6 +36,9 @@ public class LocalSessionRepoTest extends TestWithCurator {
     private ManualClock clock;
     private static final TenantName tenantName = TenantName.defaultName();
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Before
     public void setupSessions() throws Exception {
         setupSessions(tenantName, true);
@@ -42,7 +46,7 @@ public class LocalSessionRepoTest extends TestWithCurator {
 
     private void setupSessions(TenantName tenantName, boolean createInitialSessions) throws Exception {
         GlobalComponentRegistry globalComponentRegistry = new TestComponentRegistry.Builder().curator(curator).build();
-        TenantFileSystemDirs tenantFileSystemDirs = new TenantFileSystemDirs(Files.createTempDir(), tenantName);
+        TenantFileSystemDirs tenantFileSystemDirs = new TenantFileSystemDirs(temporaryFolder.newFolder(), tenantName);
         if (createInitialSessions) {
             IOUtils.copyDirectory(testApp, new File(tenantFileSystemDirs.sessionsPath(), "1"));
             IOUtils.copyDirectory(testApp, new File(tenantFileSystemDirs.sessionsPath(), "2"));