Bug 186921 - TVT33:TCT170: zh_TW:the mnemonic should be either removed or placed in the end
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
index 8d82a30..a3612c8 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 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
@@ -65,6 +65,7 @@
 import org.eclipse.jdt.debug.tests.core.VMInstallTests;
 import org.eclipse.jdt.debug.tests.core.WatchExpressionTests;
 import org.eclipse.jdt.debug.tests.core.WorkspaceSourceContainerTests;
+import org.eclipse.jdt.debug.tests.launching.AcceleratorSubstitutionTests;
 import org.eclipse.jdt.debug.tests.launching.ContributedTabTests;
 import org.eclipse.jdt.debug.tests.launching.LaunchConfigurationTests;
 import org.eclipse.jdt.debug.tests.launching.LaunchDelegateTests;
@@ -131,6 +132,7 @@
 		addTest(new TestSuite(MigrationDelegateTests.class));
 		addTest(new TestSuite(RefreshTabTests.class));
 		addTest(new TestSuite(LaunchHistoryTests.class));
+		addTest(new TestSuite(AcceleratorSubstitutionTests.class));
 		
 	//Breakpoints tests
 		addTest(new TestSuite(DeferredBreakpointTests.class));
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/AcceleratorSubstitutionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/AcceleratorSubstitutionTests.java
new file mode 100644
index 0000000..2b41e2b
--- /dev/null
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/AcceleratorSubstitutionTests.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jdt.debug.tests.launching;
+
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.jdt.debug.tests.AbstractDebugTest;
+
+/**
+ * Tests accelerator adjustments for DBCS languages.
+ * See bug 186921.
+ * 
+ * @since 3.3
+ */
+public class AcceleratorSubstitutionTests extends AbstractDebugTest {
+
+	/**
+	 * Constructor
+	 * @param name the name of the test
+	 */
+	public AcceleratorSubstitutionTests(String name) {
+		super(name);
+	}
+	
+	/**
+	 * tests a string with "..."
+	 */
+	public void testWithEllipses() {
+		assertEquals("incorrect DBCS accelerator substitution",
+				"Open Run Dialog(&R)...",
+				DebugUIPlugin.adjustDBCSAccelerator("Open Run(&R) Dialog..."));
+	}
+	
+	/**
+	 * tests a string without "..."
+	 */
+	public void testWithoutEllipses() {
+		assertEquals("incorrect DBCS accelerator substitution",
+				"Open Run Dialog(&R)",
+				DebugUIPlugin.adjustDBCSAccelerator("Open Run(&R) Dialog"));
+	}	
+	
+	/**
+	 * tests a string that should not change (no DBCS style accelerator).
+	 */
+	public void testWithoutDBCSAcclerator() {
+		assertEquals("incorrect DBCS accelerator substitution",
+				"Open &Run Dialog...",
+				DebugUIPlugin.adjustDBCSAccelerator("Open &Run Dialog..."));
+	}		
+}