From 663d31709b7feee26717e4dc7185f719c7681620 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 11 Jan 2015 18:01:48 +0300 Subject: [PATCH] Remove outdated code from compiler-tests --- .../jet/CompileCompilerDependenciesTest.java | 32 ------- .../org/jetbrains/jet/JetTestCaseBuilder.java | 88 +------------------ .../jvm/compiler/AbstractLoadJavaTest.java | 5 +- .../org/jetbrains/kotlin/utils/PathUtil.java | 4 +- 4 files changed, 8 insertions(+), 121 deletions(-) delete mode 100644 compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java diff --git a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java deleted file mode 100644 index 2e4cd55ed09..00000000000 --- a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet; - -import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.junit.Test; - -public class CompileCompilerDependenciesTest { - @Test - public void packJdkAnnotations() { - JetTestUtils.getJdkAnnotationsJar(); - } - - @Test - public void compileRuntime() { - ForTestCompileRuntime.runtimeJarForTests(); - } -} diff --git a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java index 03c4ef70dae..e52f3e97979 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java +++ b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java @@ -16,101 +16,21 @@ package org.jetbrains.jet; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.io.FileUtil; -import junit.framework.Test; -import junit.framework.TestSuite; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.parsing.JetParserDefinition; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; -import java.io.FileFilter; -import java.io.FilenameFilter; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; public abstract class JetTestCaseBuilder { - - public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", JetParserDefinition.STD_SCRIPT_SUFFIX); - @NotNull - public static FilenameFilter filterByExtension(@NotNull final String... extensions) { - return new FilenameFilter() { - @Override - public boolean accept(@NotNull File dir, @NotNull String name) { - for (String extension : extensions) { - if (name.endsWith("." + extension)) return true; - } - return false; - } - }; - } - public static String getTestDataPathBase() { return getHomeDirectory() + "/compiler/testData"; } + @NotNull public static String getHomeDirectory() { - String resourceRoot = PathManager.getResourceRoot(JetTestCaseBuilder.class, "/org/jetbrains/jet/JetTestCaseBuilder.class"); - assert resourceRoot != null : "Failed to get root for class: " + JetTestCaseBuilder.class; - - return toSystemIndependentName(new File(resourceRoot).getParentFile().getParentFile().getParent()); - } - public interface NamedTestFactory { - @NotNull Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file); - } - - @NotNull - public static TestSuite suiteForDirectory(String baseDataDir, @NotNull String dataPath, boolean recursive, @NotNull NamedTestFactory factory) { - return suiteForDirectory(baseDataDir, dataPath, recursive, KOTLIN_FILTER, factory); - } - - @NotNull - public static TestSuite suiteForDirectory(String baseDataDir, @NotNull String dataPath, boolean recursive, - @NotNull FilenameFilter filter, @NotNull NamedTestFactory factory) { - TestSuite suite = new TestSuite(dataPath); - appendTestsInDirectory(baseDataDir, dataPath, recursive, filter, factory, suite); - return suite; - } - - @NotNull - public static FilenameFilter and(@NotNull final FilenameFilter a, @NotNull final FilenameFilter b) { - return new FilenameFilter() { - @Override - public boolean accept(@NotNull File dir, @NotNull String name) { - return a.accept(dir, name) && b.accept(dir, name); - } - }; - } - - public static void appendTestsInDirectory(String baseDataDir, String dataPath, boolean recursive, @NotNull FilenameFilter filter, NamedTestFactory factory, TestSuite suite) { - File dir = new File(baseDataDir + dataPath); - FileFilter dirFilter = new FileFilter() { - @Override - public boolean accept(@NotNull File pathname) { - return pathname.isDirectory(); - } - }; - if (recursive) { - File[] files = dir.listFiles(dirFilter); - assert files != null : dir; - List subdirs = Arrays.asList(files); - Collections.sort(subdirs); - for (File subdir : subdirs) { - Test suiteForDir = suiteForDirectory(baseDataDir, dataPath + "/" + subdir.getName(), recursive, filter, factory); - if (suiteForDir.countTestCases() != 0) { - suite.addTest(suiteForDir); - } - } - } - List files = Arrays.asList(dir.listFiles(filter)); - Collections.sort(files); - for (File file : files) { - String testName = FileUtil.getNameWithoutExtension(file); - suite.addTest(factory.createTest(dataPath, testName, file)); - } + File resourceRoot = PathUtil.getResourcePathForClass(JetTestCaseBuilder.class); + return FileUtil.toSystemIndependentName(resourceRoot.getParentFile().getParentFile().getParent()); } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 0b314831945..85e64fb0f78 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -23,7 +23,6 @@ import com.intellij.psi.PsiFile; import junit.framework.ComparisonFailure; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.analyzer.AnalysisResult; @@ -179,8 +178,8 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { File libraryOut = new File(tmpdir, "libraryOut"); compileKotlinWithJava( - Arrays.asList(librarySrc.listFiles(JetTestCaseBuilder.filterByExtension("java"))), - Arrays.asList(librarySrc.listFiles(JetTestCaseBuilder.filterByExtension("kt"))), + FileUtil.findFilesByMask(Pattern.compile(".+\\.java$"), librarySrc), + FileUtil.findFilesByMask(Pattern.compile(".+\\.kt$"), librarySrc), libraryOut, getTestRootDisposable() ); diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java index 7f21507d57c..83e2236c45e 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java +++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java @@ -129,11 +129,11 @@ public class PathUtil { @NotNull public static File getPathUtilJar() { - return getJarPathForClass(PathUtil.class); + return getResourcePathForClass(PathUtil.class); } @NotNull - public static File getJarPathForClass(@NotNull Class aClass) { + public static File getResourcePathForClass(@NotNull Class aClass) { String resourceRoot = PathManager.getResourceRoot(aClass, "/" + aClass.getName().replace('.', '/') + ".class"); return new File(resourceRoot).getAbsoluteFile(); }