From 23d44d05a4ac5131800a630d20e9267da5e1f8ea Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 25 Oct 2022 13:26:27 -0400 Subject: [PATCH] Restore completion filter after testing preference On GitHub actions the org.eclipse.cdt.ui.tests.text.contentassist2 tests are running after ProposalFilterPreferencesTest and ProposalFilterPreferencesTest was changing the default filter and not restoring it. Part of #117 --- .../ProposalFilterPreferencesTest.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java index b8a7c2e942d..2c23dbf6b28 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java @@ -27,6 +27,22 @@ import junit.framework.TestCase; */ public class ProposalFilterPreferencesTest extends TestCase { + private IPreferenceStore store; + private String filterComboStateStringBefore; + + @Override + protected void setUp() throws Exception { + super.setUp(); + store = CUIPlugin.getDefault().getPreferenceStore(); + filterComboStateStringBefore = store.getString(ContentAssistPreference.PROPOSALS_FILTER); + } + + @Override + protected void tearDown() throws Exception { + store.setValue(ContentAssistPreference.PROPOSALS_FILTER, filterComboStateStringBefore); + super.tearDown(); + } + public void testPreferences() { // Check that the test filter is among the filter names. String[] filterNames = ProposalFilterPreferencesUtil.getProposalFilterNames(); @@ -41,10 +57,8 @@ public class ProposalFilterPreferencesTest extends TestCase { assertTrue("Did not find expected filter!", index >= 0); // Set the preference to the tested filter - IPreferenceStore store = CUIPlugin.getDefault().getPreferenceStore(); - String filterComboStateString = store.getString(ContentAssistPreference.PROPOSALS_FILTER); ProposalFilterPreferencesUtil.ComboState state = ProposalFilterPreferencesUtil - .getComboState(filterComboStateString); + .getComboState(filterComboStateStringBefore); StringBuilder newStateText = new StringBuilder(); newStateText.append(index + 1); // First entry is always the , index+1 must be selected for (int i = 0; i < state.items.length; i++) {