diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java index 6800604248b3..f295f4d1ff0e 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java @@ -203,7 +203,7 @@ protected void configure() { } if (withReconSqlDb) { - reconSqlDB = new AbstractReconSqlDBTest(); + reconSqlDB = new AbstractReconSqlDBTest(tmpDir.toPath()); modules.addAll(reconSqlDB.getReconSqlDBModules()); } diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java index db6693ea5345..08d1a73dc057 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java @@ -74,6 +74,10 @@ public class TestContainerStateCounts extends AbstractReconSqlDBTest { private static final int NUM_DELETED_CONTAINERS = 4; private static final int NUM_CLOSED_CONTAINERS = 3; + public TestContainerStateCounts() { + super(); + } + @BeforeEach public void setUp() throws Exception { 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 6bd0cba4df17..26d5044a7528 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 @@ -189,6 +189,10 @@ public class TestEndpoints extends AbstractReconSqlDBTest { private PipelineManager pipelineManager; private ReconPipelineManager reconPipelineManager; + public TestEndpoints() { + super(); + } + private void initializeInjector() throws Exception { reconOMMetadataManager = getTestReconOmMetadataManager( initializeNewOmMetadataManager(Files.createDirectory( diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java index 2c6253cc781e..85a6d9ec98ed 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java @@ -92,6 +92,10 @@ public class TestOmDBInsightEndPoint extends AbstractReconSqlDBTest { private OzoneConfiguration ozoneConfiguration; private Set generatedIds = new HashSet<>(); + public TestOmDBInsightEndPoint() { + super(); + } + private long generateUniqueRandomLong() { long newValue; do { diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTaskStatusService.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTaskStatusService.java index 5c071d353b5f..741dcf3be4cb 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTaskStatusService.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTaskStatusService.java @@ -39,6 +39,10 @@ public class TestTaskStatusService extends AbstractReconSqlDBTest { private TaskStatusService taskStatusService; + public TestTaskStatusService() { + super(); + } + @BeforeEach public void setUp() { Injector parentInjector = getInjector(); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java index 358799cc0330..2200cf3fca24 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java @@ -69,6 +69,10 @@ */ public class TestContainerHealthTask extends AbstractReconSqlDBTest { + public TestContainerHealthTask() { + super(); + } + @SuppressWarnings("checkstyle:methodlength") @Test public void testRun() throws Exception { diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java index d30a6232712b..d007fbb1cf7b 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java @@ -46,21 +46,24 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; +import org.junit.jupiter.api.io.TempDir; +import org.springframework.util.FileSystemUtils; /** * Class that provides a Recon SQL DB with all the tables created, and APIs * to access the DAOs easily. */ public class AbstractReconSqlDBTest { - private Path temporaryFolder; - private Injector injector; private DSLContext dslContext; private Provider configurationProvider; public AbstractReconSqlDBTest() { + } + + public void init(Path temporaryFolder) { try { - temporaryFolder = Files.createTempDirectory("JunitConfig"); + FileSystemUtils.deleteRecursively(temporaryFolder.resolve("Config")); configurationProvider = new DerbyDataSourceConfigurationProvider(Files.createDirectory( temporaryFolder.resolve("Config")).toFile()); @@ -69,12 +72,17 @@ public AbstractReconSqlDBTest() { } } + public AbstractReconSqlDBTest(Path temporaryFolder) { + init(temporaryFolder); + } + protected AbstractReconSqlDBTest(Provider provider) { configurationProvider = provider; } @BeforeEach - public void createReconSchemaForTest() throws IOException { + public void createReconSchemaForTest(@TempDir Path temporaryFolder) throws IOException { + init(temporaryFolder); injector = Guice.createInjector(getReconSqlDBModules()); dslContext = DSL.using(new DefaultConfiguration().set( injector.getInstance(DataSource.class))); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconInternalSchemaDefinition.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconInternalSchemaDefinition.java index 5570484c0f95..1230a9ba543e 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconInternalSchemaDefinition.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconInternalSchemaDefinition.java @@ -40,6 +40,10 @@ */ public class TestReconInternalSchemaDefinition extends AbstractReconSqlDBTest { + public TestReconInternalSchemaDefinition() { + super(); + } + @Test public void testSchemaCreated() throws Exception { diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java index b4cf76895723..180536884683 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java @@ -63,7 +63,7 @@ public static Stream parametersSource() throws IOException { public void testSchemaSetup(Provider provider) throws SQLException, IOException { AbstractReconSqlDBTest reconSqlDB = new AbstractReconSqlDBTest(provider); - reconSqlDB.createReconSchemaForTest(); + reconSqlDB.createReconSchemaForTest(temporaryFolder); assertNotNull(reconSqlDB.getInjector()); assertNotNull(reconSqlDB.getConfiguration()); assertNotNull(reconSqlDB.getDslContext()); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestSqlSchemaSetup.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestSqlSchemaSetup.java index 498faa3d4316..4c6ae91998c7 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestSqlSchemaSetup.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestSqlSchemaSetup.java @@ -33,6 +33,10 @@ */ public class TestSqlSchemaSetup extends AbstractReconSqlDBTest { + public TestSqlSchemaSetup() { + super(); + } + /** * Make sure schema was created correctly. * @throws SQLException diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestStatsSchemaDefinition.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestStatsSchemaDefinition.java index 6407e64bf154..36e7edc56670 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestStatsSchemaDefinition.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestStatsSchemaDefinition.java @@ -40,6 +40,10 @@ */ public class TestStatsSchemaDefinition extends AbstractReconSqlDBTest { + public TestStatsSchemaDefinition() { + super(); + } + @Test public void testIfStatsSchemaCreated() throws Exception { Connection connection = getConnection(); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestUtilizationSchemaDefinition.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestUtilizationSchemaDefinition.java index 1c692b6a4887..7745aac9d3fd 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestUtilizationSchemaDefinition.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestUtilizationSchemaDefinition.java @@ -52,6 +52,10 @@ */ public class TestUtilizationSchemaDefinition extends AbstractReconSqlDBTest { + public TestUtilizationSchemaDefinition() { + super(); + } + @Test public void testReconSchemaCreated() throws Exception { Connection connection = getConnection(); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java index 9b5dc3bc9bca..eff330a796c9 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java @@ -54,6 +54,10 @@ public class TestContainerSizeCountTask extends AbstractReconSqlDBTest { private ContainerSizeCountTask task; private DSLContext dslContext; + public TestContainerSizeCountTask() { + super(); + } + @BeforeEach public void setUp() { utilizationSchemaDefinition = diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java index 2ded437301c7..badbb37fac5f 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java @@ -60,6 +60,10 @@ public class TestFileSizeCountTask extends AbstractReconSqlDBTest { private FileSizeCountTask fileSizeCountTask; private DSLContext dslContext; + public TestFileSizeCountTask() { + super(); + } + @BeforeEach public void setUp() { fileCountBySizeDao = getDao(FileCountBySizeDao.class); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java index 9c0193e5020b..df014f4276fa 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java @@ -77,6 +77,10 @@ public class TestOmTableInsightTask extends AbstractReconSqlDBTest { private boolean isSetupDone = false; private ReconOMMetadataManager reconOMMetadataManager; + public TestOmTableInsightTask() { + super(); + } + private void initializeInjector() throws IOException { reconOMMetadataManager = getTestReconOmMetadataManager( initializeNewOmMetadataManager(Files.createDirectory( diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java index e6cdae9b85f3..4d2203dc5120 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java @@ -47,6 +47,10 @@ public class TestReconTaskControllerImpl extends AbstractReconSqlDBTest { private ReconTaskController reconTaskController; private ReconTaskStatusDao reconTaskStatusDao; + public TestReconTaskControllerImpl() { + super(); + } + @BeforeEach public void setUp() { OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();