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));
}
compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
+7 -3
View File
@@ -125,9 +125,13 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
List<TestFile> testFiles =
JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory<TestModule, TestFile>() {
@Override
public TestFile createFile(@Nullable TestModule module, String fileName, String text, Map<String, String> directives) {
public TestFile createFile(
@Nullable TestModule module,
@NotNull String fileName,
@NotNull String text,
@NotNull Map<String, String> directives
) {
if (fileName.endsWith(".java")) {
writeJavaFile(fileName, text, javaFilesDir);
}
@@ -136,7 +140,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
}
@Override
public TestModule createModule(String name, List<String> dependencies) {
public TestModule createModule(@NotNull String name, @NotNull List<String> dependencies) {
TestModule module = new TestModule(name);
ModuleAndDependencies oldValue = modules.put(name, new ModuleAndDependencies(module, dependencies));
assert oldValue == null : "Module " + name + " declared more than once";
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+2 -1
View File
@@ -225,8 +225,9 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
List<File> srcFiles = JetTestUtils.createTestFiles(
new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName), true),
new TestFileFactoryNoModules<File>() {
@NotNull
@Override
public File create(String fileName, String text, Map<String, String> directives) {
public File create(@NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives) {
File targetFile = new File(srcDir, fileName);
try {
FileUtil.writeToFile(targetFile, text);
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java
+12 -8
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy;
import com.google.common.base.Predicate;
import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
@@ -50,14 +51,17 @@ public abstract class AbstractLazyResolveRecursiveComparingTest extends KotlinTe
}
private void doTest(String testFileName, boolean checkPrimaryConstructors, boolean checkPropertyAccessors, boolean allowErrorTypes) throws IOException {
List<JetFile> files = JetTestUtils
.createTestFiles(testFileName, FileUtil.loadFile(new File(testFileName), true),
new JetTestUtils.TestFileFactoryNoModules<JetFile>() {
@Override
public JetFile create(String fileName, String text, Map<String, String> directives) {
return JetPsiFactory(getProject()).createFile(fileName, text);
}
});
List<JetFile> files = JetTestUtils.createTestFiles(
testFileName,
FileUtil.loadFile(new File(testFileName), true),
new JetTestUtils.TestFileFactoryNoModules<JetFile>() {
@NotNull
@Override
public JetFile create(@NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives) {
return JetPsiFactory(getProject()).createFile(fileName, text);
}
}
);
ModuleDescriptor eagerModule = LazyResolveTestUtil.resolveEagerly(files, getEnvironment());
ModuleDescriptor lazyModule = LazyResolveTestUtil.resolveLazily(files, getEnvironment());
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
+3 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetLiteFixture;
import org.jetbrains.jet.JetTestUtils;
@@ -60,8 +61,9 @@ public abstract class AbstractLazyResolveTest extends JetLiteFixture {
final ExpectedResolveData expectedResolveData = getExpectedResolveData();
List<JetFile> files = JetTestUtils.createTestFiles("file.kt", text, new JetTestUtils.TestFileFactoryNoModules<JetFile>() {
@NotNull
@Override
public JetFile create(String fileName, String text, Map<String, String> directives) {
public JetFile create(@NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives) {
return expectedResolveData.createFileFromMarkedUpText(fileName, text);
}
});
compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
+3 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.resolve;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetLiteFixture;
import org.jetbrains.jet.JetTestUtils;
@@ -53,8 +54,9 @@ public abstract class ExtensibleResolveTestCase extends JetLiteFixture {
File file = new File(filePath);
String text = JetTestUtils.doLoadFile(file);
List<JetFile> files = JetTestUtils.createTestFiles("file.kt", text, new JetTestUtils.TestFileFactoryNoModules<JetFile>() {
@NotNull
@Override
public JetFile create(String fileName, String text, Map<String, String> directives) {
public JetFile create(@NotNull String fileName, @NotNull String text, @NotNull Map<String, String> directives) {
return expectedResolveData.createFileFromMarkedUpText(fileName, text);
}
});