MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[tests] one more case for not-null instrumentation test (EA-217655)

Browse Source 
GitOrigin-RevId: 73ca03ecb3ba444856c1ceff2ab2251e2e49ba4d
This commit is contained in:
Roman Shevchenko
2019-12-19 13:32:33 +00:00
committed by intellij-monorepo-bot
parent 8a9f7dff80
commit f8790a6cf9
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/compiler/notNullVerification/InterfaceDefaultMethodParameter.java
+11
View File
@@ -0,0 +1,11 @@
import org.jetbrains.annotations.NotNull;
public class InterfaceDefaultMethodParameter {
public static void test() {
new I(){}.test(null);
}
}
interface I {
default void test(@NotNull String s) { }
}
java/java-tests/testData/compiler/notNullVerification/InterfaceStaticMethodParameter.java
+3 -3
View File
@@ -4,8 +4,8 @@ public class InterfaceStaticMethodParameter {
public static void test() {
I.test(null);
}
}
interface I {
static void test(@NotNull String s) { }
}
interface I {
static void test(@NotNull String s) { }
}
java/java-tests/testSrc/com/intellij/java/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java
+11 -5
View File
@@ -7,13 +7,12 @@ import com.intellij.compiler.instrumentation.FailSafeClassReader;
import com.intellij.compiler.instrumentation.InstrumenterClassWriter;
import com.intellij.compiler.notNullVerification.NotNullVerifyingInstrumenter;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.io.IoTestUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.rules.TempDirectory;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ExceptionUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
@@ -384,7 +383,14 @@ public abstract class NotNullVerifyingInstrumenterTest {
public void testInterfaceStaticMethodParameter() throws Exception {
Class<?> testClass = prepareTest();
Method method = testClass.getMethod("test");
verifyCallThrowsException("Argument 0 for @NotNull parameter of InterfaceStaticMethodParameter$I.test must not be null", null, method);
verifyCallThrowsException("Argument 0 for @NotNull parameter of I.test must not be null", null, method);
}
@Test
public void testInterfaceDefaultMethodParameter() throws Exception {
Class<?> testClass = prepareTest();
Method method = testClass.getMethod("test");
verifyCallThrowsException("Argument 0 for @NotNull parameter of I.test must not be null", null, method);
}
protected static void verifyCallThrowsException(String expectedError, @Nullable Object instance, Member member, Object... args) throws Exception {
@@ -427,7 +433,7 @@ public abstract class NotNullVerifyingInstrumenterTest {
File classesDir = tempDir.newFolder("output");
List<String> args = ContainerUtil.newArrayList("-cp", annotation.classes.getPath());
if (withDebugInfo) args.add("-g");
IdeaTestUtil.compileFile(testFile, classesDir, ArrayUtilRt.toStringArray(args));
IdeaTestUtil.compileFile(testFile, classesDir, ArrayUtil.toStringArray(args));
File[] files = classesDir.listFiles();
assertNotNull(files);
@@ -440,7 +446,7 @@ public abstract class NotNullVerifyingInstrumenterTest {
int flags = InstrumenterClassWriter.getAsmClassWriterFlags(InstrumenterClassWriter.getClassFileVersion(reader));
ClassWriter writer = new ClassWriter(reader, flags);
modified |= NotNullVerifyingInstrumenter.processClassFile(reader, writer, notNullAnnotations);
String className = FileUtilRt.getNameWithoutExtension(file.getName());
String className = FileUtil.getNameWithoutExtension(file.getName());
Class<?> aClass = classLoader.doDefineClass(className, writer.toByteArray());
if (className.equals(testName)) {
mainClass = aClass;