From cd776814902148f49b79e4834298357573c7a1be Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 30 Jul 2024 21:49:33 +0200
Subject: [PATCH] Simplify SymLink creation in eclipse.core.tests

---
 .../core/tests/harness/FileSystemHelper.java  | 45 +------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java
index 731d1bf6cb7..39d74919951 100644
--- a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java
+++ b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java
@@ -17,10 +17,8 @@
 import static org.eclipse.core.tests.harness.TestHarnessPlugin.PI_HARNESS;
 import static org.eclipse.core.tests.harness.TestHarnessPlugin.log;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.eclipse.core.runtime.ILog;
@@ -121,48 +119,7 @@ public static void clear(java.io.File file) {
 	 */
 	public static void createSymLink(File basedir, String linkName, String linkTarget, boolean isDir)
 			throws IOException {
-		// The following code creates even a link if
-		// Files.createSymbolicLink(new File(basedir, linkName).toPath(), new
-		// File(basedir, linkTarget).toPath());
-		// would throw java.nio.file.FileSystemException "missing rights"
-		//
-		Process process = startSymlinkCreation(basedir, linkName, linkTarget, isDir);
-		try {
-			int exitcode = process.waitFor();
-			if (exitcode != 0) {
-				// xxx wrong charset. from jdk17+ we could use Console.charset()
-				try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
-					String result = reader.readLine();
-					throw new IllegalStateException("Creating symlink is unsupported: " + result);
-				}
-			}
-		} catch (InterruptedException e) {
-			throw new IOException("Creating symlink failed due to interrupted exception", e);
-		}
-	}
-
-	private static Process startSymlinkCreation(File basedir, String linkName, String linkTarget, boolean isDir)
-			throws IOException {
-		// Deliberately use an empty environment to make the test reproducible.
-		String[] environmentParameters = {};
-		if (Platform.getOS().equals(Platform.OS_WIN32)) {
-			return startSymlinkCreationOnWindows(basedir, linkName, linkTarget, isDir, environmentParameters);
-		}
-		String[] cmd = { "ln", "-s", linkTarget, linkName };
-		return Runtime.getRuntime().exec(cmd, environmentParameters, basedir);
-	}
-
-	private static Process startSymlinkCreationOnWindows(File basedir, String linkName, String linkTarget,
-			boolean isDir, String[] environmentParameters) throws IOException {
-		// use File.getPath to avoid 'Illegal argument - ".."' for using "../"
-		// instead of "..\"
-		if (isDir) {
-			String[] cmd = { "cmd", "/c", "mklink", "/d", new File(linkName).getPath(),
-					new File(linkTarget).getPath() };
-			return Runtime.getRuntime().exec(cmd, environmentParameters, basedir);
-		}
-		String[] cmd = { "cmd", "/c", "mklink", new File(linkName).getPath(), new File(linkTarget).getPath() };
-		return Runtime.getRuntime().exec(cmd, environmentParameters, basedir);
+		Files.createSymbolicLink(basedir.toPath().resolve(linkName), basedir.toPath().resolve(linkTarget));
 	}
 
 	/**