From 32b7bfeca625581c4aa923685b6bf3f71fc61db5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 16 Sep 2013 16:44:28 +0400 Subject: [PATCH] Minor. Using more common class. --- .../tests/org/jetbrains/jet/codegen/CodegenTestCase.java | 4 ++-- .../tests/org/jetbrains/jet/codegen/CodegenTestFiles.java | 4 ++-- .../tests/org/jetbrains/jet/codegen/LineNumberTest.java | 4 ++-- compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java | 6 +++--- .../jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index ec039288105..dc03d262538 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -21,12 +21,12 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.parsing.JetParsingTest; import org.jetbrains.jet.utils.ExceptionUtils; import java.io.File; @@ -74,7 +74,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { @NotNull protected String loadFile(@NotNull String name) { - return loadFileByFullPath(JetParsingTest.getTestDataDir() + "/codegen/" + name); + return loadFileByFullPath(JetTestCaseBuilder.getTestDataPathBase() + "/codegen/" + name); } @NotNull diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java index a032ff4f632..9ecd5811285 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java @@ -20,12 +20,12 @@ import com.google.common.collect.Lists; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.ref.JetTypeName; -import org.jetbrains.jet.parsing.JetParsingTest; import java.io.IOException; import java.util.ArrayList; @@ -86,7 +86,7 @@ public class CodegenTestFiles { ArrayList files = new ArrayList(); for (String name : names) { try { - String content = JetTestUtils.doLoadFile(JetParsingTest.getTestDataDir() + "/codegen/", name); + String content = JetTestUtils.doLoadFile(JetTestCaseBuilder.getTestDataPathBase() + "/codegen/", name); int i = name.lastIndexOf('/'); //name = name.substring(i+1); JetFile file = JetTestUtils.createFile(name, content, project); diff --git a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java index fe6bb11f3c5..f2d24e60d6e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java @@ -23,6 +23,7 @@ import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.asm4.*; import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; @@ -31,7 +32,6 @@ import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.parsing.JetParsingTest; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.utils.ExceptionUtils; @@ -51,7 +51,7 @@ public class LineNumberTest extends TestCaseWithTmpdir { @NotNull private static String getTestDataPath() { - return JetParsingTest.getTestDataDir() + "/lineNumber"; + return JetTestCaseBuilder.getTestDataPathBase() + "/lineNumber"; } @NotNull diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java index 90b416a20d3..8653aeb0514 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java @@ -23,6 +23,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.common.CLIConfigurationKeys; @@ -43,7 +44,6 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.parsing.JetParsingTest; import java.io.File; import java.lang.reflect.Constructor; @@ -93,8 +93,8 @@ public class TestlibTest extends UsefulTestCase { assertTrue(junitJar.exists()); configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, junitJar); - configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetParsingTest.getTestDataDir() + "/../../libraries/stdlib/test"); - configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetParsingTest.getTestDataDir() + "/../../libraries/kunit/src"); + configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetTestCaseBuilder.getTestDataPathBase() + "/../../libraries/stdlib/test"); + configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, JetTestCaseBuilder.getTestDataPathBase() + "/../../libraries/kunit/src"); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, new MessageCollectorPlainTextToStream(System.out, MessageCollectorPlainTextToStream.NON_VERBOSE)); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index 73a8f133efb..745db76b327 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -18,13 +18,13 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; +import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.parsing.JetParsingTest; import org.junit.Assert; import java.io.File; @@ -45,7 +45,7 @@ public class CompileEnvironmentTest extends TestCase { File jdkAnnotations = ForTestPackJdkAnnotations.jdkAnnotationsForTests(); File resultJar = new File(tempDir, "result.jar"); ExitCode rv = new K2JVMCompiler().exec(System.out, - "-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", + "-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kts", "-jar", resultJar.getAbsolutePath(), "-noStdlib", "-classpath", stdlib.getAbsolutePath(), @@ -80,7 +80,7 @@ public class CompileEnvironmentTest extends TestCase { File stdlib = ForTestCompileRuntime.runtimeJarForTests(); File jdkAnnotations = ForTestPackJdkAnnotations.jdkAnnotationsForTests(); ExitCode exitCode = new K2JVMCompiler() - .exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", + .exec(System.out, "-src", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kt", "-output", out.getAbsolutePath(), "-noStdlib", "-classpath", stdlib.getAbsolutePath(),