summaryrefslogtreecommitdiff
path: root/platform/testFramework/testSrc
diff options
context:
space:
mode:
Diffstat (limited to 'platform/testFramework/testSrc')
-rw-r--r--platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java3
-rw-r--r--platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java5
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
index 86958eee3461..4375701bc62c 100644
--- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
@@ -82,6 +82,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "alt DOWN", "ShowContent", "MethodDown"},
{ "alt F1", "SelectIn", "ProjectViewChangeView"},
{ "alt INSERT", "FileChooser.NewFolder", "Generate", "NewElement"},
+ { "control F10", "javaee.UpdateRunningApplication", "liveedit.UpdateRunningApplication"},
{ "control 1", "FileChooser.GotoHome", "GotoBookmark1", "DuplicatesForm.SendToLeft"},
{ "control 2", "FileChooser.GotoProject", "GotoBookmark2", "DuplicatesForm.SendToRight"},
{ "control 3", "GotoBookmark3", "FileChooser.GotoModule"},
@@ -238,7 +239,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection", "EditorTab", "NextTemplateParameter"},
{ "alt DOWN", "ShowContent", "MoveStatementDown"},
{ "alt HOME", "ViewNavigationBar", "ShowNavBar"},
- { "control F10", "ShowPopupMenu", "javaee.UpdateRunningApplication"},
+ { "control F10", "ShowPopupMenu", "javaee.UpdateRunningApplication", "liveedit.UpdateRunningApplication"},
{ "control F11", "Rerun", "ToggleBookmarkWithMnemonic"},
{ "control D", "CompareDirs", "EditorDeleteLine", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control N", "ShowPopupMenu", "FileChooser.NewFolder"},
diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
index b3557238124f..263c25b184b8 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java
@@ -271,6 +271,11 @@ public class MockChangeListManager extends ChangeListManagerEx {
}
@Override
+ public void addDirectoryToIgnoreImplicitly(@NotNull String path) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public void setFilesToIgnore(IgnoredFileBean... ignoredFiles) {
throw new UnsupportedOperationException();
}