diff --git a/java/java-tests/testData/inspection/redundantThrow/implicitSuper/expected.xml b/java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/expected.xml similarity index 100% rename from java/java-tests/testData/inspection/redundantThrow/implicitSuper/expected.xml rename to java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/expected.xml diff --git a/java/java-tests/testData/inspection/redundantThrow/implicitSuper/src/A.java b/java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/src/A.java similarity index 94% rename from java/java-tests/testData/inspection/redundantThrow/implicitSuper/src/A.java rename to java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/src/A.java index 79dbe59585c9..9b6c8c8f201a 100644 --- a/java/java-tests/testData/inspection/redundantThrow/implicitSuper/src/A.java +++ b/java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/src/A.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * 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. diff --git a/java/java-tests/testData/inspection/redundantThrow/implicitSuper/src/B.java b/java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/src/B.java similarity index 94% rename from java/java-tests/testData/inspection/redundantThrow/implicitSuper/src/B.java rename to java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/src/B.java index dec6c93b2ca5..65af754a03e7 100644 --- a/java/java-tests/testData/inspection/redundantThrow/implicitSuper/src/B.java +++ b/java/java-tests/testData/inspection/redundantThrow/ImplicitSuper/src/B.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * 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. diff --git a/java/java-tests/testData/inspection/redundantThrow/inherited/expected.xml b/java/java-tests/testData/inspection/redundantThrow/Inherited/expected.xml similarity index 100% rename from java/java-tests/testData/inspection/redundantThrow/inherited/expected.xml rename to java/java-tests/testData/inspection/redundantThrow/Inherited/expected.xml diff --git a/java/java-tests/testData/inspection/redundantThrow/Inherited/src/Test.java b/java/java-tests/testData/inspection/redundantThrow/Inherited/src/Test.java new file mode 100644 index 000000000000..1ee03430b612 --- /dev/null +++ b/java/java-tests/testData/inspection/redundantThrow/Inherited/src/Test.java @@ -0,0 +1,24 @@ +/* + * 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 { + void foo() throws java.lang.Exception { + throw new java.io.IOException(); + } + + void bar() throws java.io.IOException { + throw new java.lang.Exception(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantThrow/inherited/src/Test.java b/java/java-tests/testData/inspection/redundantThrow/inherited/src/Test.java deleted file mode 100644 index 30390df9f057..000000000000 --- a/java/java-tests/testData/inspection/redundantThrow/inherited/src/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -public class Test { - void foo() throws java.lang.Exception { - throw new java.io.IOException(); - } - - void bar() throws java.io.IOException { - throw new java.lang.Exception(); - } -} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantThrowTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantThrowTest.java index 75de7baffc0c..c1017d242538 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantThrowTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantThrowTest.java @@ -1,10 +1,24 @@ +/* + * 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. + */ package com.intellij.codeInspection; import com.intellij.JavaTestUtil; import com.intellij.codeInspection.unneededThrows.RedundantThrows; import com.intellij.testFramework.InspectionTestCase; - public class RedundantThrowTest extends InspectionTestCase { @Override protected String getTestDataPath() { @@ -27,6 +41,7 @@ public class RedundantThrowTest extends InspectionTestCase { public void testSCR6858ByRange() throws Exception { doTest(true); } public void testSCR14543() throws Exception { doTest(); } + public void testRemote() throws Exception { doTest(); } public void testEntryPoint() throws Exception { @@ -34,16 +49,15 @@ public class RedundantThrowTest extends InspectionTestCase { doTest("redundantThrow/" + getTestName(true), tool, false, true); } - public void testinherited() throws Exception { + public void testInherited() throws Exception { doTest(); } - public void testimplicitSuper() throws Exception { + public void testImplicitSuper() throws Exception { doTest(); } - public void testselfCall() throws Exception { + public void testSelfCall() throws Exception { doTest(); } - }