You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by sn...@apache.org on 2024/08/27 07:23:33 UTC
(polaris) branch main updated: Use FileUtils.deleteQuietly in tests (#204)
This is an automated email from the ASF dual-hosted git repository.
snazy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 578833f Use FileUtils.deleteQuietly in tests (#204)
578833f is described below
commit 578833fde0dfc0ccb414b347d62140f4071a01dc
Author: Yuya Ebihara <eb...@gmail.com>
AuthorDate: Tue Aug 27 16:23:30 2024 +0900
Use FileUtils.deleteQuietly in tests (#204)
---
.../service/PolarisApplicationIntegrationTest.java | 20 ++------------------
.../catalog/PolarisRestCatalogIntegrationTest.java | 20 ++------------------
.../PolarisRestCatalogViewIntegrationTest.java | 20 ++------------------
3 files changed, 6 insertions(+), 54 deletions(-)
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java
index 75a4118..50f30b4 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java
@@ -31,9 +31,9 @@ import jakarta.ws.rs.core.Response;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.BaseTable;
import org.apache.iceberg.PartitionData;
@@ -117,23 +117,7 @@ public class PolarisApplicationIntegrationTest {
realm = PolarisConnectionExtension.getTestRealm(PolarisApplicationIntegrationTest.class);
testDir = Path.of("build/test_data/iceberg/" + realm);
- if (Files.exists(testDir)) {
- if (Files.isDirectory(testDir)) {
- Files.walk(testDir)
- .sorted(Comparator.reverseOrder())
- .forEach(
- path -> {
- try {
- Files.delete(path);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- });
-
- } else {
- Files.delete(testDir);
- }
- }
+ FileUtils.deleteQuietly(testDir.toFile());
Files.createDirectories(testDir);
PolarisApplicationIntegrationTest.userToken = userToken.token();
PolarisApplicationIntegrationTest.snowmanCredentials = snowmanCredentials;
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java
index 784f8d8..c154200 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java
@@ -33,12 +33,12 @@ import jakarta.ws.rs.core.Response;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
+import org.apache.commons.io.FileUtils;
import org.apache.iceberg.BaseTable;
import org.apache.iceberg.CatalogProperties;
import org.apache.iceberg.Schema;
@@ -135,23 +135,7 @@ public class PolarisRestCatalogIntegrationTest extends CatalogTests<RESTCatalog>
realm = PolarisConnectionExtension.getTestRealm(PolarisRestCatalogIntegrationTest.class);
Path testDir = Path.of("build/test_data/iceberg/" + realm);
- if (Files.exists(testDir)) {
- if (Files.isDirectory(testDir)) {
- Files.walk(testDir)
- .sorted(Comparator.reverseOrder())
- .forEach(
- path -> {
- try {
- Files.delete(path);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- });
-
- } else {
- Files.delete(testDir);
- }
- }
+ FileUtils.deleteQuietly(testDir.toFile());
Files.createDirectories(testDir);
}
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java
index 8b4586f..9b557bd 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java
@@ -31,9 +31,9 @@ import jakarta.ws.rs.core.Response;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Comparator;
import java.util.List;
import java.util.Optional;
+import org.apache.commons.io.FileUtils;
import org.apache.iceberg.CatalogProperties;
import org.apache.iceberg.catalog.SessionCatalog;
import org.apache.iceberg.rest.HTTPClient;
@@ -97,23 +97,7 @@ public class PolarisRestCatalogViewIntegrationTest extends ViewCatalogTests<REST
realm = PolarisConnectionExtension.getTestRealm(PolarisRestCatalogViewIntegrationTest.class);
Path testDir = Path.of("build/test_data/iceberg/" + realm);
- if (Files.exists(testDir)) {
- if (Files.isDirectory(testDir)) {
- Files.walk(testDir)
- .sorted(Comparator.reverseOrder())
- .forEach(
- path -> {
- try {
- Files.delete(path);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- });
-
- } else {
- Files.delete(testDir);
- }
- }
+ FileUtils.deleteQuietly(testDir.toFile());
Files.createDirectories(testDir);
}