From f64e633a7e543c28419855a4a92ad2c31b93d672 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 29 Aug 2014 18:47:30 +0400 Subject: [PATCH] Minor, add NotNull annotations to test sources --- .../tests/org/jetbrains/jet/JetTestUtils.java | 22 +++++++++++++------ .../jet/checkers/BaseDiagnosticsTest.java | 10 ++++++--- .../jvm/compiler/AbstractLoadJavaTest.java | 3 ++- ...ractLazyResolveRecursiveComparingTest.java | 20 ++++++++++------- .../resolve/lazy/AbstractLazyResolveTest.java | 4 +++- .../resolve/ExtensibleResolveTestCase.java | 4 +++- 6 files changed, 42 insertions(+), 21 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index df97eb18a3c..a7af4ac59ca 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -480,24 +480,31 @@ public class JetTestUtils { } public interface TestFileFactory { - F createFile(@Nullable M module, String fileName, String text, Map directives); - M createModule(String name, List dependencies); + F createFile(@Nullable M module, @NotNull String fileName, @NotNull String text, @NotNull Map directives); + M createModule(@NotNull String name, @NotNull List dependencies); } - public static abstract class TestFileFactoryNoModules implements TestFileFactory { + public static abstract class TestFileFactoryNoModules implements TestFileFactory { @Override - public final F createFile(@Nullable Void module, String fileName, String text, Map directives) { + public final F createFile( + @Nullable Void module, + @NotNull String fileName, + @NotNull String text, + @NotNull Map directives + ) { return create(fileName, text, directives); } - public abstract F create(String fileName, String text, Map directives); + @NotNull + public abstract F create(@NotNull String fileName, @NotNull String text, @NotNull Map directives); @Override - public Void createModule(String name, List dependencies) { + public Void createModule(@NotNull String name, @NotNull List dependencies) { return null; } } + @NotNull public static List createTestFiles(String testFileName, String expectedText, TestFileFactory factory) { Map directives = parseDirectives(expectedText); @@ -584,8 +591,9 @@ public class JetTestUtils { } List files = createTestFiles("", content, new TestFileFactoryNoModules() { + @NotNull @Override - public String create(String fileName, String text, Map directives) { + public String create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { int firstLineEnd = text.indexOf('\n'); return StringUtil.trimTrailing(text.substring(firstLineEnd + 1)); } diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index 1636bffc1fa..7f72be19170 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -125,9 +125,13 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture { List testFiles = JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory() { - @Override - public TestFile createFile(@Nullable TestModule module, String fileName, String text, Map directives) { + public TestFile createFile( + @Nullable TestModule module, + @NotNull String fileName, + @NotNull String text, + @NotNull Map 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 dependencies) { + public TestModule createModule(@NotNull String name, @NotNull List dependencies) { TestModule module = new TestModule(name); ModuleAndDependencies oldValue = modules.put(name, new ModuleAndDependencies(module, dependencies)); assert oldValue == null : "Module " + name + " declared more than once"; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index b7b8295cff5..e655ebb95e5 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -225,8 +225,9 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { List srcFiles = JetTestUtils.createTestFiles( new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName), true), new TestFileFactoryNoModules() { + @NotNull @Override - public File create(String fileName, String text, Map directives) { + public File create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { File targetFile = new File(srcDir, fileName); try { FileUtil.writeToFile(targetFile, text); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java index 204fc88a8bc..9231bed2a82 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveRecursiveComparingTest.java @@ -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 files = JetTestUtils - .createTestFiles(testFileName, FileUtil.loadFile(new File(testFileName), true), - new JetTestUtils.TestFileFactoryNoModules() { - @Override - public JetFile create(String fileName, String text, Map directives) { - return JetPsiFactory(getProject()).createFile(fileName, text); - } - }); + List files = JetTestUtils.createTestFiles( + testFileName, + FileUtil.loadFile(new File(testFileName), true), + new JetTestUtils.TestFileFactoryNoModules() { + @NotNull + @Override + public JetFile create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { + return JetPsiFactory(getProject()).createFile(fileName, text); + } + } + ); ModuleDescriptor eagerModule = LazyResolveTestUtil.resolveEagerly(files, getEnvironment()); ModuleDescriptor lazyModule = LazyResolveTestUtil.resolveLazily(files, getEnvironment()); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java index 405d32d862e..a9c8162df7f 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java @@ -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 files = JetTestUtils.createTestFiles("file.kt", text, new JetTestUtils.TestFileFactoryNoModules() { + @NotNull @Override - public JetFile create(String fileName, String text, Map directives) { + public JetFile create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { return expectedResolveData.createFileFromMarkedUpText(fileName, text); } }); diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java index 8526c9bfd78..d8773c8bf7f 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java @@ -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 files = JetTestUtils.createTestFiles("file.kt", text, new JetTestUtils.TestFileFactoryNoModules() { + @NotNull @Override - public JetFile create(String fileName, String text, Map directives) { + public JetFile create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { return expectedResolveData.createFileFromMarkedUpText(fileName, text); } });