diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java')
-rw-r--r-- | java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java index d2e8825cc16d..5153f19fe94a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -716,7 +716,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { public void testMethodColon() throws Exception { doFirstItemTest(':'); } public void testVariableColon() throws Exception { doFirstItemTest(':'); } - private void doFirstItemTest(char c) throws Exception { + private void doFirstItemTest(char c) { configureByTestName(); select(c); checkResultByTestName(); @@ -824,6 +824,8 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { doActionTest(); } + public void testDontSuggestWildcardGenerics() { doItemTest(); } + public void testCastWith2TypeParameters() throws Throwable { doTest(); } public void testClassLiteralInArrayAnnoInitializer() throws Throwable { doTest(); } public void testClassLiteralInArrayAnnoInitializer2() throws Throwable { doTest(); } @@ -1141,7 +1143,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { checkResultByTestName(); } - private void doItemTest() throws Exception { + private void doItemTest() { doFirstItemTest('\n'); } |