Skip to content

Commit d8fa0ae

Browse files
Fix Java25ProjectTestSetup for Java 26: (#2754)
+ preview is no longer a valid option for release 25 Fixes regressions in JavadocQuickFixTest25
1 parent f05b16a commit d8fa0ae

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest25.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151

5252
public class ImportOrganizeTest25 extends CoreTests {
5353
@Rule
54-
public Java25ProjectTestSetup proj= new Java25ProjectTestSetup(false);
54+
public Java25ProjectTestSetup proj= new Java25ProjectTestSetup();
5555
@Rule
56-
public Java25ProjectTestSetup proj2= new Java25ProjectTestSetup("TestSetupProject25_2", false);
56+
public Java25ProjectTestSetup proj2= new Java25ProjectTestSetup("TestSetupProject25_2");
5757
@Rule
58-
public Java25ProjectTestSetup proj3= new Java25ProjectTestSetup("TestSetupProject25_3", false);
58+
public Java25ProjectTestSetup proj3= new Java25ProjectTestSetup("TestSetupProject25_3");
5959

6060
private IJavaProject fJProject1;
6161
private IJavaProject fJProject2;

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/rules/Java25ProjectTestSetup.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public IClasspathEntry[] getDefaultClasspath() throws CoreException {
5050
return new IClasspathEntry[] { JavaCore.newLibraryEntry(rtJarPath[0], rtJarPath[1], rtJarPath[2], ClasspathEntry.NO_ACCESS_RULES, extraAttributes, true) };
5151
}
5252

53-
public Java25ProjectTestSetup( boolean enable_preview_feature) {
54-
this.enable_preview_feature= enable_preview_feature;
53+
public Java25ProjectTestSetup() {
54+
this.enable_preview_feature= false;
5555
projectName= PROJECT_NAME25;
5656
}
5757

58-
public Java25ProjectTestSetup( String projectName, boolean enable_preview_feature) {
59-
this.enable_preview_feature= enable_preview_feature;
58+
public Java25ProjectTestSetup( String projectName) {
59+
this.enable_preview_feature= false;
6060
this.projectName= projectName;
6161
}
6262

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest25.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
*/
3838
public class CleanUpTest25 extends CleanUpTestCase {
3939
@Rule
40-
public ProjectTestSetup projectSetup= new Java25ProjectTestSetup(false);
40+
public ProjectTestSetup projectSetup= new Java25ProjectTestSetup();
4141

4242
@Rule
43-
public ProjectTestSetup projectSetup2= new Java25ProjectTestSetup("project2", false);
43+
public ProjectTestSetup projectSetup2= new Java25ProjectTestSetup("project2");
4444

4545
@After
4646
public void teardown2() throws Exception {

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest25.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
public class JavadocQuickFixTest25 extends QuickFixTest {
5050

5151
@Rule
52-
public ProjectTestSetup projectSetup = new Java25ProjectTestSetup(true);
52+
public ProjectTestSetup projectSetup = new Java25ProjectTestSetup();
5353

5454
private IJavaProject fJProject1;
5555
private IPackageFragmentRoot fSourceFolder;

0 commit comments

Comments
 (0)