diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map index 7e6398920bc..12d6f596b1a 100644 --- a/releng/org.eclipse.rse.build/maps/rse.map +++ b/releng/org.eclipse.rse.build/maps/rse.map @@ -58,7 +58,7 @@ plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous plugin@org.eclipse.rse.subsystems.terminals.core=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core plugin@org.eclipse.rse.subsystems.terminals.ssh=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh plugin@org.eclipse.rse.terminals.ui=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui -plugin@org.eclipse.rse.tests=v201005261700,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests +plugin@org.eclipse.rse.tests=v201005291230,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests plugin@org.eclipse.rse.tests.framework=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework plugin@org.eclipse.rse.ui=v201005282245,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui plugin@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions \ No newline at end of file diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java index ae4d3d4f173..84415620428 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2007, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2010 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -10,6 +10,7 @@ * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - organize, enable and tag test cases + * Martin Oberhuber (Wind River) - [263196] MnemonicsTest.testDefaultGeneration() fails ********************************************************************************/ package org.eclipse.rse.tests.ui.mnemonics; @@ -55,19 +56,27 @@ public class MnemonicsTest extends RSECoreTestCase { //-test-author-:DavidDykstal if (isTestDisabled()) return; - setLocalePattern(".*"); // match all locales - Mnemonics mn = new Mnemonics(); - mn.clear("abcde"); - String result = mn.setUniqueMnemonic("A..."); - assertEquals("A(&F)...", result); - result = mn.setUniqueMnemonic("F..."); - assertEquals("F(&G)...", result); - result = mn.setUniqueMnemonic("H..."); - assertEquals("&H...", result); + String oldPattern = getLocalePattern(); + try { + setLocalePattern(".*"); // match all locales + Mnemonics mn = new Mnemonics(); + mn.clear("abcde"); + String result = mn.setUniqueMnemonic("A..."); + assertEquals("A(&F)...", result); + result = mn.setUniqueMnemonic("F..."); + assertEquals("F(&G)...", result); + result = mn.setUniqueMnemonic("H..."); + assertEquals("&H...", result); + } finally { + setLocalePattern(oldPattern); + } } private void setLocalePattern(String pattern) { RSEUIPlugin.getDefault().getPluginPreferences().setValue(Mnemonics.APPEND_MNEMONICS_PATTERN_PREFERENCE, pattern); } + private String getLocalePattern() { + return RSEUIPlugin.getDefault().getPluginPreferences().getString(Mnemonics.APPEND_MNEMONICS_PATTERN_PREFERENCE); + } }