diff options
Diffstat (limited to 'plugins/groovy/test/org/jetbrains')
5 files changed, 29 insertions, 10 deletions
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/FastGroovyTestSuite.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/FastGroovyTestSuite.java index 42404baeec57..ec2d50c94355 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/FastGroovyTestSuite.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/FastGroovyTestSuite.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy; import com.intellij.TestAll; import com.intellij.TestCaseLoader; +import com.intellij.openapi.externalSystem.test.ExternalSystemTestCase; import junit.framework.Test; import junit.framework.TestSuite; import org.jetbrains.plugins.groovy.compiler.GroovyCompilerTest; @@ -45,7 +46,7 @@ public class FastGroovyTestSuite { private static boolean isSlow(Class aClass) { return aClass.equals(GroovyDebuggerTest.class) || aClass.equals(GroovyStressPerformanceTest.class) || - aClass.getName().startsWith(GroovyCompilerTest.class.getName()); + aClass.getName().startsWith(GroovyCompilerTest.class.getName()) || + ExternalSystemTestCase.class.isAssignableFrom(aClass); } - } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCommentTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCommentTest.groovy index af16cc4ccb21..b6584bef6345 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCommentTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCommentTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 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. @@ -15,11 +15,11 @@ */ package org.jetbrains.plugins.groovy -import com.intellij.codeInsight.actions.CodeInsightAction import com.intellij.codeInsight.generation.actions.CommentByBlockCommentAction import com.intellij.codeInsight.generation.actions.CommentByLineCommentAction import com.intellij.ide.DataManager import com.intellij.openapi.actionSystem.ActionManager +import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.DataContext import org.jetbrains.annotations.NotNull @@ -100,7 +100,7 @@ print 2 doTest(before, after, new CommentByBlockCommentAction()) } - private void doTest(@NotNull String before, @NotNull String after, final CodeInsightAction action) { + private void doTest(@NotNull String before, @NotNull String after, final AnAction action) { myFixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, before) final DataContext dataContext = DataManager.instance.dataContextFromFocus.result action.actionPerformed(new AnActionEvent(null, dataContext, "", action.templatePresentation, ActionManager.instance, 0)); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy index d6293f2e01d5..061f941ea1a0 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy @@ -1923,4 +1923,10 @@ var.<caret> ''', '', CompletionType.BASIC, CompletionResult.contain, 1, 'A__foo', 'bar') } + void testCharsetName() { + myFixture.addClass("package java.nio.charset; public class Charset { public static boolean isSupported(String s) {} }") + doVariantableTest('import java.nio.charset.*; Charset.isSupported("<caret>")', '', CompletionType.BASIC, CompletionResult.contain, 1, 'UTF-8') + } + + }
\ No newline at end of file diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy index abc454f356e5..6ee91ef2581f 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy @@ -429,7 +429,7 @@ print a<caret>a } void testTraitField() { - doTest(6, ''' + doTest(4, ''' trait T { public int fi<caret>eld = 4 @@ -439,16 +439,16 @@ trait T { } } -class C extends T { - def abc { - print field +class C implements T { + def abc() { + print field //unresolved print T__field } } new C().T__field -new C().field +new C().field //unresolved ''') } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy index 7382469e50e4..e6882d70258b 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.lang.resolve +import com.intellij.psi.PsiMethod import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.plugins.groovy.GroovyLightProjectDescriptor @@ -205,4 +206,15 @@ class Thing { } + void testClosureParamsUsingGenerics() { + doTest("""\ + import groovy.transform.CompileStatic + + @CompileStatic + class Idea { + public static void main(String[] args) { + ["bc", "a", ].sort { i<caret>t.size() } + } + }""", "java.lang.String") + } } |