azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, add NotNull annotations to test sources

Browse Source
This commit is contained in:
Alexander Udalov
2014-08-29 18:47:30 +04:00
parent 3485d65d8a
commit f64e633a7e
6 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+15 -7
View File
@@ -480,24 +480,31 @@ public class JetTestUtils {
}
public interface TestFileFactory<M, F> {
F createFile(@Nullable M module, String fileName, String text, Map<String, String> directives);
M createModule(String name, List<String> dependencies);
F createFile(@Nullable M module, @NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives);
M createModule(@NotNull String name, @NotNull List<String> dependencies);
}
public static abstract class TestFileFactoryNoModules<F> implements TestFileFactory<Void,F> {
public static abstract class TestFileFactoryNoModules<F> implements TestFileFactory<Void, F> {
@Override
public final F createFile(@Nullable Void module, String fileName, String text, Map<String, String> directives) {
public final F createFile(
@Nullable Void module,
@NotNull String fileName,
@NotNull String text,
@NotNull Map<String, String> directives
) {
return create(fileName, text, directives);
}
public abstract F create(String fileName, String text, Map<String, String> directives);
@NotNull
public abstract F create(@NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives);
@Override
public Void createModule(String name, List<String> dependencies) {
public Void createModule(@NotNull String name, @NotNull List<String> dependencies) {
return null;
}
}
@NotNull
public static <M, F> List<F> createTestFiles(String testFileName, String expectedText, TestFileFactory<M, F> factory) {
Map<String, String> directives = parseDirectives(expectedText);
@@ -584,8 +591,9 @@ public class JetTestUtils {
}
List<String> files = createTestFiles("", content, new TestFileFactoryNoModules<String>() {
@NotNull
@Override
public String create(String fileName, String text, Map<String, String> directives) {
public String create(@NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives) {
int firstLineEnd = text.indexOf('\n');
return StringUtil.trimTrailing(text.substring(firstLineEnd + 1));
}