adoroszlai commented on code in PR #5556:
URL: https://github.com/apache/ozone/pull/5556#discussion_r1388200727
##########
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java:
##########
@@ -36,52 +38,51 @@
import org.jooq.SQLDialect;
import org.jooq.impl.DSL;
import org.jooq.impl.DefaultConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.rules.TemporaryFolder;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
+import org.junit.jupiter.api.io.TempDir;
/**
* Class that provides a Recon SQL DB with all the tables created, and APIs
* to access the DAOs easily.
*/
public class AbstractReconSqlDBTest {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ protected Path temporaryFolder;
private Injector injector;
private DSLContext dslContext;
private Provider<DataSourceConfiguration> configurationProvider;
public AbstractReconSqlDBTest() {
try {
- temporaryFolder.create();
+ temporaryFolder = Files.createTempDirectory("JunitConfig");
Review Comment:
`@TempDir temporaryFolder` is created automatically by JUnit. Do not create
it manually, that might interfere with automatic cleanup.
```suggestion
```
##########
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java:
##########
@@ -759,7 +760,7 @@ public void testGetMissingContainers() throws IOException,
TimeoutException {
new HashSet<>(Arrays.asList("host2", "host3", "host4")));
List<ContainerHistory> containerReplicas = container.getReplicas();
containerReplicas.forEach(history -> {
- Assert.assertTrue(datanodes.contains(history.getDatanodeHost()));
+ Assertions.assertTrue(datanodes.contains(history.getDatanodeHost()));
Review Comment:
`assertTrue` is imported, can be used directly.
##########
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java:
##########
@@ -36,52 +38,51 @@
import org.jooq.SQLDialect;
import org.jooq.impl.DSL;
import org.jooq.impl.DefaultConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.rules.TemporaryFolder;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
+import org.junit.jupiter.api.io.TempDir;
/**
* Class that provides a Recon SQL DB with all the tables created, and APIs
* to access the DAOs easily.
*/
public class AbstractReconSqlDBTest {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ protected Path temporaryFolder;
Review Comment:
> shall I make it private and introduce a getter method which lead the
changes in all 14 sub-classes
Yes, please make it `private`. It only affects 4 subclasses.
##########
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java:
##########
@@ -36,52 +38,51 @@
import org.jooq.SQLDialect;
import org.jooq.impl.DSL;
import org.jooq.impl.DefaultConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.rules.TemporaryFolder;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
+import org.junit.jupiter.api.io.TempDir;
/**
* Class that provides a Recon SQL DB with all the tables created, and APIs
* to access the DAOs easily.
*/
public class AbstractReconSqlDBTest {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ protected Path temporaryFolder;
private Injector injector;
private DSLContext dslContext;
private Provider<DataSourceConfiguration> configurationProvider;
public AbstractReconSqlDBTest() {
try {
- temporaryFolder.create();
+ temporaryFolder = Files.createTempDirectory("JunitConfig");
configurationProvider =
- new
DerbyDataSourceConfigurationProvider(temporaryFolder.newFolder());
+ new DerbyDataSourceConfigurationProvider(Files.createDirectory(
+ temporaryFolder.resolve("Config")).toFile());
} catch (IOException e) {
- Assert.fail();
+ Assertions.fail();
}
}
protected AbstractReconSqlDBTest(Provider<DataSourceConfiguration> provider)
{
try {
- temporaryFolder.create();
+ temporaryFolder = Files.createTempDirectory("JunitConfig");
Review Comment:
Same here, do not create manually.
```suggestion
```
##########
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconDBProvider.java:
##########
@@ -41,18 +41,18 @@
*/
public class TestReconDBProvider {
- @Rule
- public TemporaryFolder tempFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private Injector injector;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
- tempFolder.create();
+ //tempFolder.create();
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
