diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/Conditional/src/Test.java b/java/java-tests/testData/inspection/redundantCast/lambda/Conditional.java similarity index 100% rename from java/java-tests/testData/inspection/redundantCast/lambda/Conditional/src/Test.java rename to java/java-tests/testData/inspection/redundantCast/lambda/Conditional.java diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/Conditional/expected.xml b/java/java-tests/testData/inspection/redundantCast/lambda/Conditional/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/Conditional/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype.java b/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype.java new file mode 100644 index 000000000000..cea843d4cd00 --- /dev/null +++ b/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype.java @@ -0,0 +1,16 @@ +class Test { + interface I { + } + + interface Bar extends I { + int compare(String o1, String o2); + } + + { + I bar2 = (Bar) (o1, o2) -> 0; + g((Bar) (o1, o2) -> 0); + ((Bar) (o1, o2) -> 0).getClass(); + } + + void g(I i){} +} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype/expected.xml b/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype/expected.xml deleted file mode 100644 index 5e933496b9cf..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype/expected.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype/src/Test.java b/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype/src/Test.java deleted file mode 100644 index 97832e4a5fb9..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/ExpectedSupertype/src/Test.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2012 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -public class Test { - interface I { - } - - interface Bar extends I { - int compare(String o1, String o2); - } - - { - I bar2 = (Bar) (o1, o2) -> 0; - g((Bar) (o1, o2) -> 0); - ((Bar) (o1, o2) -> 0).getClass(); - } - - void g(I i){} -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue/src/Test.java b/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue.java similarity index 58% rename from java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue/src/Test.java rename to java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue.java index bd2236cfe9f1..a0b7f3730fa6 100644 --- a/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue/src/Test.java +++ b/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue.java @@ -3,7 +3,7 @@ import java.util.Iterator; class IterableMain { public static void main(final String... args) { - for (final String s : (Iterable) XIterator::new) {} + for (final String s : (Iterable) XIterator::new) {} } public static interface XIterator extends Iterator {} diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue/expected.xml b/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/ForeachValue/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError/src/Test.java b/java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError.java similarity index 100% rename from java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError/src/Test.java rename to java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError.java diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError/expected.xml b/java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/InferApplicabilityError/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext.java b/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext.java new file mode 100644 index 000000000000..feded7747255 --- /dev/null +++ b/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext.java @@ -0,0 +1,10 @@ +class Test { + interface I { + boolean foo(String s); + } + { + ((I)s -> s.endsWith(".java")).getClass(); + I i = (I)s -> s.endsWith(".java"); + + } +} diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext/expected.xml b/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext/expected.xml deleted file mode 100644 index 5373cdc1d94f..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext/expected.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Test.java - 7 - Casting <code>s -> s.endsWith(".java")</code> to <code>I</code> is redundant - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext/src/Test.java b/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext/src/Test.java deleted file mode 100644 index 510d18485b01..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/LambdaContext/src/Test.java +++ /dev/null @@ -1,10 +0,0 @@ -class Test { - interface I { - boolean foo(String s); - } - { - ((I)s -> s.endsWith(".java")).getClass(); - I i = (I)s -> s.endsWith(".java"); - - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext/src/Test.java b/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext.java similarity index 80% rename from java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext/src/Test.java rename to java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext.java index b82f2ca2538a..d0a89cede5f2 100644 --- a/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext/src/Test.java +++ b/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext.java @@ -1,6 +1,6 @@ class Test { { - ((Bar) Test::length)._(""); + ((Bar) Test::length)._(""); } public static Integer length(String s) { diff --git a/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext/expected.xml b/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/lambda/MethodRefContext/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java index 7e9bcf8e18e4..f40ccd8671c3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java @@ -15,14 +15,24 @@ */ package com.intellij.codeInspection; -import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; +import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.codeInspection.redundantCast.RedundantCastInspection; -import com.intellij.testFramework.InspectionTestCase; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; -public class RedundantCast18Test extends InspectionTestCase { - private void doTest() throws Exception { - final LocalInspectionToolWrapper tool = new LocalInspectionToolWrapper(new RedundantCastInspection()); - doTest("redundantCast/lambda/" + getTestName(false), tool, "java 1.5"); +public class RedundantCast18Test extends LightDaemonAnalyzerTestCase { + @NonNls static final String BASE_PATH = "/inspection/redundantCast/lambda"; + + @NotNull + @Override + protected LocalInspectionTool[] configureLocalInspectionTools() { + return new LocalInspectionTool[]{ + new RedundantCastInspection() + }; + } + + private void doTest() { + doTest(BASE_PATH + "/" + getTestName(false) + ".java", true, false); } public void testLambdaContext() throws Exception { doTest(); }