From 52e6e8e2d7a54acdde900cf6d7c973e2d38e01b3 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 30 Dec 2011 16:10:42 +0100 Subject: [PATCH] light fixture-based SuspiciousCollectionMethodCallsTest --- .../src/Test.java => IgnoreConvertible.java} | 3 ++- .../suspiciousCalls/IgnoreConvertible/expected.xml | 9 --------- .../inspection/suspiciousCalls/Wildcard.java | 12 ++++++++++++ .../suspiciousCalls/Wildcard/expected.xml | 9 --------- .../suspiciousCalls/Wildcard/src/Test.java | 8 -------- .../suspiciousCalls/WildcardCapture/expected.xml | 4 ---- .../suspiciousCalls/WildcardCapture/src/Test.java | 8 -------- .../SuspiciousCollectionMethodCallsTest.java | 14 ++++++-------- 8 files changed, 20 insertions(+), 47 deletions(-) rename java/java-tests/testData/inspection/suspiciousCalls/{IgnoreConvertible/src/Test.java => IgnoreConvertible.java} (63%) delete mode 100644 java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml create mode 100644 java/java-tests/testData/inspection/suspiciousCalls/Wildcard.java delete mode 100644 java/java-tests/testData/inspection/suspiciousCalls/Wildcard/expected.xml delete mode 100644 java/java-tests/testData/inspection/suspiciousCalls/Wildcard/src/Test.java delete mode 100644 java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml delete mode 100644 java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java diff --git a/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java b/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible.java similarity index 63% rename from java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java rename to java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible.java index 8f627f6ff22b..1433b2ba1a69 100644 --- a/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java +++ b/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible.java @@ -1,3 +1,4 @@ +import java.util.Map; import java.util.List; import java.util.ArrayList; @@ -10,6 +11,6 @@ class Clazz { } void foo(List c) { - c.contains(""); + c.contains(""); } } \ No newline at end of file diff --git a/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml b/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml deleted file mode 100644 index 77314fecede1..000000000000 --- a/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Test.java - 13 - 'List<? extends Number>' may not contain objects of type 'String' - - - diff --git a/java/java-tests/testData/inspection/suspiciousCalls/Wildcard.java b/java/java-tests/testData/inspection/suspiciousCalls/Wildcard.java new file mode 100644 index 000000000000..179810f4929d --- /dev/null +++ b/java/java-tests/testData/inspection/suspiciousCalls/Wildcard.java @@ -0,0 +1,12 @@ +import java.util.List; +import java.util.ArrayList; + +class Clazz { + void foo(List l) { + boolean b = l.contains(""); } + void bar() { + List> l = new ArrayList>(); + Class o = String.class; + int i = l.indexOf(o); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/expected.xml b/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/expected.xml deleted file mode 100644 index 39cdee891698..000000000000 --- a/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Test.java - 6 - 'List<? extends Number>' may not contain objects of type 'String' - - - diff --git a/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/src/Test.java b/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/src/Test.java deleted file mode 100644 index 192549b3e79e..000000000000 --- a/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/src/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.List; -import java.util.ArrayList; - -class Clazz { - void foo(List l) { - boolean b = l.contains(""); - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml b/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml deleted file mode 100644 index d704d58ed391..000000000000 --- a/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java b/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java deleted file mode 100644 index 7ab2ffafa430..000000000000 --- a/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.util.List; -import java.util.ArrayList; - -class Clazz { - List> l = new ArrayList>(); - Class o = String.class; - int i = l.indexOf(o); -} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java index 2d6268dfc699..9885c8d7ea05 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java @@ -1,24 +1,22 @@ package com.intellij.codeInspection; import com.intellij.JavaTestUtil; -import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; import com.intellij.codeInspection.miscGenerics.SuspiciousCollectionsMethodCallsInspection; -import com.intellij.testFramework.InspectionTestCase; +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -public class SuspiciousCollectionMethodCallsTest extends InspectionTestCase { +public class SuspiciousCollectionMethodCallsTest extends LightCodeInsightFixtureTestCase { private final SuspiciousCollectionsMethodCallsInspection myTool = new SuspiciousCollectionsMethodCallsInspection(); @Override - protected String getTestDataPath() { - return JavaTestUtil.getJavaTestDataPath() + "/inspection"; + protected String getBasePath() { + return JavaTestUtil.getRelativeJavaTestDataPath() + "/inspection/suspiciousCalls"; } private void doTest() throws Exception { - final LocalInspectionToolWrapper tool = new LocalInspectionToolWrapper(myTool); - doTest("suspiciousCalls/" + getTestName(false), tool, "java 1.5"); + myFixture.enableInspections(myTool); + myFixture.testHighlighting(getTestName(false) + ".java"); } - public void testWildcardCapture() throws Exception { doTest(); } public void testWildcard() throws Exception { doTest(); } public void testIgnoreConvertible() throws Exception { myTool.REPORT_CONVERTIBLE_METHOD_CALLS = false;