diff --git a/java/java-tests/testData/inspection/nullableProblems/OverriddenMethods.java b/java/java-tests/testData/inspection/nullableProblems/OverriddenMethods.java index 81ac5b033122..02f00ceb3021 100644 --- a/java/java-tests/testData/inspection/nullableProblems/OverriddenMethods.java +++ b/java/java-tests/testData/inspection/nullableProblems/OverriddenMethods.java @@ -22,14 +22,9 @@ class PPP2 extends P2 { /////// in library interface Foo { - @NotNull - String getTitle(); -} -class FooImpl extends java.awt.Frame implements Foo { -// public String getTitle() { -// return super.getTitle(); //To change body of overridden methods use File | Settings | File Templates. -// } + @NotNull Object get(int i ); } +class FooImpl extends java.util.ArrayList implements Foo { } interface I1 { diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java index 2a75c1670f97..de55d9d82f4b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java @@ -22,6 +22,7 @@ import com.intellij.codeInspection.nullable.NullableStuffInspection; import com.intellij.openapi.Disposable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.Disposer; +import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; @@ -32,7 +33,7 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase private static final DefaultLightProjectDescriptor PROJECT_DESCRIPTOR = new DefaultLightProjectDescriptor() { @Override public Sdk getSdk() { - return PsiTestUtil.addJdkAnnotations(super.getSdk()); + return PsiTestUtil.addJdkAnnotations(IdeaTestUtil.getMockJdk18()); } }; private NullableStuffInspection myInspection = new NullableStuffInspection();