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

Refactoring: remove warnings

Browse Source
This commit is contained in:
Nikolay Krasko
2013-05-22 19:11:42 +04:00
parent 3f2ff3eb24
commit 3bd258ffa6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java
+7 -5
View File
@@ -38,7 +38,7 @@ public abstract class JetTestCaseBuilder {
public static FilenameFilter filterByExtension(@NotNull final String... extensions) { public static FilenameFilter filterByExtension(@NotNull final String... extensions) {
return new FilenameFilter() { return new FilenameFilter() {
@Override @Override
public boolean accept(File dir, String name) { public boolean accept(@NotNull File dir, @NotNull String name) {
for (String extension : extensions) { for (String extension : extensions) {
if (name.endsWith("." + extension)) return true; if (name.endsWith("." + extension)) return true;
} }
@@ -52,7 +52,10 @@ public abstract class JetTestCaseBuilder {
} }
public static String getHomeDirectory() { public static String getHomeDirectory() {
return new File(PathManager.getResourceRoot(JetTestCaseBuilder.class, "/org/jetbrains/jet/JetTestCaseBuilder.class")).getParentFile().getParentFile().getParent(); String resourceRoot = PathManager.getResourceRoot(JetTestCaseBuilder.class, "/org/jetbrains/jet/JetTestCaseBuilder.class");
assert resourceRoot != null : "Failed to get root for class: " + JetTestCaseBuilder.class;
return new File(resourceRoot).getParentFile().getParentFile().getParent();
} }
public interface NamedTestFactory { public interface NamedTestFactory {
@NotNull Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file); @NotNull Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file);
@@ -75,7 +78,7 @@ public abstract class JetTestCaseBuilder {
public static FilenameFilter and(@NotNull final FilenameFilter a, @NotNull final FilenameFilter b) { public static FilenameFilter and(@NotNull final FilenameFilter a, @NotNull final FilenameFilter b) {
return new FilenameFilter() { return new FilenameFilter() {
@Override @Override
public boolean accept(File dir, String name) { public boolean accept(@NotNull File dir, @NotNull String name) {
return a.accept(dir, name) && b.accept(dir, name); return a.accept(dir, name) && b.accept(dir, name);
} }
}; };
@@ -85,7 +88,7 @@ public abstract class JetTestCaseBuilder {
File dir = new File(baseDataDir + dataPath); File dir = new File(baseDataDir + dataPath);
FileFilter dirFilter = new FileFilter() { FileFilter dirFilter = new FileFilter() {
@Override @Override
public boolean accept(File pathname) { public boolean accept(@NotNull File pathname) {
return pathname.isDirectory(); return pathname.isDirectory();
} }
}; };
@@ -104,7 +107,6 @@ public abstract class JetTestCaseBuilder {
List<File> files = Arrays.asList(dir.listFiles(filter)); List<File> files = Arrays.asList(dir.listFiles(filter));
Collections.sort(files); Collections.sort(files);
for (File file : files) { for (File file : files) {
String fileName = file.getName();
String testName = FileUtil.getNameWithoutExtension(file); String testName = FileUtil.getNameWithoutExtension(file);
suite.addTest(factory.createTest(dataPath, testName, file)); suite.addTest(factory.createTest(dataPath, testName, file));
} }