This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d5742ef724 HDDS-10165. Replace GenericTestUtils temp dirs with
`@TempDir` in ozone unit tests (#6142)
d5742ef724 is described below
commit d5742ef724eeda88681a6ed5e26fae2ba3fd2f74
Author: Raju Balpande <146973984+raju-balpa...@users.noreply.github.com>
AuthorDate: Thu Feb 1 23:04:13 2024 +0530
HDDS-10165. Replace GenericTestUtils temp dirs with `@TempDir` in ozone
unit tests (#6142)
---
.../apache/hadoop/ozone/om/TestKeyManagerUnit.java | 14 ++-----
.../ozone/om/TestOzoneManagerHttpServer.java | 15 +++----
.../om/ratis/TestOzoneManagerRatisServer.java | 9 +---
.../om/service/TestSnapshotDiffCleanupService.java | 10 ++---
.../ozone/om/snapshot/TestOmSnapshotUtils.java | 2 -
.../om/snapshot/TestRocksDbPersistentList.java | 10 ++---
.../om/snapshot/TestRocksDbPersistentMap.java | 10 ++---
.../om/snapshot/TestRocksDbPersistentSet.java | 10 ++---
.../security/TestOmCertificateClientInit.java | 9 +---
.../ozone/security/TestOzoneTokenIdentifier.java | 48 ++++------------------
.../security/acl/TestOzoneNativeAuthorizer.java | 11 +----
.../hadoop/ozone/security/acl/TestParentAcl.java | 11 +----
.../hadoop/ozone/security/acl/TestVolumeOwner.java | 11 +----
.../hadoop/ozone/recon/api/TestEndpoints.java | 3 +-
.../ozone/recon/api/TestOpenContainerCount.java | 3 +-
...TestReconIncrementalContainerReportHandler.java | 8 +---
.../TestGenerateOzoneRequiredConfigurations.java | 44 +++++++-------------
17 files changed, 65 insertions(+), 163 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
index 0a515f6ede..6454a77d66 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
@@ -19,8 +19,8 @@
package org.apache.hadoop.ozone.om;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
@@ -33,7 +33,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.BlockID;
@@ -69,7 +68,6 @@ import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
import org.apache.ozone.test.OzoneTestBase;
@@ -78,6 +76,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -112,20 +111,16 @@ class TestKeyManagerUnit extends OzoneTestBase {
private KeyManagerImpl keyManager;
private Instant startDate;
- private File testDir;
private ScmBlockLocationProtocol blockClient;
private OzoneManagerProtocol writeClient;
private OzoneManager om;
@BeforeAll
- void setup() throws Exception {
+ void setup(@TempDir Path testDir) throws Exception {
ExitUtils.disableSystemExit();
-
configuration = new OzoneConfiguration();
- testDir = GenericTestUtils.getRandomizedTestDir();
- configuration.set(HddsConfigKeys.OZONE_METADATA_DIRS,
- testDir.toString());
+ configuration.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.toString());
containerClient = mock(StorageContainerLocationProtocol.class);
blockClient = mock(ScmBlockLocationProtocol.class);
@@ -146,7 +141,6 @@ class TestKeyManagerUnit extends OzoneTestBase {
@AfterAll
public void cleanup() throws Exception {
om.stop();
- FileUtils.deleteDirectory(testDir);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
index 7d014a16e4..e1ada8c974 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.net.InetSocketAddress;
import java.net.URL;
@@ -27,7 +28,6 @@ import java.net.URLConnection;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.server.http.BaseHttpServer;
import org.apache.hadoop.hdfs.web.URLConnectionFactory;
@@ -36,11 +36,11 @@ import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -48,8 +48,6 @@ import org.junit.jupiter.params.provider.MethodSource;
* Test http server of OM with various HTTP option.
*/
public class TestOzoneManagerHttpServer {
- private static final String BASEDIR = GenericTestUtils
- .getTempPath(TestOzoneManagerHttpServer.class.getSimpleName());
private static String keystoresDir;
private static String sslConfDir;
private static OzoneConfiguration conf;
@@ -63,17 +61,15 @@ public class TestOzoneManagerHttpServer {
return Arrays.asList(params);
}
- @BeforeAll public static void setUp() throws Exception {
- File base = new File(BASEDIR);
- FileUtil.fullyDelete(base);
+ @BeforeAll public static void setUp(@TempDir File baseDir) throws Exception {
// Create metadata directory
- ozoneMetadataDirectory = new File(BASEDIR, "metadata");
+ ozoneMetadataDirectory = new File(baseDir.getPath(), "metadata");
ozoneMetadataDirectory.mkdirs();
// Initialize the OzoneConfiguration
conf = new OzoneConfiguration();
- keystoresDir = new File(BASEDIR).getAbsolutePath();
+ keystoresDir = baseDir.getAbsolutePath();
sslConfDir = KeyStoreTestUtil.getClasspathDir(
TestOzoneManagerHttpServer.class);
KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false);
@@ -95,7 +91,6 @@ public class TestOzoneManagerHttpServer {
@AfterAll public static void tearDown() throws Exception {
connectionFactory.destroy();
- FileUtil.fullyDelete(new File(BASEDIR));
KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
index c2f2feae62..1e4787df42 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.Collections;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -91,11 +90,9 @@ public class TestOzoneManagerRatisServer {
}
@BeforeEach
- public void init() throws Exception {
+ public void init(@TempDir Path metaDirPath) throws Exception {
conf = new OzoneConfiguration();
omID = UUID.randomUUID().toString();
- final String path = GenericTestUtils.getTempPath(omID);
- Path metaDirPath = Paths.get(path, "om-meta");
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDirPath.toString());
conf.setTimeDuration(OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_KEY,
RATIS_RPC_TIMEOUT, TimeUnit.MILLISECONDS);
@@ -215,13 +212,11 @@ public class TestOzoneManagerRatisServer {
}
@Test
- public void verifyRaftGroupIdGenerationWithCustomOmServiceId() throws
+ public void verifyRaftGroupIdGenerationWithCustomOmServiceId(@TempDir Path
metaDirPath) throws
Exception {
String customOmServiceId = "omSIdCustom123";
OzoneConfiguration newConf = new OzoneConfiguration();
String newOmId = UUID.randomUUID().toString();
- String path = GenericTestUtils.getTempPath(newOmId);
- Path metaDirPath = Paths.get(path, "om-meta");
newConf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDirPath.toString());
newConf.setTimeDuration(OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_KEY,
RATIS_RPC_TIMEOUT, TimeUnit.MILLISECONDS);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDiffCleanupService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDiffCleanupService.java
index 8c9507b20f..dfbc6a3b94 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDiffCleanupService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDiffCleanupService.java
@@ -30,12 +30,12 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.SnapshotDiffJob;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.rocksdb.ColumnFamilyDescriptor;
@@ -44,6 +44,7 @@ import org.rocksdb.RocksDBException;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.ArrayList;
@@ -72,7 +73,8 @@ import static org.mockito.Mockito.when;
* Tests SnapshotDiffCleanupService.
*/
public class TestSnapshotDiffCleanupService {
- private static File file;
+ @TempDir
+ private static Path tempDir;
private static ManagedRocksDB db;
private static ManagedDBOptions dbOptions;
private static ManagedColumnFamilyOptions columnFamilyOptions;
@@ -102,7 +104,7 @@ public class TestSnapshotDiffCleanupService {
dbOptions.setCreateIfMissing(true);
columnFamilyOptions = new ManagedColumnFamilyOptions();
- file = new File("./test-snap-diff-clean-up");
+ File file = tempDir.resolve("./test-snap-diff-clean-up").toFile();
if (!file.mkdirs() && !file.exists()) {
throw new IllegalArgumentException("Unable to create directory " +
file);
@@ -133,8 +135,6 @@ public class TestSnapshotDiffCleanupService {
if (db != null) {
db.close();
}
-
- GenericTestUtils.deleteDirectory(file);
}
@BeforeEach
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotUtils.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotUtils.java
index da182730bc..190db469c1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotUtils.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotUtils.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.om.snapshot;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.service.SnapshotDeletingService;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
@@ -82,7 +81,6 @@ public class TestOmSnapshotUtils {
map(Path::toString).collect(Collectors.toSet());
assertEquals(tree1Files, tree2Files);
- GenericTestUtils.deleteDirectory(tempDir);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentList.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentList.java
index 990bdc4849..10df90b434 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentList.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentList.java
@@ -18,6 +18,7 @@ package org.apache.hadoop.ozone.om.snapshot;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,10 +30,10 @@ import
org.apache.hadoop.hdds.utils.db.managed.ManagedColumnFamilyOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedDBOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
import org.apache.hadoop.util.ClosableIterator;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDBException;
@@ -44,7 +45,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Test persistent list backed by RocksDB.
*/
public class TestRocksDbPersistentList {
- private static File file;
+ @TempDir
+ private static Path tempDir;
private static ManagedRocksDB db;
private static ManagedDBOptions dbOptions;
private static ManagedColumnFamilyOptions columnFamilyOptions;
@@ -55,7 +57,7 @@ public class TestRocksDbPersistentList {
dbOptions.setCreateIfMissing(true);
columnFamilyOptions = new ManagedColumnFamilyOptions();
- file = new File("./test-persistent-list");
+ File file = tempDir.resolve("./test-persistent-list").toFile();
if (!file.mkdirs() && !file.exists()) {
throw new IllegalArgumentException("Unable to create directory " +
file);
@@ -86,8 +88,6 @@ public class TestRocksDbPersistentList {
if (db != null) {
db.close();
}
-
- GenericTestUtils.deleteDirectory(file);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentMap.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentMap.java
index 46946e09a2..7fc29b0e4a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentMap.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentMap.java
@@ -18,6 +18,7 @@ package org.apache.hadoop.ozone.om.snapshot;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
@@ -38,10 +39,10 @@ import
org.apache.hadoop.hdds.utils.db.managed.ManagedColumnFamilyOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedDBOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
import org.apache.hadoop.util.ClosableIterator;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -56,7 +57,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Test persistent map backed by RocksDB.
*/
public class TestRocksDbPersistentMap {
- private static File file;
+ @TempDir
+ private static Path tempDir;
private static ManagedRocksDB db;
private static ManagedDBOptions dbOptions;
private static ManagedColumnFamilyOptions columnFamilyOptions;
@@ -69,7 +71,7 @@ public class TestRocksDbPersistentMap {
dbOptions.setCreateIfMissing(true);
columnFamilyOptions = new ManagedColumnFamilyOptions();
- file = new File("./test-persistent-map");
+ File file = tempDir.resolve("./test-persistent-map").toFile();
if (!file.mkdirs() && !file.exists()) {
throw new IllegalArgumentException("Unable to create directory " +
file);
@@ -101,8 +103,6 @@ public class TestRocksDbPersistentMap {
if (db != null) {
db.close();
}
-
- GenericTestUtils.deleteDirectory(file);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentSet.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentSet.java
index 6f2248f75c..7bf7071353 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentSet.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestRocksDbPersistentSet.java
@@ -18,6 +18,7 @@ package org.apache.hadoop.ozone.om.snapshot;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,10 +33,10 @@ import
org.apache.hadoop.hdds.utils.db.managed.ManagedColumnFamilyOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedDBOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
import org.apache.hadoop.util.ClosableIterator;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDBException;
@@ -48,7 +49,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
* Test persistent set backed by RocksDB.
*/
public class TestRocksDbPersistentSet {
- private static File file;
+ @TempDir
+ private static Path tempDir;
private static ManagedRocksDB db;
private static ManagedDBOptions dbOptions;
private static ManagedColumnFamilyOptions columnFamilyOptions;
@@ -59,7 +61,7 @@ public class TestRocksDbPersistentSet {
dbOptions.setCreateIfMissing(true);
columnFamilyOptions = new ManagedColumnFamilyOptions();
- file = new File("./test-persistent-set");
+ File file = tempDir.resolve("./test-persistent-set").toFile();
if (!file.mkdirs() && !file.exists()) {
throw new IllegalArgumentException("Unable to create directory " +
file);
@@ -91,8 +93,6 @@ public class TestRocksDbPersistentSet {
if (db != null) {
db.close();
}
-
- GenericTestUtils.deleteDirectory(file);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
index 7aa0a0fcca..b8ecc4fd7e 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
@@ -29,10 +29,10 @@ import org.apache.hadoop.ozone.OzoneSecurityUtil;
import org.apache.hadoop.ozone.om.OMStorage;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
-import org.apache.ozone.test.GenericTestUtils;
import org.bouncycastle.cert.X509CertificateHolder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -66,7 +66,6 @@ public class TestOmCertificateClientInit {
private String certSerialId = "3284792342234";
private OMCertificateClient omCertificateClient;
private HDDSKeyGenerator keyGenerator;
- private Path metaDirPath;
private SecurityConfig securityConfig;
private KeyCodec omKeyCodec;
private X509Certificate x509Certificate;
@@ -86,11 +85,8 @@ public class TestOmCertificateClientInit {
}
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp(@TempDir Path metaDirPath) throws Exception {
OzoneConfiguration config = new OzoneConfiguration();
- final String path = GenericTestUtils
- .getTempPath(UUID.randomUUID().toString());
- metaDirPath = Paths.get(path, "test");
config.set(HDDS_METADATA_DIR_NAME, metaDirPath.toString());
securityConfig = new SecurityConfig(config);
keyGenerator = new HDDSKeyGenerator(securityConfig);
@@ -115,7 +111,6 @@ public class TestOmCertificateClientInit {
public void tearDown() throws IOException {
omCertificateClient.close();
omCertificateClient = null;
- FileUtils.deleteQuietly(metaDirPath.toFile());
}
@ParameterizedTest
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
index d13aa6b5bf..a4e4447c7d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
@@ -29,6 +29,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.file.Path;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.KeyPair;
@@ -45,23 +46,17 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.hadoop.fs.FileUtil;
-import org.apache.hadoop.hdds.conf.ConfigurationSource;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.db.Codec;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.ozone.om.codec.TokenIdentifierCodec;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
-import org.apache.hadoop.security.ssl.TestSSLFactory;
import org.apache.hadoop.security.token.Token;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,11 +67,6 @@ public class TestOzoneTokenIdentifier {
private static final Logger LOG = LoggerFactory
.getLogger(TestOzoneTokenIdentifier.class);
- private static final String BASEDIR = GenericTestUtils
- .getTempPath(TestOzoneTokenIdentifier.class.getSimpleName());
- private static final String KEYSTORES_DIR =
- new File(BASEDIR).getAbsolutePath();
- private static File base;
private static String sslConfsDir;
private static final String EXCLUDE_CIPHERS =
"TLS_ECDHE_RSA_WITH_RC4_128_SHA,"
@@ -87,35 +77,11 @@ public class TestOzoneTokenIdentifier {
+ "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA,"
+ "SSL_RSA_WITH_RC4_128_MD5";
- @BeforeAll
- public static void setUp() throws Exception {
- base = new File(BASEDIR);
- FileUtil.fullyDelete(base);
- base.mkdirs();
- }
-
- private ConfigurationSource createConfiguration(boolean clientCert,
- boolean trustStore)
- throws Exception {
- OzoneConfiguration conf = new OzoneConfiguration();
- KeyStoreTestUtil.setupSSLConfig(KEYSTORES_DIR, sslConfsDir, conf,
- clientCert, trustStore, EXCLUDE_CIPHERS);
- sslConfsDir = KeyStoreTestUtil.getClasspathDir(TestSSLFactory.class);
- return conf;
- }
-
- @AfterAll
- public static void cleanUp() throws Exception {
- FileUtil.fullyDelete(base);
- KeyStoreTestUtil.cleanupSSLConfig(KEYSTORES_DIR, sslConfsDir);
- }
@Test
- public void testSignToken() throws GeneralSecurityException, IOException {
- String keystore = new File(KEYSTORES_DIR, "keystore.jks")
- .getAbsolutePath();
- String truststore = new File(KEYSTORES_DIR, "truststore.jks")
- .getAbsolutePath();
+ public void testSignToken(@TempDir Path baseDir) throws
GeneralSecurityException, IOException {
+ String keystore =
baseDir.resolve("keystore.jks").toFile().getAbsolutePath();
+ String truststore =
baseDir.resolve("truststore.jks").toFile().getAbsolutePath();
String trustPassword = "trustPass";
String keyStorePassword = "keyStorePass";
String keyPassword = "keyPass";
@@ -282,9 +248,9 @@ public class TestOzoneTokenIdentifier {
* Test serialization/deserialization of OzoneTokenIdentifier.
*/
@Test
- public void testReadWriteInProtobuf() throws IOException {
+ public void testReadWriteInProtobuf(@TempDir Path baseDir) throws
IOException {
OzoneTokenIdentifier id = getIdentifierInst();
- File idFile = new File(BASEDIR + "/tokenFile");
+ File idFile = baseDir.resolve("tokenFile").toFile();
FileOutputStream fop = new FileOutputStream(idFile);
DataOutputStream dataOutputStream = new DataOutputStream(fop);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
index e5723f0a2a..f5bb8d3535 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
@@ -16,7 +16,6 @@
*/
package org.apache.hadoop.ozone.security.acl;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -42,10 +41,9 @@ import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.ozone.test.GenericTestUtils;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -90,6 +88,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestOzoneNativeAuthorizer {
private static final List<String> ADMIN_USERNAMES = singletonList("om");
+ @TempDir
private static File testDir;
private String vol;
private String buck;
@@ -144,7 +143,6 @@ public class TestOzoneNativeAuthorizer {
OzoneConfiguration ozConfig = new OzoneConfiguration();
ozConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- testDir = GenericTestUtils.getRandomizedTestDir();
ozConfig.set(OZONE_METADATA_DIRS, testDir.toString());
ozConfig.set(OZONE_ADMINISTRATORS, "om");
@@ -164,11 +162,6 @@ public class TestOzoneNativeAuthorizer {
new String[]{"test"});
}
- @AfterAll
- public static void cleanup() throws IOException {
- FileUtils.deleteDirectory(testDir);
- }
-
private void createKey(String volume,
String bucket, String keyName) throws IOException {
OmKeyArgs keyArgs = new OmKeyArgs.Builder()
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
index c73752904e..f17d477bd7 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.security.acl;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -44,11 +43,10 @@ import
org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Unhealthy;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.io.IOException;
@@ -91,6 +89,7 @@ public class TestParentAcl {
private static UserGroupInformation adminUgi;
private static UserGroupInformation testUgi, testUgi1;
private static OzoneManagerProtocol writeClient;
+ @TempDir
private static File testDir;
@BeforeAll
@@ -98,7 +97,6 @@ public class TestParentAcl {
ozConfig = new OzoneConfiguration();
ozConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- testDir = GenericTestUtils.getRandomizedTestDir();
ozConfig.set(OZONE_METADATA_DIRS, testDir.toString());
ozConfig.set(OZONE_ADMINISTRATORS, "om");
@@ -121,11 +119,6 @@ public class TestParentAcl {
new String[]{"test1"});
}
- @AfterAll
- public static void cleanup() throws IOException {
- FileUtils.deleteDirectory(testDir);
- }
-
@Test
@Unhealthy("HDDS-6335")
public void testKeyAcl()
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
index 6670dc644d..983086d251 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.security.acl;
-import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -37,10 +36,9 @@ import org.apache.hadoop.ozone.om.helpers.OzoneAclUtil;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.ozone.test.GenericTestUtils;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.io.IOException;
@@ -73,6 +71,7 @@ public class TestVolumeOwner {
private static OMMetadataManager metadataManager;
private static UserGroupInformation testUgi;
private static OzoneManagerProtocol writeClient;
+ @TempDir
private static File testDir;
@BeforeAll
@@ -80,7 +79,6 @@ public class TestVolumeOwner {
ozoneConfig = new OzoneConfiguration();
ozoneConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- testDir = GenericTestUtils.getRandomizedTestDir();
ozoneConfig.set(OZONE_METADATA_DIRS, testDir.toString());
OmTestManagers omTestManagers =
@@ -103,11 +101,6 @@ public class TestVolumeOwner {
prepareTestKeys();
}
- @AfterAll
- public static void cleanup() throws IOException {
- FileUtils.deleteDirectory(testDir);
- }
-
// create 2 volumes
private static void prepareTestVols() throws IOException {
for (int i = 0; i < 2; i++) {
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
index 10e2eb2323..05d9927d6c 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
@@ -88,7 +88,6 @@ import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImp
import org.apache.hadoop.ozone.recon.tasks.ContainerSizeCountTask;
import org.apache.hadoop.ozone.recon.tasks.FileSizeCountTask;
import org.apache.hadoop.ozone.recon.tasks.OmTableInsightTask;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.apache.ozone.test.LambdaTestUtils;
import org.hadoop.ozone.recon.schema.UtilizationSchemaDefinition;
@@ -245,7 +244,7 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
when(reconUtilsMock.makeHttpCall(any(URLConnectionFactory.class),
anyString(), anyBoolean())).thenReturn(urlConnectionMock);
when(reconUtilsMock.getReconDbDir(any(OzoneConfiguration.class),
- anyString())).thenReturn(GenericTestUtils.getRandomizedTestDir());
+
anyString())).thenReturn(temporaryFolder.resolve("reconDbDir").toFile());
when(reconUtilsMock.getReconNodeDetails(
any(OzoneConfiguration.class))).thenReturn(
commonUtils.getReconNodeDetails());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
index eb0924a962..8a9452a862 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
@@ -57,7 +57,6 @@ import
org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade;
import org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
-import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.LambdaTestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -197,7 +196,7 @@ public class TestOpenContainerCount {
when(reconUtilsMock.makeHttpCall(any(URLConnectionFactory.class),
anyString(), anyBoolean())).thenReturn(urlConnectionMock);
when(reconUtilsMock.getReconDbDir(any(OzoneConfiguration.class),
- anyString())).thenReturn(GenericTestUtils.getRandomizedTestDir());
+
anyString())).thenReturn(temporaryFolder.resolve("reconDbDir").toFile());
when(reconUtilsMock.getReconNodeDetails(
any(OzoneConfiguration.class))).thenReturn(
commonUtils.getReconNodeDetails());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
index 7330d9de90..efde79f9ba 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -56,8 +55,8 @@ import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.hdds.server.events.EventQueue;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* Test Recon ICR handler.
@@ -67,7 +66,7 @@ public class TestReconIncrementalContainerReportHandler
private HDDSLayoutVersionManager versionManager;
@Test
- public void testProcessICR()
+ public void testProcessICR(@TempDir Path scmPath)
throws IOException, NodeNotFoundException, TimeoutException {
ContainerID containerID = ContainerID.valueOf(100L);
@@ -90,9 +89,6 @@ public class TestReconIncrementalContainerReportHandler
.getExistContainerWithPipelinesInBatch(any(
ArrayList.class))).thenReturn(containerWithPipelineList);
- final String path =
- GenericTestUtils.getTempPath(UUID.randomUUID().toString());
- Path scmPath = Paths.get(path, "scm-meta");
final OzoneConfiguration conf = new OzoneConfiguration();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, scmPath.toString());
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
index ccc9ed7cba..5b580c81c0 100644
---
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
+++
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/genconf/TestGenerateOzoneRequiredConfigurations.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.ozone.genconf;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.ozone.test.GenericTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,6 +29,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine;
@@ -162,8 +162,7 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void testGenerateConfigurations() throws Exception {
- File tempPath = getRandomTempDir();
+ public void testGenerateConfigurations(@TempDir File tempPath) throws
Exception {
String[] args = new String[]{tempPath.getAbsolutePath()};
execute(args, "ozone-site.xml has been generated at " +
tempPath.getAbsolutePath());
@@ -189,16 +188,16 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void testGenerateSecurityConfigurations() throws Exception {
+ public void testGenerateSecurityConfigurations(@TempDir File
tempPathDefault, @TempDir File tempPathSecure)
+ throws Exception {
int ozoneConfigurationCount, ozoneSecurityConfigurationCount;
// Generate default Ozone Configuration
- File tempPath = getRandomTempDir();
- String[] args = new String[]{tempPath.getAbsolutePath()};
+ String[] args = new String[]{tempPathDefault.getAbsolutePath()};
execute(args, "ozone-site.xml has been generated at " +
- tempPath.getAbsolutePath());
+ tempPathDefault.getAbsolutePath());
- URL url = new File(tempPath.getAbsolutePath() + "/ozone-site.xml")
+ URL url = new File(tempPathDefault.getAbsolutePath() + "/ozone-site.xml")
.toURI().toURL();
OzoneConfiguration oc = new OzoneConfiguration();
List<OzoneConfiguration.Property> allProperties =
@@ -210,12 +209,11 @@ public class TestGenerateOzoneRequiredConfigurations {
ozoneConfigurationCount = allProperties.size();
// Generate secure Ozone Configuration
- tempPath = getRandomTempDir();
- args = new String[]{"--security", tempPath.getAbsolutePath()};
+ args = new String[]{"--security", tempPathSecure.getAbsolutePath()};
execute(args, "ozone-site.xml has been generated at " +
- tempPath.getAbsolutePath());
+ tempPathSecure.getAbsolutePath());
- url = new File(tempPath.getAbsolutePath() + "/ozone-site.xml")
+ url = new File(tempPathSecure.getAbsolutePath() + "/ozone-site.xml")
.toURI().toURL();
oc = new OzoneConfiguration();
allProperties = oc.readPropertyFromXml(url);
@@ -235,8 +233,7 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void testDoesNotOverwrite() throws Exception {
- File tempPath = getRandomTempDir();
+ public void testDoesNotOverwrite(@TempDir File tempPath) throws Exception {
String[] args = new String[]{tempPath.getAbsolutePath()};
execute(args, "ozone-site.xml has been generated at " +
tempPath.getAbsolutePath());
@@ -252,8 +249,7 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void genconfFailureByInsufficientPermissions() throws Exception {
- File tempPath = getRandomTempDir();
+ public void genconfFailureByInsufficientPermissions(@TempDir File tempPath)
throws Exception {
tempPath.setReadOnly();
String[] args = new String[]{tempPath.getAbsolutePath()};
executeWithException(args, "Insufficient permission.");
@@ -264,8 +260,7 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void genconfFailureByInvalidPath() throws Exception {
- File tempPath = getRandomTempDir();
+ public void genconfFailureByInvalidPath(@TempDir File tempPath) throws
Exception {
String[] args = new String[]{"invalid-path"};
executeWithException(args, "Invalid directory path.");
}
@@ -275,8 +270,7 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void genconfPathNotSpecified() throws Exception {
- File tempPath = getRandomTempDir();
+ public void genconfPathNotSpecified(@TempDir File tempPath) throws Exception
{
String[] args = new String[]{};
executeWithException(args, "Missing required parameter: '<path>'");
}
@@ -286,16 +280,8 @@ public class TestGenerateOzoneRequiredConfigurations {
* @throws Exception
*/
@Test
- public void genconfHelp() throws Exception {
- File tempPath = getRandomTempDir();
+ public void genconfHelp(@TempDir File tempPath) throws Exception {
String[] args = new String[]{"--help"};
execute(args, "Usage: ozone genconf [-hV] [--security] [--verbose]");
}
-
- private File getRandomTempDir() throws IOException {
- File tempDir = new File(outputBaseDir,
- RandomStringUtils.randomAlphanumeric(5));
- FileUtils.forceMkdir(tempDir);
- return tempDir;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ozone.apache.org
For additional commands, e-mail: commits-h...@ozone.apache.org
