diff --git a/java/java-impl/src/com/intellij/testIntegration/JavaTestFramework.java b/java/java-impl/src/com/intellij/testIntegration/JavaTestFramework.java index 9e389dda012e..5b4a1f310d3e 100644 --- a/java/java-impl/src/com/intellij/testIntegration/JavaTestFramework.java +++ b/java/java-impl/src/com/intellij/testIntegration/JavaTestFramework.java @@ -107,6 +107,8 @@ public abstract class JavaTestFramework implements TestFramework { public FileTemplateDescriptor getParametersMethodFileTemplateDescriptor() { return null; } + + public abstract char getMnemonic(); public PsiMethod createSetUpPatternMethod(JVMElementFactory factory) { final FileTemplate template = FileTemplateManager.getInstance().getCodeTemplate(getSetUpMethodFileTemplateDescriptor().getFileName()); diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java index d34a3600d4dc..1185d60a7971 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -49,6 +49,7 @@ import com.intellij.refactoring.ui.PackageNameReferenceEditorCombo; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.refactoring.util.classMembers.MemberInfo; +import com.intellij.testIntegration.JavaTestFramework; import com.intellij.testIntegration.TestFramework; import com.intellij.testIntegration.TestIntegrationUtils; import com.intellij.ui.EditorTextField; @@ -123,6 +124,12 @@ public class CreateTestDialog extends DialogWrapper { for (final TestFramework descriptor : Extensions.getExtensions(TestFramework.EXTENSION_NAME)) { final JRadioButton b = new JRadioButton(descriptor.getName()); + if (descriptor instanceof JavaTestFramework) { + final char mnemonic = ((JavaTestFramework)descriptor).getMnemonic(); + if (mnemonic > -1) { + b.setMnemonic(mnemonic); + } + } myLibraryButtons.add(b); group.add(b); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestFramework.java index acac929bf281..5b989faa6ab3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestFramework.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestFramework.java @@ -105,6 +105,11 @@ public class GroovyTestFramework extends JavaTestFramework { return inClass; } + @Override + public char getMnemonic() { + return 'G'; + } + @NotNull @Override public String getName() { diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnit3Framework.java b/plugins/junit/src/com/intellij/execution/junit/JUnit3Framework.java index 21828ecb2afb..dcbff3505540 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnit3Framework.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnit3Framework.java @@ -33,6 +33,11 @@ public class JUnit3Framework extends JavaTestFramework { return "JUnit3"; } + @Override + public char getMnemonic() { + return '3'; + } + @NotNull @Override public Icon getIcon() { diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java b/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java index 3f724c4df2de..bcb3678147a0 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java @@ -145,6 +145,11 @@ public class JUnit4Framework extends JavaTestFramework { return new FileTemplateDescriptor("JUnit4 Parameters Method.java"); } + @Override + public char getMnemonic() { + return '4'; + } + @Override public boolean isParameterized(PsiClass clazz) { final PsiAnnotation annotation = AnnotationUtil.findAnnotation(clazz, JUnitUtil.RUN_WITH); diff --git a/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java b/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java index 0df50c5f419f..1cf1f53a5d88 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java +++ b/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java @@ -167,6 +167,11 @@ public class TestNGFramework extends JavaTestFramework { return inClass; } + @Override + public char getMnemonic() { + return 'N'; + } + public FileTemplateDescriptor getSetUpMethodFileTemplateDescriptor() { return new FileTemplateDescriptor("TestNG SetUp Method.java"); }