Merge pull request #3052 from eclipse/lb_3051

Fix Regression in AbstractContentAssistTest breaking customizations
eclipse-xtext · May 21, 2024 · 9047a4c · 9047a4c
2 parents 8cf255b + 99ab547
commit 9047a4c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/org.eclipse.xtext.ui.testing/src/org/eclipse/xtext/ui/testing/AbstractContentAssistTest.java b/org.eclipse.xtext.ui.testing/src/org/eclipse/xtext/ui/testing/AbstractContentAssistTest.java
@@ -57,8 +57,12 @@ public abstract class AbstractContentAssistTest implements ResourceLoadHelper, I
 	@Inject
 	private Injector injector;
 
-	private static IJavaProject javaProject;
-
+	/**
+	 * the {@link IJavaProject} used during tests, this is created once by {@link #setUp()}.
+	 * @since 2.35 
+	 */
+	protected static IJavaProject javaProject;
+
 	/**
 	 * cursor position marker
 	 * @since 2.35 
@@ -84,7 +88,7 @@ public XtextResource getResourceFor(InputStream stream) {
 		XtextResourceSet resourceSet = resourceSetProvider.get();
 		initializeTypeProvider(resourceSet);
 		try {
-			String projectFullPath = javaProject.getProject().getFullPath().toString();
+			String projectFullPath = getJavaProject(resourceSet).getProject().getFullPath().toString();
 			URI resourceUri = URI.createPlatformResourceURI(projectFullPath + "/" + getProjectRelativePath() + "/" + "Test." + fileExtensionProvider.getPrimaryFileExtension(), true);
 
 			/*