From 6533b12148b0842e54a74d6a30ef21e6c7d4b6da Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Sun, 1 Mar 2026 13:09:00 +0100
Subject: [PATCH] Fix afterAll clean-up in ds.annotations.tests
 WorkspaceSetupExtension

And use Files.move() instead of less reliably File.renameTo().
---
 .../annotations/tests/WorkspaceSetupExtension.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/WorkspaceSetupExtension.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/WorkspaceSetupExtension.java
index 703b1dab60..62818d183c 100644
--- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/WorkspaceSetupExtension.java
+++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/WorkspaceSetupExtension.java
@@ -1,6 +1,5 @@
 package org.eclipse.pde.ds.internal.annotations.tests;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -64,9 +63,10 @@ public IStatus runInWorkspace(IProgressMonitor m) throws CoreException {
 						Path projectLocation = Files.createDirectories(wsRoot.resolve(project.getName()));
 						copyResources(bundle, entry.getValue(), projectLocation);
 						Files.createDirectories(projectLocation.resolve("OSGI-INF"));
-						File projectFile = projectLocation.resolve("test.project").toFile();
-						if (projectFile.isFile()) {
-							projectFile.renameTo(projectLocation.resolve(".project").toFile());
+						Path projectFile = projectLocation.resolve("test.project");
+						if (Files.isRegularFile(projectFile)) {
+							Files.move(projectFile, projectLocation.resolve(".project"),
+									StandardCopyOption.REPLACE_EXISTING);
 						}
 					} catch (IOException e) {
 						throw new CoreException(Status.error("Error copying test project content.", e));
@@ -96,8 +96,8 @@ public void afterAll(ExtensionContext context) throws Exception {
 		Job wsJob = new WorkspaceJob("Test Workspace Cleanup") {
 			@Override
 			public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-				for (String projectId : PROJECTS.keySet()) {
-					IProject project = wsRoot.getProject("ds.annotations." + projectId);
+				for (String projectName : PROJECTS.keySet()) {
+					IProject project = wsRoot.getProject(projectName);
 					if (project.exists()) {
 						project.delete(true, true, monitor);
 					}