diff options
Diffstat (limited to 'plugins/groovy/test/org/jetbrains/plugins/groovy')
3 files changed, 22 insertions, 2 deletions
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java index 28b2e26949ad..e227a1b34663 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java @@ -25,6 +25,7 @@ import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.impl.DefaultJavaProgramRunner; import com.intellij.execution.process.*; import com.intellij.execution.runners.ExecutionEnvironment; +import com.intellij.execution.runners.ExecutionEnvironmentBuilder; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.openapi.Disposable; @@ -234,7 +235,7 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC ProgramRunner runner, RunProfile configuration) throws ExecutionException { final Executor executor = Executor.EXECUTOR_EXTENSION_NAME.findExtension(executorClass); - final ExecutionEnvironment environment = new ExecutionEnvironment(configuration, executor, getProject(), null); + final ExecutionEnvironment environment = new ExecutionEnvironmentBuilder(getProject(), executor).runProfile(configuration).build(); final Semaphore semaphore = new Semaphore(); semaphore.down(); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/WrappingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/WrappingTest.groovy index 79d79edc42de..4d585dbf7f6f 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/WrappingTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/WrappingTest.groovy @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.lang.formatter import com.intellij.psi.codeStyle.CommonCodeStyleSettings +import org.jetbrains.plugins.groovy.GroovyLanguage /** * @author Max Medvedev @@ -24,7 +25,7 @@ class WrappingTest extends GroovyFormatterTestCase { @Override protected void setUp() throws Exception { super.setUp() - myTempSettings.RIGHT_MARGIN = 10 + myTempSettings.setRightMargin(GroovyLanguage.INSTANCE, 10); } void testWrapChainedMethodCalls() { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy index 9762f6772016..96be1fe5be02 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy @@ -681,6 +681,24 @@ def staticOnWrapper() { ''', 'List') } + void testClassTest() { + assertScript(''' +class DelegatesToTest { + void create(@DelegatesTo.Target Class type, @DelegatesTo(genericTypeIndex = 0, strategy = Closure.OWNER_FIRST) Closure closure) {} + + + void doit() { + create(Person) { + a<caret>ge = 30 // IDEA 12.1.6 can resolve this property, 13.1.3 can't + } + } +} + +class Person { + int age +} +''', 'Person') + } void assertScript(String text, String resolvedClass) { myFixture.configureByText('_a.groovy', text) |