diff options
| author | Kalyan Prasad Tatavarthi | 2020-07-14 03:32:21 +0000 |
|---|---|---|
| committer | Kalyan Prasad Tatavarthi | 2020-07-14 03:32:21 +0000 |
| commit | 52c5d816ea13142033086a03b0966dbda2c9c6fa (patch) | |
| tree | 5849305b4391278f966ca0d48a1a7b6077fb97b0 | |
| parent | 77f037fc84a7acddc2e0bd393478d36b68dabb47 (diff) | |
| download | eclipse.jdt.ui-52c5d816ea13142033086a03b0966dbda2c9c6fa.tar.gz eclipse.jdt.ui-52c5d816ea13142033086a03b0966dbda2c9c6fa.tar.xz eclipse.jdt.ui-52c5d816ea13142033086a03b0966dbda2c9c6fa.zip | |
rename preview tests accordingly
Change-Id: I241aaa7a82c455fd128be109f356534a9ffa3fb4
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
| -rw-r--r-- | org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup14.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToNewTests14.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameRecordElementsTests.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/rules/JavaPreviewSetup.java | 18 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTestPreview.java (renamed from org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest14.java) | 2 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest14.java | 134 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java | 193 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java | 3 |
8 files changed, 220 insertions, 142 deletions
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup14.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup14.java index 50adfa5897..16ceb69748 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup14.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup14.java @@ -16,9 +16,9 @@ package org.eclipse.jdt.ui.tests.refactoring; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.ui.tests.refactoring.rules.Java14Setup; +import org.eclipse.jdt.ui.tests.refactoring.rules.JavaPreviewSetup; -public class InlineMethodTestSetup14 extends Java14Setup { +public class InlineMethodTestSetup14 extends JavaPreviewSetup { private IPackageFragment fSimple14; diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToNewTests14.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToNewTests14.java index bd0815c108..8ca958b15a 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToNewTests14.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToNewTests14.java @@ -32,7 +32,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester; import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInnerToTopRefactoring; -import org.eclipse.jdt.ui.tests.refactoring.rules.Java14Setup; +import org.eclipse.jdt.ui.tests.refactoring.rules.JavaPreviewSetup; import org.eclipse.jdt.ui.tests.refactoring.rules.RefactoringTestSetup; import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings; @@ -41,7 +41,7 @@ public class MoveInnerToNewTests14 extends GenericRefactoringTest { private static final String REFACTORING_PATH= "MoveInnerToNew14/"; @Rule - public RefactoringTestSetup fts= new Java14Setup(); + public RefactoringTestSetup fts= new JavaPreviewSetup(); @Override public void genericbefore() throws Exception { diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameRecordElementsTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameRecordElementsTests.java index 3248538a12..887cb8eaa1 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameRecordElementsTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameRecordElementsTests.java @@ -45,7 +45,7 @@ import org.eclipse.jdt.core.refactoring.descriptors.RenameJavaElementDescriptor; import org.eclipse.jdt.internal.core.refactoring.descriptors.RefactoringSignatureDescriptorFactory; import org.eclipse.jdt.internal.corext.refactoring.rename.RenameFieldProcessor; -import org.eclipse.jdt.ui.tests.refactoring.rules.Java14Setup; +import org.eclipse.jdt.ui.tests.refactoring.rules.JavaPreviewSetup; import org.eclipse.jdt.ui.tests.refactoring.rules.RefactoringTestSetup; public class RenameRecordElementsTests extends GenericRefactoringTest { @@ -53,7 +53,7 @@ public class RenameRecordElementsTests extends GenericRefactoringTest { private String fPrefixPref; @Rule - public RefactoringTestSetup fts= new Java14Setup(); + public RefactoringTestSetup fts= new JavaPreviewSetup(); @Override protected String getRefactoringPath() { diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/rules/JavaPreviewSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/rules/JavaPreviewSetup.java new file mode 100644 index 0000000000..64969d7d79 --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/rules/JavaPreviewSetup.java @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2020 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.jdt.ui.tests.refactoring.rules; + +public class JavaPreviewSetup extends Java14Setup { + +} diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest14.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTestPreview.java index c6cef7617a..547ab71a03 100644 --- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest14.java +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTestPreview.java @@ -44,7 +44,7 @@ import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal; import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; @RunWith(JUnit4.class) -public class JavadocQuickFixTest14 extends QuickFixTest { +public class JavadocQuickFixTestPreview extends QuickFixTest { @Rule public ProjectTestSetup projectsetup = new Java14ProjectTestSetup(true); diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest14.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest14.java index 79e38c8003..91df428f9e 100644 --- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest14.java +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest14.java @@ -14,10 +14,8 @@ package org.eclipse.jdt.ui.tests.quickfix; import java.util.ArrayList; -import java.util.Map; import org.junit.After; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,24 +23,17 @@ import org.junit.runners.JUnit4; import org.eclipse.jdt.testplugin.JavaProjectHelper; -import org.eclipse.jface.text.contentassist.ICompletionProposal; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.internal.corext.util.Messages; - import org.eclipse.jdt.ui.tests.core.rules.Java14ProjectTestSetup; import org.eclipse.jdt.ui.tests.core.rules.ProjectTestSetup; import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal; import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; -import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages; - @RunWith(JUnit4.class) public class QuickFixTest14 extends QuickFixTest { @@ -67,131 +58,6 @@ public class QuickFixTest14 extends QuickFixTest { } @Test - public void testEnablePreviewsAndOpenCompilerPropertiesProposals() throws Exception { - fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); - fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); - JavaProjectHelper.set14CompilerOptions(fJProject1, false); - - fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); - - IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); - def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); - - IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); - String test= "" - + "package test;\n" - + "public record Rec1() {\n" - + "}\n"; - ICompilationUnit cu= pack.createCompilationUnit("Rec1.java", test, false, null); - - CompilationUnit astRoot= getASTRoot(cu); - ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot, 1, null); - - assertNumberOfProposals(proposals, 2); - String label1= CorrectionMessages.PreviewFeaturesSubProcessor_enable_preview_features; - assertProposalExists(proposals, label1); - String label2= CorrectionMessages.PreviewFeaturesSubProcessor_open_compliance_properties_page_enable_preview_features; - assertProposalExists(proposals, label2); - } - - @Test - public void testRecordSuppressWarningsProposals() throws Exception { - fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); - fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); - JavaProjectHelper.set14CompilerOptions(fJProject1, true); - - Map<String, String> options= fJProject1.getOptions(false); - options.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.WARNING); - fJProject1.setOptions(options); - - fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); - - - IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); - def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); - - IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); - String test= "" - + "package test;\n" - + "public record Rec1() {\n" - + "}\n"; - ICompilationUnit cu= pack.createCompilationUnit("Rec1.java", test, false, null); - - CompilationUnit astRoot= getASTRoot(cu); - ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot, 1, null); - - assertNumberOfProposals(proposals, 2); - String label= Messages.format(CorrectionMessages.SuppressWarningsSubProcessor_suppress_warnings_label, new String[] { "preview", "Rec1" }); - assertProposalExists(proposals, label); - - CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0); - String preview= getPreviewContent(proposal); - - String expected= "" - + "package test;\n" - + "@SuppressWarnings(\"preview\")\n" - + "public record Rec1() {\n" - + "}\n"; - - assertEqualStringsIgnoreOrder(new String[] { preview }, new String[] { expected }); - } - - @Ignore("See bug 562103 comment 4") - @Test - public void testGetNeedHigherComplianceProposalsAndEnablePreviewsProposal() throws Exception { - fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); - fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); - JavaProjectHelper.set13CompilerOptions(fJProject1, false); - - fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); - - - IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); - def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); - - IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); - String test= "" - + "package test;\n" - + "public record Rec1() {\n" - + "}\n"; - ICompilationUnit cu= pack.createCompilationUnit("Rec1.java", test, false, null); - - CompilationUnit astRoot= getASTRoot(cu); - ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot, 1, null); - - assertNumberOfProposals(proposals, 1); - String label1= Messages.format(CorrectionMessages.ReorgCorrectionsSubProcessor_change_project_compliance_description, "14"); - String label2= CorrectionMessages.PreviewFeaturesSubProcessor_enable_preview_features; - String label= Messages.format(CorrectionMessages.ReorgCorrectionsSubProcessor_combine_two_quickfixes, new String[] {label1, label2}); - assertProposalExists(proposals, label); - } - - @Test - public void testNoEnablePreviewProposal() throws Exception { - fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); - fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); - JavaProjectHelper.set14CompilerOptions(fJProject1, true); - - fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); - - - IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); - def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); - - IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); - String test= "" - + "package test;\n" - + "public record Rec() {\n" - + "}\n"; - ICompilationUnit cu= pack.createCompilationUnit("Rec.java", test, false, null); - - CompilationUnit astRoot= getASTRoot(cu); - ArrayList<ICompletionProposal> proposals= collectAllCorrections(cu, astRoot, 0); - - assertNumberOfProposals(proposals, 0); - } - - @Test public void testAddDefaultCaseSwitchStatement1() throws Exception { fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java new file mode 100644 index 0000000000..43bd09b273 --- /dev/null +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java @@ -0,0 +1,193 @@ +/******************************************************************************* + * Copyright (c) 2019, 2020 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.jdt.ui.tests.quickfix; + +import java.util.ArrayList; +import java.util.Map; + +import org.junit.After; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import org.eclipse.jdt.testplugin.JavaProjectHelper; + +import org.eclipse.jface.text.contentassist.ICompletionProposal; + +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.dom.CompilationUnit; + +import org.eclipse.jdt.internal.corext.util.Messages; + +import org.eclipse.jdt.ui.tests.core.rules.Java14ProjectTestSetup; +import org.eclipse.jdt.ui.tests.core.rules.ProjectTestSetup; +import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal; +import org.eclipse.jdt.ui.text.java.correction.CUCorrectionProposal; + +import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages; + +@RunWith(JUnit4.class) +public class QuickFixTestPreview extends QuickFixTest { + +// private static final Class<QuickFixTest14> THIS= QuickFixTest14.class; + + @Rule + public ProjectTestSetup projectsetup = new Java14ProjectTestSetup(true); + + private IJavaProject fJProject1; + + private IPackageFragmentRoot fSourceFolder; + + private static String MODULE_INFO_FILE_CONTENT = "" + + "module test {\n" + + "}\n"; + + @After + public void tearDown() throws Exception { + if (fJProject1 != null) { + JavaProjectHelper.delete(fJProject1); + } + } + + @Test + public void testEnablePreviewsAndOpenCompilerPropertiesProposals() throws Exception { + fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); + fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); + JavaProjectHelper.set14CompilerOptions(fJProject1, false); + + fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); + + IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); + def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); + + IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); + String test= "" + + "package test;\n" + + "public record Rec1() {\n" + + "}\n"; + ICompilationUnit cu= pack.createCompilationUnit("Rec1.java", test, false, null); + + CompilationUnit astRoot= getASTRoot(cu); + ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot, 1, null); + + assertNumberOfProposals(proposals, 2); + String label1= CorrectionMessages.PreviewFeaturesSubProcessor_enable_preview_features; + assertProposalExists(proposals, label1); + String label2= CorrectionMessages.PreviewFeaturesSubProcessor_open_compliance_properties_page_enable_preview_features; + assertProposalExists(proposals, label2); + } + + @Test + public void testRecordSuppressWarningsProposals() throws Exception { + fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); + fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); + JavaProjectHelper.set14CompilerOptions(fJProject1, true); + + Map<String, String> options= fJProject1.getOptions(false); + options.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.WARNING); + fJProject1.setOptions(options); + + fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); + + + IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); + def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); + + IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); + String test= "" + + "package test;\n" + + "public record Rec1() {\n" + + "}\n"; + ICompilationUnit cu= pack.createCompilationUnit("Rec1.java", test, false, null); + + CompilationUnit astRoot= getASTRoot(cu); + ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot, 1, null); + + assertNumberOfProposals(proposals, 2); + String label= Messages.format(CorrectionMessages.SuppressWarningsSubProcessor_suppress_warnings_label, new String[] { "preview", "Rec1" }); + assertProposalExists(proposals, label); + + CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0); + String preview= getPreviewContent(proposal); + + String expected= "" + + "package test;\n" + + "@SuppressWarnings(\"preview\")\n" + + "public record Rec1() {\n" + + "}\n"; + + assertEqualStringsIgnoreOrder(new String[] { preview }, new String[] { expected }); + } + + @Ignore("See bug 562103 comment 4") + @Test + public void testGetNeedHigherComplianceProposalsAndEnablePreviewsProposal() throws Exception { + fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); + fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); + JavaProjectHelper.set13CompilerOptions(fJProject1, false); + + fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); + + + IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); + def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); + + IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); + String test= "" + + "package test;\n" + + "public record Rec1() {\n" + + "}\n"; + ICompilationUnit cu= pack.createCompilationUnit("Rec1.java", test, false, null); + + CompilationUnit astRoot= getASTRoot(cu); + ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot, 1, null); + + assertNumberOfProposals(proposals, 1); + String label1= Messages.format(CorrectionMessages.ReorgCorrectionsSubProcessor_change_project_compliance_description, "14"); + String label2= CorrectionMessages.PreviewFeaturesSubProcessor_enable_preview_features; + String label= Messages.format(CorrectionMessages.ReorgCorrectionsSubProcessor_combine_two_quickfixes, new String[] {label1, label2}); + assertProposalExists(proposals, label); + } + + @Test + public void testNoEnablePreviewProposal() throws Exception { + fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin"); + fJProject1.setRawClasspath(Java14ProjectTestSetup.getDefaultClasspath(), null); + JavaProjectHelper.set14CompilerOptions(fJProject1, true); + + fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src"); + + + IPackageFragment def= fSourceFolder.createPackageFragment("", false, null); + def.createCompilationUnit("module-info.java", MODULE_INFO_FILE_CONTENT, false, null); + + IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null); + String test= "" + + "package test;\n" + + "public record Rec() {\n" + + "}\n"; + ICompilationUnit cu= pack.createCompilationUnit("Rec.java", test, false, null); + + CompilationUnit astRoot= getASTRoot(cu); + ArrayList<ICompletionProposal> proposals= collectAllCorrections(cu, astRoot, 0); + + assertNumberOfProposals(proposals, 0); + } +} diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java index c0cbfd4772..b3904577bc 100644 --- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java +++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java @@ -22,6 +22,7 @@ import org.junit.runners.Suite; QuickFixTest9.class, QuickFixTest1d8.class, QuickFixTest14.class, + QuickFixTestPreview.class, SerialVersionQuickFixTest.class, UtilitiesTest.class, UnresolvedTypesQuickFixTest.class, @@ -46,7 +47,7 @@ import org.junit.runners.Suite; MarkerResolutionTest.class, JavadocQuickFixTest.class, JavadocQuickFixTest9.class, - JavadocQuickFixTest14.class, + JavadocQuickFixTestPreview.class, ConvertForLoopQuickFixTest.class, ConvertIterableLoopQuickFixTest.class, AdvancedQuickAssistTest.class, |
