mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 01:05:38 +02:00
Code Issues Wiki Activity

Added protection against opening a dialog in JUnit test.

Browse source
This commit is contained in:
Sergey Prigogin 2009-05-10 21:57:19 +00:00
parent 9742045d4a
commit 56c7e8b130
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddIncludeTest.java
View file

@ -91,6 +91,7 @@ public class AddIncludeTest extends TestCase {
} }
private void assertAddIncludeResult() throws Exception { private void assertAddIncludeResult() throws Exception {
AddIncludeOnSelectionAction.sIsJUnitTest= true;
new AddIncludeOnSelectionAction(fEditor).run(); new AddIncludeOnSelectionAction(fEditor).run();
String file= createFileName(".expected"); String file= createFileName(".expected");

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
View file

@ -96,6 +96,8 @@ import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
* selected name. * selected name.
*/ */
public class AddIncludeOnSelectionAction extends TextEditorAction { public class AddIncludeOnSelectionAction extends TextEditorAction {
public static boolean sIsJUnitTest = false;
private ITranslationUnit fTu; private ITranslationUnit fTu;
private IProject fProject; private IProject fProject;
private String[] fIncludePath; private String[] fIncludePath;
@ -251,6 +253,9 @@ public class AddIncludeOnSelectionAction extends TextEditorAction {
final ArrayList<IncludeCandidate> candidates = new ArrayList<IncludeCandidate>(candidatesMap.values()); final ArrayList<IncludeCandidate> candidates = new ArrayList<IncludeCandidate>(candidatesMap.values());
if (candidates.size() > 1) { if (candidates.size() > 1) {
if (sIsJUnitTest) {
throw new RuntimeException("ambiguous input"); //$NON-NLS-1$
}
runInUIThread(new Runnable() { runInUIThread(new Runnable() {
public void run() { public void run() {
ElementListSelectionDialog dialog= ElementListSelectionDialog dialog=