From 4d679e0c7cb3d12b77cbaa8cc652374513c40fd4 Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Fri, 21 Jun 2024 10:54:59 +0800
Subject: [PATCH] Fix the file copying issue for the test case
 testCustomerCompilerFactoryWithAP

---
 .../core/tests/builder/BasicBuildTests.java   | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BasicBuildTests.java b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BasicBuildTests.java
index d87ec180c25..4763658af80 100644
--- a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BasicBuildTests.java
+++ b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BasicBuildTests.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.net.URL;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -42,8 +43,11 @@
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jdt.core.compiler.*;
 import org.eclipse.jdt.core.IJavaProject;
@@ -56,6 +60,7 @@
 import org.eclipse.jdt.internal.compiler.CompilerConfiguration;
 import org.eclipse.jdt.internal.core.JavaModelManager;
 import org.eclipse.jdt.internal.core.builder.AbstractImageBuilder;
+import org.osgi.framework.Bundle;
 
 /**
  * Basic tests of the image builder.
@@ -838,20 +843,35 @@ private File copyFiles(String path, boolean reimportIfExists) throws IOException
 		if (from.isDirectory()) {
 			copyDirectory(from.toPath(), to.toPath());
 		} else {
-			Files.copy(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING);
+			try {
+				Files.copy(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING);
+			} catch (IOException e) {
+				ILog.get().error("Failed to copy the file - " + from.getCanonicalPath(), e); //$NON-NLS-1$
+				throw e;
+			}
 		}
 
 		return to;
 	}
 
-	private File getSourceProjectDirectory() {
+	private File getSourceProjectDirectory() throws IOException {
 		final String pluginId = "org.eclipse.jdt.core.tests.builder";
-		String cwd = new File("").getAbsolutePath();
-		if (cwd.endsWith(pluginId)) {
-			return new File("resources"); // run from current test plugin
-		} else {
-			return new File("../" + pluginId + "/resources"); // run from other test plugin
+		return getFileFromPlugin(pluginId, "resources");
+	}
+
+	public static File getFileFromPlugin(String pluginId, String relativePath) throws IOException {
+		Bundle bundle = Platform.getBundle(pluginId);
+		if (bundle == null) {
+			throw new IOException("Plugin not found: " + pluginId);
 		}
+
+		URL fileURL = bundle.getEntry(relativePath);
+		if (fileURL == null) {
+			throw new IOException("File not found: " + relativePath);
+		}
+
+		URL resolvedFileURL = FileLocator.toFileURL(fileURL);
+		return new File(resolvedFileURL.getPath());
 	}
 
 	private File getWorkingProjectDirectory() throws IOException {