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

JS backend: add NotNull and Nullable annotations

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-02 15:59:51 +04:00
parent 6f1d362917
commit 03f673d6cf
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java
+6 -1
View File
@@ -39,14 +39,19 @@ public class SimpleTestClassModel implements TestClassModel {
return o1.getName().compareTo(o2.getName()); return o1.getName().compareTo(o2.getName());
} }
}; };
@NotNull
private final File rootFile; private final File rootFile;
private final boolean recursive; private final boolean recursive;
private final boolean excludeParentDirs; private final boolean excludeParentDirs;
@NotNull
private final Pattern filenamePattern; private final Pattern filenamePattern;
@NotNull
private final String doTestMethodName; private final String doTestMethodName;
@NotNull
private final String testClassName; private final String testClassName;
@Nullable
private Collection<TestClassModel> innerTestClasses; private Collection<TestClassModel> innerTestClasses;
@Nullable
private Collection<TestMethodModel> testMethods; private Collection<TestMethodModel> testMethods;
public SimpleTestClassModel( public SimpleTestClassModel(
generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java
+11 -1
View File
@@ -27,12 +27,21 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class SimpleTestMethodModel implements TestMethodModel { public class SimpleTestMethodModel implements TestMethodModel {
@NotNull
private final File rootDir; private final File rootDir;
@NotNull
private final File file; private final File file;
@NotNull
private final String doTestMethodName; private final String doTestMethodName;
@NotNull
private final Pattern filenamePattern; private final Pattern filenamePattern;
public SimpleTestMethodModel(File rootDir, File file, String doTestMethodName, Pattern filenamePattern) { public SimpleTestMethodModel(
@NotNull File rootDir,
@NotNull File file,
@NotNull String doTestMethodName,
@NotNull Pattern filenamePattern
) {
this.rootDir = rootDir; this.rootDir = rootDir;
this.file = file; this.file = file;
this.doTestMethodName = doTestMethodName; this.doTestMethodName = doTestMethodName;
@@ -58,6 +67,7 @@ public class SimpleTestMethodModel implements TestMethodModel {
assert found : file.getName() + " isn't matched by regex " + filenamePattern.pattern(); assert found : file.getName() + " isn't matched by regex " + filenamePattern.pattern();
assert matcher.groupCount() == 1 : filenamePattern.pattern(); assert matcher.groupCount() == 1 : filenamePattern.pattern();
String extractedName = matcher.group(1); String extractedName = matcher.group(1);
assert extractedName != null : "extractedName should not be null: " + filenamePattern.pattern();
String unescapedName; String unescapedName;
if (rootDir.equals(file.getParentFile())) { if (rootDir.equals(file.getParentFile())) {
generators/src/org/jetbrains/jet/generators/tests/generator/SingleClassTestModel.java
+6 -1
View File
@@ -34,11 +34,15 @@ import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class SingleClassTestModel implements TestClassModel { public class SingleClassTestModel implements TestClassModel {
@NotNull
private final File rootFile; private final File rootFile;
@NotNull
private final Pattern filenamePattern; private final Pattern filenamePattern;
@NotNull
private final String doTestMethodName; private final String doTestMethodName;
@NotNull
private final String testClassName; private final String testClassName;
@Nullable
private Collection<TestMethodModel> testMethods; private Collection<TestMethodModel> testMethods;
public SingleClassTestModel( public SingleClassTestModel(
@@ -91,6 +95,7 @@ public class SingleClassTestModel implements TestClassModel {
return testMethods; return testMethods;
} }
@NotNull
protected Collection<TestMethodModel> getTestMethodsFromFile(File file) { protected Collection<TestMethodModel> getTestMethodsFromFile(File file) {
return Collections.<TestMethodModel>singletonList(new SimpleTestMethodModel(rootFile, file, doTestMethodName, filenamePattern)); return Collections.<TestMethodModel>singletonList(new SimpleTestMethodModel(rootFile, file, doTestMethodName, filenamePattern));
} }