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

support junit5's assertNotNull in dfa (IDEA-168552)

Browse Source
This commit is contained in:
peter
2017-02-23 15:59:04 +01:00
parent f534a24e4c
commit b536857a22
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
+13 -16
View File
@@ -80,21 +80,23 @@ public class HardcodedContracts {
return Collections.singletonList(new MethodContract(constraints, THROW_EXCEPTION));
}
}
else if ("junit.framework.Assert".equals(className) ||
"org.junit.Assert".equals(className) ||
"org.junit.Assume".equals(className) ||
"junit.framework.TestCase".equals(className) ||
"com.google.common.truth.Truth".equals(className) ||
"com.google.common.truth.TestVerb".equals(className) ||
className.startsWith("org.assertj.core.api.") ||
"org.testng.Assert".equals(className) ||
"org.testng.AssertJUnit".equals(className)) {
else if (isJunit(className) || isTestng(className) ||
className.startsWith("com.google.common.truth.") ||
className.startsWith("org.assertj.core.api.")) {
return handleTestFrameworks(paramCount, className, methodName, call);
}
return Collections.emptyList();
}
private static boolean isJunit(String className) {
return className.startsWith("junit.framework.") || className.startsWith("org.junit.");
}
private static boolean isTestng(String className) {
return className.startsWith("org.testng.");
}
private static boolean isNotNullMatcher(PsiExpression expr) {
if (expr instanceof PsiMethodCallExpression) {
String calledName = ((PsiMethodCallExpression)expr).getMethodExpression().getReferenceName();
@@ -122,16 +124,11 @@ public class HardcodedContracts {
return handleAssertThat(paramCount, call);
}
if (!"junit.framework.Assert".equals(className) &&
!"junit.framework.TestCase".equals(className) &&
!"org.junit.Assert".equals(className) &&
!"org.junit.Assume".equals(className) &&
!"org.testng.Assert".equals(className) &&
!"org.testng.AssertJUnit".equals(className)) {
if (!isJunit(className) && !isTestng(className)) {
return Collections.emptyList();
}
boolean testng = className.startsWith("org.testng.");
boolean testng = isTestng(className);
if ("fail".equals(methodName)) {
return Collections.singletonList(new MethodContract(createConstraintArray(paramCount), THROW_EXCEPTION));
}