diff --git a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInConditional/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/BoxingInConditional/expected.xml deleted file mode 100644 index edc206d502cd..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInConditional/expected.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Test.java - 8 - Redundant type cast - Casting <code>2</code> to <code>Integer</code> is redundant - - - Test.java - 18 - Redundant type cast - Casting <code>1</code> to <code>Integer</code> is redundant - - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInConditional/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/BoxingInConditional/src/Test.java deleted file mode 100644 index 7962c90b303b..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInConditional/src/Test.java +++ /dev/null @@ -1,22 +0,0 @@ -//This is a test for JDK_15 LanguageLevel -public class Test { - private Integer foo(String s, Integer i) { - return s == null ? i : (Integer)2; - } - - private int foo1(String s, Integer i) { - return s == null ? i : (Integer)2; - } -} - -class RedundantCastTest { - - public static void main(String[] args) { - Integer foo = 5; - Integer bar = null; - print(args == null || args.length == 0 ? bar : (Integer) 1); - int i = args == null || args.length == 0 ? bar : (Integer) 1; - } - - private static void print(Integer i) {} -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInRef/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/BoxingInRef/expected.xml deleted file mode 100644 index 580a889dbfd6..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInRef/expected.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInRef/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/BoxingInRef/src/Test.java deleted file mode 100644 index dd4dd2d8df7b..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/BoxingInRef/src/Test.java +++ /dev/null @@ -1,7 +0,0 @@ -//This is a test for JDK_15 LanguageLevel -public class Test { - void foo () { - int x = 4; - ((Integer) x).toString(); - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/BoxingTopCast/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/BoxingTopCast/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/BoxingTopCast/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/BoxingTopCast/src/BoxingTopCast.java b/java/java-tests/testData/inspection/redundantCast/generics/BoxingTopCast/src/BoxingTopCast.java deleted file mode 100644 index 148422b00588..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/BoxingTopCast/src/BoxingTopCast.java +++ /dev/null @@ -1,20 +0,0 @@ -class TestCasting -{ - public void testRedundantCast() throws Exception - { - Object o = getObject(); - double d = 0.0; - - if( o instanceof Integer ) - { - d = (double) (Integer)o; - } - - System.out.println( "d = " + d ); - } - - private Object getObject() - { - return new Integer(42); - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/CaseThrowable/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/CaseThrowable/expected.xml deleted file mode 100644 index cef9cae6cc39..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/CaseThrowable/expected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Test.java - 7 - Casting <code>e</code> to <code>Ex</code> is redundant - - - Test.java - 3 - Casting <code>e</code> to <code>FileNotFoundEx</code> is redundant - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/CaseThrowable/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/CaseThrowable/src/Test.java deleted file mode 100644 index a260d3c2e99b..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/CaseThrowable/src/Test.java +++ /dev/null @@ -1,13 +0,0 @@ -public class RedundantCast{ - void m(IOEx e) throws IOEx { - throw (FileNotFoundEx)e; - } - - void foo(RuntimeException e) { - throw (Ex)e; - } - - static class Ex extends RuntimeException {} - static class IOEx extends Exception {} - static class FileNotFoundEx extends Exception {} -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/src/CastCast.java b/java/java-tests/testData/inspection/redundantCast/generics/CastCast.java similarity index 100% rename from java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/src/CastCast.java rename to java/java-tests/testData/inspection/redundantCast/generics/CastCast.java diff --git a/java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/src/Test.java deleted file mode 100644 index bf7e46e214d4..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/src/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; -import java.util.Map; - -class Test { - { - Map map1 = null; - Map map2 = (Map) (Map) map1; - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/DifferentNullness/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/DifferentNullness/expected.xml deleted file mode 100644 index da9b38bb579c..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/DifferentNullness/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - A.java - 5 - Redundant type cast - Casting <code>a</code> to <code>AA</code> is redundant - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/DifferentNullness/src/A.java b/java/java-tests/testData/inspection/redundantCast/generics/DifferentNullness/src/A.java deleted file mode 100644 index 0a261671c358..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/DifferentNullness/src/A.java +++ /dev/null @@ -1,32 +0,0 @@ -import org.jetbrains.annotations.*; - -class A { - static String doit(A a) { - String d = ((AA)a).danuna(); - String notNull = ((AA)a).doadd(); - return notNull + d; - } - - @Nullable - String doadd() { - return null; - } - - @NotNull - String danuna() { - return ""; - } -} - -class AA extends A { - @NotNull - String doadd() { - return ""; - } - - @Override - @NotNull - String danuna() { - return ""; - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/EnumConstant/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/EnumConstant/expected.xml deleted file mode 100644 index c8c865b6cf6e..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/EnumConstant/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Test.java - 3 - Redundant type cast - Casting <code>""</code> to <code>String</code> is redundant - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/EnumConstant/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/EnumConstant/src/Test.java deleted file mode 100644 index 1dcbdccb6477..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/EnumConstant/src/Test.java +++ /dev/null @@ -1,7 +0,0 @@ - -enum Test { - A((String) ""); - - Test(String s) { - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValue/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/ForEachValue/expected.xml deleted file mode 100644 index 70d6f7378232..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValue/expected.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Test.java - 7 - Casting <code>list</code> to <code>ArrayList<String></code> is redundant - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValue/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/ForEachValue/src/Test.java deleted file mode 100644 index db0b7d198549..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValue/src/Test.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.ArrayList; -import java.util.List; - -public class RedundantCast { - void redundantCasts() { - List list = new ArrayList<>(); - for (String s : (ArrayList) list) {} - - Object o = new ArrayList<>(); - for (String s : (ArrayList) o) {} - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValueIDEA126166/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/ForEachValueIDEA126166/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValueIDEA126166/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValueIDEA126166/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/ForEachValueIDEA126166/src/Test.java deleted file mode 100644 index 18bf47f111b5..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/ForEachValueIDEA126166/src/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -import java.util.ArrayList; -import java.util.List; - -class SomeClass { - public void test() { - List objects = new ArrayList<>(); - for (String value : (Iterable) objects) { - System.out.println(value); - } - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/src/Test.java deleted file mode 100644 index 0fa9d056bae9..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/GetClassProcessing/src/Test.java +++ /dev/null @@ -1,10 +0,0 @@ -class B { } -class A extends B { } - -class C { - void m(Class c) {} - - void x(B b) { - m(((A)b).getClass()); - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/IDEA22899/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/IDEA22899/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/IDEA22899/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/IDEA22899/src/WrapperToPrimitiveCast.java b/java/java-tests/testData/inspection/redundantCast/generics/IDEA22899/src/WrapperToPrimitiveCast.java deleted file mode 100644 index ba9b21c80b70..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/IDEA22899/src/WrapperToPrimitiveCast.java +++ /dev/null @@ -1,15 +0,0 @@ -public class RedundantIntCast -{ - public static void main(String[] args) { - Integer i = 8; - method((int)i, 1); // int cast is marked as redundant - } - - static void method(Object o, Object o1) { - System.out.println("this method works on objects"); - } - - static void method(int i, int i1) { - System.out.println("this method works on ints"); - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Ignore/scr/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/Ignore.java similarity index 76% rename from java/java-tests/testData/inspection/redundantCast/generics/Ignore/scr/Test.java rename to java/java-tests/testData/inspection/redundantCast/generics/Ignore.java index f712d3338e9d..44f36382446a 100644 --- a/java/java-tests/testData/inspection/redundantCast/generics/Ignore/scr/Test.java +++ b/java/java-tests/testData/inspection/redundantCast/generics/Ignore.java @@ -8,7 +8,7 @@ class CastPreventsNPEDetection { void f() { ((ChildCastImpl)this).getParent().toString(); - ((CastPreventsNPEDetection)this).getParent().toString(); + ((CastPreventsNPEDetection)this).getParent().toString(); } } diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Ignore/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/Ignore/expected.xml deleted file mode 100644 index e6aeaad02d23..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Ignore/expected.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - Test.java - 11 - Redundant type cast - Casting <code>this</code> to <code>CastPreventsNPEDetection</code> is redundant - - - Suspicious.java - 9 - Redundant type cast - Casting <code>str</code> to <code>String</code> is redundant - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Ignore/scr/Suspicious.java b/java/java-tests/testData/inspection/redundantCast/generics/IgnoreSuspicious.java similarity index 52% rename from java/java-tests/testData/inspection/redundantCast/generics/Ignore/scr/Suspicious.java rename to java/java-tests/testData/inspection/redundantCast/generics/IgnoreSuspicious.java index 45719b08de72..519729bf3577 100644 --- a/java/java-tests/testData/inspection/redundantCast/generics/Ignore/scr/Suspicious.java +++ b/java/java-tests/testData/inspection/redundantCast/generics/IgnoreSuspicious.java @@ -1,12 +1,12 @@ import java.util.Map; -public class Suspicious { +public class IgnoreSuspicious { Map map; void f(Object s){ String str = (String) s; map.remove((String)s); - map.remove((String)str); + map.remove((String)str); } } \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Inference1/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/Inference1/expected.xml deleted file mode 100644 index 580a889dbfd6..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Inference1/expected.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Inference1/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/Inference1/src/Test.java deleted file mode 100644 index 7e3836a62573..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Inference1/src/Test.java +++ /dev/null @@ -1,20 +0,0 @@ -import java.util.Map; -class Test2 { - public String s; - public void maina(Object key, Map parameters) { - s = ((String[]) parameters.get(key))[0]; - } -} - -public class Test { - static class SomeClass { - public T getX() { - return null; - } - } - - public static void main(String[] args) { - //cast is needed for 'String' to be infered! - System.getProperty((String)new SomeClass().getX()); - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Inference2/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/Inference2/expected.xml deleted file mode 100644 index 5e933496b9cf..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Inference2/expected.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Inference2/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/Inference2/src/Test.java deleted file mode 100644 index c121c0569a29..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Inference2/src/Test.java +++ /dev/null @@ -1,32 +0,0 @@ -import java.util.HashSet; -import java.util.Set; - -final class Pair { - public final A first; - public final B second; - - public Pair(A first, B second) { - this.first = first; - this.second = second; - } - - public final A getFirst() { - return first; - } - - public final B getSecond() { - return second; - } - - public static Pair create(A first, B second) { - return new Pair(first, second); - } - -} - -class Test { - final Set strings = new HashSet(); - final Pair, Set> x = Boolean.TRUE.booleanValue() - ? Pair.create(strings, strings) - : Pair.create(((Set) null), (Set) null); //these casts are not redundant -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Inference3/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/Inference3/expected.xml deleted file mode 100644 index 380236bb5a9d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Inference3/expected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Test.java - 31 - Casting 'null' to 'Set<String>' is redundant - - - Test.java - 31 - Casting 'null' to 'Set<String>' is redundant - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/Inference3/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/Inference3/src/Test.java deleted file mode 100644 index 64cf6d2e0a12..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/Inference3/src/Test.java +++ /dev/null @@ -1,32 +0,0 @@ -import java.util.HashSet; -import java.util.Set; - -final class Pair { - public final A first; - public final B second; - - public Pair(A first, B second) { - this.first = first; - this.second = second; - } - - public final A getFirst() { - return first; - } - - public final B getSecond() { - return second; - } - - public static Pair create(A first, A second) { - return new Pair(first, second); - } - -} - -class Test { - final Set strings = new HashSet(); - final Pair, Set> x = Boolean.TRUE.booleanValue() - ? Pair.create(strings, strings) - : Pair.create(((Set) null), (Set) null); //both casts are marked, but one is required for correct inference -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/InferenceFromCast/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/InferenceFromCast/expected.xml deleted file mode 100644 index 66ceb7bde850..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/InferenceFromCast/expected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Test.java - 5 - Casting <code>getComponent()</code> to <code>Bar</code> is redundant - - - Test.java - 6 - Casting <code>getComponent()</code> to <code>Bar</code> is redundant - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/InferenceFromCast/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/InferenceFromCast/src/Test.java deleted file mode 100644 index fb6f42af8900..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/InferenceFromCast/src/Test.java +++ /dev/null @@ -1,18 +0,0 @@ -class Test { - - { - f((Bar) getComponent()); - f1((Bar) getComponent()); - Bar b = (Bar) getComponent(); - } - - private void f(J j) {} - - private void f1(J j) {} - - private T getComponent() { - return null; - } - - static class Bar {} -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/InstanceOfChecks/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/InstanceOfChecks/expected.xml deleted file mode 100644 index bb05b01e2b27..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/InstanceOfChecks/expected.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Test.java - 8 - Casting <code>o</code> to <code>List</code> is redundant - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/InstanceOfChecks/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/InstanceOfChecks/src/Test.java deleted file mode 100644 index 06750c302b89..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/InstanceOfChecks/src/Test.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.util.ArrayList; -import java.util.List; - -public class RedundantCast { - boolean redundantCasts(Object o) { - int p = 0; - if ((Number)p instanceof Integer) {} - return (List)o instanceof ArrayList; - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/NullInVarargsParameter/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/NullInVarargsParameter/expected.xml deleted file mode 100644 index 48906bd0df8b..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/NullInVarargsParameter/expected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Test.java - 8 - Casting null to Class[] is redundant - - - Test.java - 9 - Casting null to Class[] is redundant - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/NullInVarargsParameter/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/NullInVarargsParameter/src/Test.java deleted file mode 100644 index c17d2647711d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/NullInVarargsParameter/src/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -class Test { - void f(Class... classes) { - } - - void g() { - f(((Class[])null)); - f(((Class)null)); - f(((Class)null), - ((Class)null)); - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCast/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/RawCast/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/RawCast/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCast/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/RawCast/src/Test.java deleted file mode 100644 index c38a855aca88..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/RawCast/src/Test.java +++ /dev/null @@ -1,21 +0,0 @@ -import java.util.List; -import java.util.Map; -import java.util.Properties; - -public class Main { - public static void main(String[] args) throws Exception { - Properties properties = new Properties(); - - Map map = (Map) properties; - System.out.println(map); - } -} - -interface I {} -class C implements I {} -class U { - void foo() { - List listOfC = null; - List listOfI = (List) listOfC; - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCast1/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/RawCast1/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/RawCast1/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCast1/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/RawCast1/src/Test.java deleted file mode 100644 index 6f302ded2732..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/RawCast1/src/Test.java +++ /dev/null @@ -1,10 +0,0 @@ -class Test { - { - class TypedQuery {} - class TemporalDataDTO {} - class FOLDER_ID {} - - TypedQuery h = null; - TypedQuery> typedQuery = (TypedQuery>) (TypedQuery)h; - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/expected.xml deleted file mode 100644 index c63c9258595e..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/src/ReturnValue.java b/java/java-tests/testData/inspection/redundantCast/generics/ReturnValue.java similarity index 100% rename from java/java-tests/testData/inspection/redundantCast/generics/RawCastsToAvoidIncompatibility/src/ReturnValue.java rename to java/java-tests/testData/inspection/redundantCast/generics/ReturnValue.java diff --git a/java/java-tests/testData/inspection/redundantCast/generics/SafeTempVarName/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/SafeTempVarName/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/SafeTempVarName/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/SafeTempVarName/src/Test.java b/java/java-tests/testData/inspection/redundantCast/generics/SafeTempVarName/src/Test.java deleted file mode 100644 index c7fa33b277f8..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/SafeTempVarName/src/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.*; - -public class RedundantCast{ - void foo2(List x) { - for (Object[] l : x) { - String[] s = (String[]) l; - } - } -} diff --git a/java/java-tests/testData/inspection/redundantCast/generics/TypeParameterAccessChecksJava7/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/TypeParameterAccessChecksJava7/expected.xml deleted file mode 100644 index 4704d91e891d..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/TypeParameterAccessChecksJava7/expected.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/TypeParameterAccessChecksJava7/src/TypeParameterAccessChecksJava7.java b/java/java-tests/testData/inspection/redundantCast/generics/TypeParameterAccessChecksJava7/src/TypeParameterAccessChecksJava7.java deleted file mode 100644 index 82e27639f606..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/TypeParameterAccessChecksJava7/src/TypeParameterAccessChecksJava7.java +++ /dev/null @@ -1,7 +0,0 @@ -public abstract class Foo> { - private int field; - - public int bar(T t){ - return ((Foo)t).field; - } -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantCast/generics/WrapperToPrimitiveCast/expected.xml b/java/java-tests/testData/inspection/redundantCast/generics/WrapperToPrimitiveCast/expected.xml deleted file mode 100644 index 7574cc740a49..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/WrapperToPrimitiveCast/expected.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - WrapperToPrimitiveCast.java - 8 - Redundant type cast - Casting <code>J</code> to <code>int</code> is redundant - - - - WrapperToPrimitiveCast.java - 9 - Redundant type cast - Casting <code>I</code> to <code>int</code> is redundant - - - - WrapperToPrimitiveCast.java - 12 - Redundant type cast - Casting <code>p</code> to <code>Integer</code> is redundant - - - - WrapperToPrimitiveCast.java - 15 - Redundant type cast - Casting <code>p</code> to <code>Integer</code> is redundant - - - - - WrapperToPrimitiveCast.java - 24 - Redundant type cast - Casting <code>lnumber</code> to <code>long</code> is redundant - - - - - WrapperToPrimitiveCast.java - 24 - Redundant type cast - Casting <code>lnumber</code> to <code>long</code> is redundant - - - - diff --git a/java/java-tests/testData/inspection/redundantCast/generics/WrapperToPrimitiveCast/src/WrapperToPrimitiveCast.java b/java/java-tests/testData/inspection/redundantCast/generics/WrapperToPrimitiveCast/src/WrapperToPrimitiveCast.java deleted file mode 100644 index ba3e773b7d52..000000000000 --- a/java/java-tests/testData/inspection/redundantCast/generics/WrapperToPrimitiveCast/src/WrapperToPrimitiveCast.java +++ /dev/null @@ -1,32 +0,0 @@ -public class Main { - public static void main(String[] args) { - Integer J = 4; - Integer I = new Integer(4); - - System.out.println(I == J); - System.out.println((int) I == J); - int j = (int)J; - System.out.println((int) I == j); - - int p = 555555; - Integer W = (Integer) p; - System.out.println((Integer) p == W); - int w = W; - System.out.println((Integer) p == w); - - Integer test = 10; - double d = ((double)test/100); - - Double number = Double.valueOf(3); - long integerPart = (long) (double) number; - - Long lnumber = Long.valueOf(3); - long integerPartL = (long) (long) lnumber; - } -} - -class Foo { - T foo() { - return (T)(Object)1; - } -} diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/RedundantCast15Test.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/RedundantCast15Test.java index 116dee125e3a..7383056065da 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/RedundantCast15Test.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/RedundantCast15Test.java @@ -1,47 +1,27 @@ -/* - * Copyright 2000-2017 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. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.java.codeInspection; -import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; +import com.intellij.JavaTestUtil; import com.intellij.codeInspection.redundantCast.RedundantCastInspection; -import com.intellij.openapi.projectRoots.JavaSdkVersion; -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.openapi.roots.ModuleRootModificationUtil; -import com.intellij.pom.java.LanguageLevel; -import com.intellij.testFramework.IdeaTestUtil; -import com.intellij.testFramework.InspectionTestCase; +import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import org.jetbrains.annotations.NotNull; -public class RedundantCast15Test extends InspectionTestCase { +public class RedundantCast15Test extends LightCodeInsightFixtureTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - LanguageLevelProjectExtension.getInstance(myJavaFacade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); - ModuleRootModificationUtil.setModuleSdk(getModule(), getTestProjectSdk()); + protected String getBasePath() { + return JavaTestUtil.getRelativeJavaTestDataPath() + "/inspection/redundantCast/generics"; } + @NotNull @Override - protected Sdk getTestProjectSdk() { - // in jdk 8 some casts are unnecessary - return IdeaTestUtil.getMockJdk17(); + protected LightProjectDescriptor getProjectDescriptor() { + return JAVA_1_7; } private void doTest() { - final LocalInspectionToolWrapper toolWrapper = new LocalInspectionToolWrapper(new RedundantCastInspection()); - doTest("redundantCast/generics/" + getTestName(false), toolWrapper, "java 1.5"); + myFixture.enableInspections(new RedundantCastInspection()); + myFixture.testHighlighting(getTestName(false) + ".java"); } public void testBoxingInRef() { doTest(); } @@ -63,7 +43,8 @@ public class RedundantCast15Test extends InspectionTestCase { public void testRawCast() { doTest();} public void testCastToUnboundWildcard() { doTest();} - public void testRawCastsToAvoidIncompatibility() { doTest();} + public void testCastCast() { doTest();} + public void testReturnValue() { doTest();} public void testIDEA22899() { doTest();} public void testRawCast1() { doTest();} @@ -76,20 +57,25 @@ public class RedundantCast15Test extends InspectionTestCase { public void testSafeTempVarName() { doTest();} public void testTypeParameterAccessChecksJava7() { - IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_7, getModule(), getTestRootDisposable()); doTest(); } public void testBoxingTopCast() { - IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_7, getModule(), getTestRootDisposable()); doTest(); } public void testIgnore() { final RedundantCastInspection castInspection = new RedundantCastInspection(); castInspection.IGNORE_SUSPICIOUS_METHOD_CALLS = true; - final LocalInspectionToolWrapper tool = new LocalInspectionToolWrapper(castInspection); - doTest("redundantCast/generics/" + getTestName(false), tool, "java 1.5"); + myFixture.enableInspections(castInspection); + myFixture.testHighlighting(getTestName(false) + ".java"); + } + + public void testIgnoreSuspicious() { + final RedundantCastInspection castInspection = new RedundantCastInspection(); + castInspection.IGNORE_SUSPICIOUS_METHOD_CALLS = true; + myFixture.enableInspections(castInspection); + myFixture.testHighlighting(getTestName(false) + ".java"); } public void testDifferentNullness() { doTest();} } \ No newline at end of file