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

EA-81090 - NPE: TestIntegrationUtils.createTestMethodTemplate @NotNulls

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-05 21:03:27 +02:00
parent 192d3c9832
commit 00fa1f8137
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
+8 -8
View File
@@ -139,7 +139,7 @@ public class TestIntegrationUtils {
return result;
}
public static void runTestMethodTemplate(MethodKind methodKind,
public static void runTestMethodTemplate(@NotNull MethodKind methodKind,
TestFramework framework,
final Editor editor,
final PsiClass targetClass,
@@ -149,15 +149,15 @@ public class TestIntegrationUtils {
runTestMethodTemplate(methodKind, framework, editor, targetClass, null, method, name, automatic, existingNames);
}
public static void runTestMethodTemplate(MethodKind methodKind,
public static void runTestMethodTemplate(@NotNull MethodKind methodKind,
TestFramework framework,
final Editor editor,
final PsiClass targetClass,
@Nullable PsiClass sourceClass,
final PsiMethod method,
@Nullable String name,
boolean automatic,
Set<String> existingNames) {
boolean automatic,
Set<String> existingNames) {
runTestMethodTemplate(editor, targetClass, method, automatic,
createTestMethodTemplate(methodKind, framework, targetClass, sourceClass, name, automatic, existingNames));
}
@@ -204,18 +204,18 @@ public class TestIntegrationUtils {
TemplateManager.getInstance(project).startTemplate(editor, template, adapter);
}
public static Template createTestMethodTemplate(MethodKind methodKind,
public static Template createTestMethodTemplate(@NotNull MethodKind methodKind,
TestFramework descriptor,
PsiClass targetClass,
@NotNull PsiClass targetClass,
@Nullable String name,
boolean automatic,
Set<String> existingNames) {
return createTestMethodTemplate(methodKind, descriptor, targetClass, null, name, automatic, existingNames);
}
public static Template createTestMethodTemplate(MethodKind methodKind,
public static Template createTestMethodTemplate(@NotNull MethodKind methodKind,
TestFramework descriptor,
@NotNull PsiClass targetClass,
@NotNull PsiClass targetClass,
@Nullable PsiClass sourceClass,
@Nullable String name,
boolean automatic,
java/java-impl/src/com/intellij/testIntegration/createTest/JavaTestGenerator.java
+2 -1
View File
@@ -41,6 +41,7 @@ import com.intellij.testIntegration.TestIntegrationUtils;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
@@ -223,7 +224,7 @@ public class JavaTestGenerator implements TestGenerator {
});
}
private static PsiMethod generateMethod(TestIntegrationUtils.MethodKind methodKind,
private static PsiMethod generateMethod(@NotNull TestIntegrationUtils.MethodKind methodKind,
TestFramework descriptor,
PsiClass targetClass,
@Nullable PsiClass sourceClass,
plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestGenerator.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class GroovyTestGenerator implements TestGenerator {
});
}
private static void generateMethod(TestIntegrationUtils.MethodKind methodKind,
private static void generateMethod(@NotNull TestIntegrationUtils.MethodKind methodKind,
TestFramework descriptor,
PsiClass targetClass,
Editor editor,