diff options
Diffstat (limited to 'java/testFramework/src/com')
4 files changed, 25 insertions, 37 deletions
diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java index 9aee3cf51fdc..6ecec97f7fe7 100644 --- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java @@ -537,11 +537,6 @@ public abstract class CodeInsightTestCase extends PsiTestCase { } } - @Override - public Object getData(String dataId) { - return CommonDataKeys.EDITOR.is(dataId) ? myEditor : super.getData(dataId); - } - protected VirtualFile getVirtualFile(@NonNls @NotNull String filePath) { String fullPath = getTestDataPath() + filePath; diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java index 8ec8e3f6ebdd..2409104c7116 100644 --- a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java +++ b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java @@ -138,12 +138,12 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas DebuggerSettings.getInstance().DEBUGGER_TRANSPORT = DebuggerSettings.SOCKET_TRANSPORT; GenericDebuggerRunnerSettings debuggerRunnerSettings = new GenericDebuggerRunnerSettings(); - debuggerRunnerSettings.LOCAL = true; + debuggerRunnerSettings.LOCAL = true; final RemoteConnection debugParameters = DebuggerManagerImpl.createDebugParameters(javaParameters, debuggerRunnerSettings, false); ExecutionEnvironment environment = new ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance()) - .setRunnerSettings(debuggerRunnerSettings) + .runnerSettings(debuggerRunnerSettings) .setRunProfile(new MockConfiguration()) .build(); final JavaCommandLineState javaCommandLineState = new JavaCommandLineState(environment){ @@ -162,10 +162,12 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas @Override public void run() { try { - GenericDebuggerRunner runner = new GenericDebuggerRunner(); - myDebuggerSession = DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(DefaultDebugExecutor.getDebugExecutorInstance(), - runner, new MockConfiguration(), javaCommandLineState, debugParameters, false); - XDebuggerManager.getInstance(myProject).startSession(runner, javaCommandLineState.getEnvironment(), null, new XDebugProcessStarter() { + myDebuggerSession = + DebuggerManagerEx.getInstanceEx(myProject) + .attachVirtualMachine(new DefaultDebugEnvironment(new ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance()) + .runProfile(new MockConfiguration()) + .build(), javaCommandLineState, debugParameters, false)); + XDebuggerManager.getInstance(myProject).startSession(javaCommandLineState.getEnvironment(), new XDebugProcessStarter() { @Override @NotNull public XDebugProcess start(@NotNull XDebugSession session) { @@ -208,8 +210,8 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas debuggerRunnerSettings.DEBUG_PORT = "3456"; ExecutionEnvironment environment = new ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance()) - .setRunnerSettings(debuggerRunnerSettings) - .setRunProfile(new MockConfiguration()) + .runnerSettings(debuggerRunnerSettings) + .runProfile(new MockConfiguration()) .build(); final JavaCommandLineState javaCommandLineState = new JavaCommandLineState(environment) { @Override @@ -230,8 +232,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas @Override public void run() { try { - GenericDebuggerRunner runner = new GenericDebuggerRunner(); - debuggerSession[0] = attachVirtualMachine(runner, javaCommandLineState, javaCommandLineState.getEnvironment(), debugParameters, false); + debuggerSession[0] = attachVirtualMachine(javaCommandLineState, javaCommandLineState.getEnvironment(), debugParameters, false); } catch (ExecutionException e) { fail(e.getMessage()); @@ -273,14 +274,12 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas println(launchCommandLine, ProcessOutputTypes.SYSTEM); - JavaParameters parameters = javaParameters; - for(StringTokenizer tokenizer = new StringTokenizer(launchCommandLine);tokenizer.hasMoreTokens();) { String token = tokenizer.nextToken(); - parameters.getVMParametersList().add(token); + javaParameters.getVMParametersList().add(token); } - GeneralCommandLine commandLine = CommandLineBuilder.createFromJavaParameters(parameters); + GeneralCommandLine commandLine = CommandLineBuilder.createFromJavaParameters(javaParameters); DebuggerSession debuggerSession; @@ -305,16 +304,14 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas throws InvocationTargetException, InterruptedException { final RemoteState remoteState = new RemoteStateState(myProject, remoteConnection); - final ExecutionEnvironment environment = new ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance()) - .setRunProfile(new MockConfiguration()) - .build(); - final DebuggerSession[] debuggerSession = new DebuggerSession[1]; UIUtil.invokeAndWaitIfNeeded(new Runnable() { @Override public void run() { try { - debuggerSession[0] = attachVirtualMachine(new GenericDebuggerRunner(), remoteState, environment, remoteConnection, pollConnection); + debuggerSession[0] = attachVirtualMachine(remoteState, new ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance()) + .runProfile(new MockConfiguration()) + .build(), remoteConnection, pollConnection); } catch (ExecutionException e) { fail(e.getMessage()); @@ -366,7 +363,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas try { request.join(); } - catch (Exception e) { + catch (Exception ignored) { } } }; @@ -380,7 +377,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas try { thread.join(); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { } } }); @@ -466,16 +463,13 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas return myDebuggerSession; } - protected DebuggerSession attachVirtualMachine(ProgramRunner runner, - RunProfileState state, + protected DebuggerSession attachVirtualMachine(RunProfileState state, ExecutionEnvironment environment, RemoteConnection remoteConnection, boolean pollConnection) throws ExecutionException { final DebuggerSession debuggerSession = - DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(DefaultDebugExecutor.getDebugExecutorInstance(), - runner, new MockConfiguration(), state, remoteConnection, - pollConnection); - XDebuggerManager.getInstance(myProject).startSession(runner, environment, null, new XDebugProcessStarter() { + DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(new DefaultDebugEnvironment(environment, state, remoteConnection, pollConnection)); + XDebuggerManager.getInstance(myProject).startSession(environment, new XDebugProcessStarter() { @Override @NotNull public XDebugProcess start(@NotNull XDebugSession session) { @@ -569,5 +563,4 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas //To change body of implemented methods use File | Settings | File Templates. } } - } diff --git a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java index bc99f65d3c5c..55b55c55dfb7 100644 --- a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java @@ -50,7 +50,7 @@ import java.io.File; setupContentRoot(); } }); - + ProjectViewTestUtil.setupImpl(getProject(), true); } @Override diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java index 3699fe36aff5..c6f04dfeb7bf 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,13 +39,13 @@ public abstract class LightCodeInsightFixtureTestCase extends UsefulTestCase{ public static final LightProjectDescriptor JAVA_1_4 = new DefaultLightProjectDescriptor() { @Override public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { - model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_6); + model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_4); } }; public static final LightProjectDescriptor JAVA_1_5 = new DefaultLightProjectDescriptor() { @Override public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { - model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_6); + model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_5); } }; public static final LightProjectDescriptor JAVA_1_6 = new DefaultLightProjectDescriptor() { |