diff --git a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java index 277649fc86..a5d72a42f6 100644 --- a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java +++ b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; -import java.nio.file.Files; import java.util.Arrays; import java.util.Map; import java.util.Random; @@ -33,6 +32,7 @@ import org.apache.spark.api.java.JavaRDD; import org.apache.spark.sql.SparkSession; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +40,8 @@ public abstract class RepartitionTest extends SparkIntegrationTestBase { private static final Logger LOG = LoggerFactory.getLogger(RepartitionTest.class); + static @TempDir File tempDir; + @Test public void resultCompareTest() throws Exception { run(); @@ -63,7 +65,6 @@ public void updateSparkConfCustomer(SparkConf sparkConf) { public abstract void updateRssStorage(SparkConf sparkConf); protected String generateTextFile(int wordsPerRow, int rows) throws Exception { - String tempDir = Files.createTempDirectory("rss").toString(); File file = new File(tempDir, "wordcount.txt"); file.createNewFile(); LOG.info("Create file:" + file.getAbsolutePath()); diff --git a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java index effce77360..1231a6cd3a 100644 --- a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java +++ b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; -import java.nio.file.Files; import java.util.Map; import java.util.Random; @@ -31,6 +30,7 @@ import org.apache.spark.sql.Row; import org.apache.spark.sql.SparkSession; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,6 +38,8 @@ public abstract class SparkSQLTest extends SparkIntegrationTestBase { private static final Logger LOG = LoggerFactory.getLogger(SparkSQLTest.class); + static @TempDir File tempDir; + @Test public void resultCompareTest() throws Exception { run(); @@ -76,7 +78,6 @@ public void updateSparkConfCustomer(SparkConf sparkConf) { protected String generateCsvFile() throws Exception { int rows = 1000; - String tempDir = Files.createTempDirectory("rss").toString(); File file = new File(tempDir, "test.csv"); file.createNewFile(); LOG.info("Create file:" + file.getAbsolutePath());