You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2025/07/15 10:51:29 UTC
(maven-resolver) branch master updated: Deprecate methods that are in JUnit and/or the JDK (#1530)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new da1cdf5e Deprecate methods that are in JUnit and/or the JDK (#1530)
da1cdf5e is described below
commit da1cdf5eece14c263dcf751189f7b43425f851b2
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Tue Jul 15 10:51:23 2025 +0000
Deprecate methods that are in JUnit and/or the JDK (#1530)
* Deprecate methods that are in JUnir and/or the JDK
* Prefer JDK and JUnit methods
---
.../internal/impl/DefaultFileProcessorTest.java | 16 ++++---------
.../internal/impl/DefaultMetadataResolverTest.java | 18 +++++++++-----
.../impl/DefaultUpdateCheckManagerTest.java | 4 ++--
.../impl/EnhancedLocalRepositoryManagerTest.java | 10 ++++----
.../impl/SimpleLocalRepositoryManagerTest.java | 17 ++++---------
.../aether/internal/test/util/TestFileUtils.java | 28 +++++++++++++++++++++-
.../test/util/TestLocalRepositoryManager.java | 6 ++++-
7 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
index 7de414b8..55e39970 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
@@ -27,32 +27,26 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.aether.internal.test.util.TestFileUtils;
import org.eclipse.aether.spi.io.FileProcessor.ProgressListener;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-/**
- */
public class DefaultFileProcessorTest {
+ @TempDir
private File targetDir;
private DefaultFileProcessor fileProcessor;
@BeforeEach
void setup() throws IOException {
- targetDir = TestFileUtils.createTempDir(getClass().getSimpleName());
fileProcessor = new DefaultFileProcessor();
}
- @AfterEach
- void teardown() throws Exception {
- TestFileUtils.deleteFile(targetDir);
- fileProcessor = null;
- }
-
@Test
void testCopy() throws IOException {
String data = "testCopy\nasdf";
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
index 93502638..ec52e82e 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
@@ -48,11 +48,16 @@ import org.eclipse.aether.transfer.MetadataNotFoundException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-/**
- */
public class DefaultMetadataResolverTest {
private DefaultMetadataResolver resolver;
@@ -75,6 +80,9 @@ public class DefaultMetadataResolverTest {
private RecordingRepositoryListener listener;
+ @TempDir
+ private File tempDirectory;
+
@BeforeEach
void setup() throws Exception {
remoteRepositoryFilterSources = new HashMap<>();
@@ -93,9 +101,7 @@ public class DefaultMetadataResolverTest {
remoteRepositoryFilterManager,
new DefaultPathProcessor());
repository = new RemoteRepository.Builder(
- "test-DMRT",
- "default",
- TestFileUtils.createTempDir().toURI().toURL().toString())
+ "test-DMRT", "default", tempDirectory.toURI().toURL().toString())
.build();
metadata = new DefaultMetadata("gid", "aid", "ver", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT);
connector = new RecordingRepositoryConnector();
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index eff38f80..1f5ec3d7 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -43,6 +43,7 @@ import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.junit.jupiter.api.Assertions.*;
@@ -63,8 +64,7 @@ public class DefaultUpdateCheckManagerTest {
private Artifact artifact;
@BeforeEach
- void setup() throws Exception {
- File dir = TestFileUtils.createTempDir("");
+ void setup(@TempDir File dir) throws Exception {
TestFileUtils.deleteFile(dir);
File metadataFile = new File(dir, "metadata.txt");
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
index 1b85146d..7fba57ba 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
@@ -42,6 +42,7 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.junit.jupiter.api.Assertions.*;
@@ -51,6 +52,7 @@ public class EnhancedLocalRepositoryManagerTest {
private Artifact snapshot;
+ @TempDir
protected File basedir;
protected EnhancedLocalRepositoryManager manager;
@@ -70,11 +72,8 @@ public class EnhancedLocalRepositoryManagerTest {
private Metadata noVerMetadata;
@BeforeEach
- void setup() throws Exception {
- String url = TestFileUtils.createTempDir("enhanced-remote-repo")
- .toURI()
- .toURL()
- .toString();
+ void setup(@TempDir File dir) throws Exception {
+ String url = dir.toURI().toURL().toString();
repository = new RemoteRepository.Builder("enhanced-remote-repo", "default", url)
.setRepositoryManager(true)
.build();
@@ -97,7 +96,6 @@ public class EnhancedLocalRepositoryManagerTest {
noVerMetadata = new DefaultMetadata(
"gid", "aid", null, "maven-metadata.xml", Nature.RELEASE, TestFileUtils.createTempFile("metadata"));
- basedir = TestFileUtils.createTempDir("enhanced-repo");
session = TestUtils.newSession();
trackingFileManager = new DefaultTrackingFileManager();
manager = getManager();
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
index f17f315a..c44e3dd2 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
@@ -29,16 +29,17 @@ import org.eclipse.aether.internal.test.util.TestUtils;
import org.eclipse.aether.repository.LocalArtifactRequest;
import org.eclipse.aether.repository.LocalArtifactResult;
import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
-/**
- */
public class SimpleLocalRepositoryManagerTest {
+ @TempDir
private File basedir;
private SimpleLocalRepositoryManager manager;
@@ -47,18 +48,10 @@ public class SimpleLocalRepositoryManagerTest {
@BeforeEach
void setup() throws IOException {
- basedir = TestFileUtils.createTempDir("simple-repo");
manager = new SimpleLocalRepositoryManager(basedir.toPath(), "simple", new DefaultLocalPathComposer());
session = TestUtils.newSession();
}
- @AfterEach
- void tearDown() throws Exception {
- TestFileUtils.deleteFile(basedir);
- manager = null;
- session = null;
- }
-
@Test
void testGetPathForLocalArtifact() {
Artifact artifact = new DefaultArtifact("g.i.d:a.i.d:1.0-SNAPSHOT");
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
index 3eae72db..793b651a 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;
@@ -128,10 +129,26 @@ public class TestFileUtils {
return tmpFile;
}
+ /**
+ * Creates a temporary directory.
+ *
+ * @return the temporary directory
+ * @throws IOException if an I/O error occurs
+ * @deprecated use @TempDir (JUnit 5} Or TemporaryFolder (JUnit 4) instead
+ */
+ @Deprecated
public static File createTempDir() throws IOException {
return createTempDir("");
}
+ /**
+ * Creates a temporary directory.
+ *
+ * @return the temporary directory
+ * @throws IOException if an I/O error occurs
+ * @deprecated use {@code @TempDir) (JUnit 5} Or {@code TemporaryFolder} (JUnit 4) instead
+ */
+ @Deprecated
public static File createTempDir(String suffix) throws IOException {
mkdirs(TMP);
File tmpFile = File.createTempFile("tmpdir-", suffix, TMP);
@@ -189,6 +206,15 @@ public class TestFileUtils {
return total;
}
+ /**
+ * Reads the contents of a file into a byte array.
+ *
+ * @param file the file to read
+ * @return the contents of the file as a byte array
+ * @throws IOException if an I/O error occurs
+ * @deprecated use {@code Files.readAllBytes(Path)} instead
+ */
+ @Deprecated
public static byte[] readBytes(File file) throws IOException {
RandomAccessFile in = null;
try {
@@ -232,7 +258,7 @@ public class TestFileUtils {
}
public static String readString(File file) throws IOException {
- byte[] content = readBytes(file);
+ byte[] content = Files.readAllBytes(file.toPath());
return new String(content, StandardCharsets.UTF_8);
}
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
index 4d1b442c..f2a8cf45 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
@@ -20,6 +20,8 @@ package org.eclipse.aether.internal.test.util;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.HashSet;
import java.util.Set;
@@ -53,7 +55,9 @@ public class TestLocalRepositoryManager implements LocalRepositoryManager {
public TestLocalRepositoryManager() {
try {
- localRepository = new LocalRepository(TestFileUtils.createTempDir("test-local-repo"));
+ Path tempDirectory = Files.createTempDirectory("test-local-repo");
+ tempDirectory.toFile().deleteOnExit();
+ localRepository = new LocalRepository(tempDirectory);
} catch (IOException e) {
throw new IllegalStateException(e);
}