fix copy-paste in tests
WriteSignatureTest CompileJavaAgainstKotlinTest ReadClassDataTest
This commit is contained in:
@@ -6,7 +6,6 @@ import com.intellij.openapi.vfs.CharsetToolkit;
|
||||
import com.intellij.psi.PsiFileFactory;
|
||||
import com.intellij.psi.impl.PsiFileFactoryImpl;
|
||||
import com.intellij.testFramework.LightVirtualFile;
|
||||
import com.intellij.testFramework.UsefulTestCase;
|
||||
import junit.framework.Test;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.codegen.ClassBuilderFactory;
|
||||
@@ -34,12 +33,11 @@ import java.util.Locale;
|
||||
*
|
||||
* @see WriteSignatureTest
|
||||
*/
|
||||
public class CompileJavaAgainstKotlinTest extends UsefulTestCase {
|
||||
public class CompileJavaAgainstKotlinTest extends TestCaseWithTmpdir {
|
||||
|
||||
private final File ktFile;
|
||||
private final File javaFile;
|
||||
private JetCoreEnvironment jetCoreEnvironment;
|
||||
private File tmpdir;
|
||||
|
||||
public CompileJavaAgainstKotlinTest(File ktFile) {
|
||||
this.ktFile = ktFile;
|
||||
@@ -52,19 +50,6 @@ public class CompileJavaAgainstKotlinTest extends UsefulTestCase {
|
||||
return ktFile.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
tmpdir = JetTestUtils.tmpDirForTest(this);
|
||||
JetTestUtils.recreateDirectory(tmpdir);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tearDown() throws Exception {
|
||||
Disposer.dispose(myTestRootDisposable);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void runTest() throws Throwable {
|
||||
jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
package org.jetbrains.jet;
|
||||
|
||||
import com.intellij.openapi.Disposable;
|
||||
import com.intellij.openapi.util.Disposer;
|
||||
import com.intellij.openapi.util.io.FileUtil;
|
||||
import com.intellij.openapi.vfs.CharsetToolkit;
|
||||
import com.intellij.psi.PsiFileFactory;
|
||||
import com.intellij.psi.impl.PsiFileFactoryImpl;
|
||||
import com.intellij.testFramework.LightVirtualFile;
|
||||
import com.intellij.testFramework.UsefulTestCase;
|
||||
import junit.framework.Test;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.codegen.ClassBuilderFactory;
|
||||
@@ -42,17 +40,10 @@ import java.util.Set;
|
||||
/**
|
||||
* @author Stepan Koltsov
|
||||
*/
|
||||
public class ReadClassDataTest extends UsefulTestCase {
|
||||
|
||||
protected final Disposable myTestRootDisposable = new Disposable() {
|
||||
@Override
|
||||
public void dispose() {
|
||||
}
|
||||
};
|
||||
public class ReadClassDataTest extends TestCaseWithTmpdir {
|
||||
|
||||
private JetCoreEnvironment jetCoreEnvironment;
|
||||
private File tmpdir;
|
||||
|
||||
|
||||
private final File testFile;
|
||||
|
||||
public ReadClassDataTest(@NotNull File testFile) {
|
||||
@@ -60,26 +51,6 @@ public class ReadClassDataTest extends UsefulTestCase {
|
||||
setName(testFile.getName());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
tmpdir = JetTestUtils.tmpDirForTest(this);
|
||||
JetTestUtils.recreateDirectory(tmpdir);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tearDown() throws Exception {
|
||||
Disposer.dispose(myTestRootDisposable);
|
||||
}
|
||||
|
||||
private void createMockCoreEnvironment() {
|
||||
jetCoreEnvironment = new JetCoreEnvironment(myTestRootDisposable);
|
||||
|
||||
final File rtJar = new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/rt.jar");
|
||||
jetCoreEnvironment.addToClasspath(rtJar);
|
||||
jetCoreEnvironment.addToClasspath(new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK-1.7/jre/lib/annotations.jar"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void runTest() throws Exception {
|
||||
jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package org.jetbrains.jet;
|
||||
|
||||
import com.intellij.testFramework.UsefulTestCase;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* @author Stepan Koltsov
|
||||
*/
|
||||
public abstract class TestCaseWithTmpdir extends UsefulTestCase {
|
||||
|
||||
protected File tmpdir;
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
tmpdir = JetTestUtils.tmpDirForTest(this);
|
||||
JetTestUtils.recreateDirectory(tmpdir);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,7 +8,6 @@ import com.intellij.openapi.vfs.CharsetToolkit;
|
||||
import com.intellij.psi.PsiFileFactory;
|
||||
import com.intellij.psi.impl.PsiFileFactoryImpl;
|
||||
import com.intellij.testFramework.LightVirtualFile;
|
||||
import com.intellij.testFramework.UsefulTestCase;
|
||||
import junit.framework.Test;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@@ -42,11 +41,10 @@ import java.util.regex.Pattern;
|
||||
*
|
||||
* @see CompileJavaAgainstKotlinTest
|
||||
*/
|
||||
public class WriteSignatureTest extends UsefulTestCase {
|
||||
public class WriteSignatureTest extends TestCaseWithTmpdir {
|
||||
|
||||
private final File ktFile;
|
||||
private JetCoreEnvironment jetCoreEnvironment;
|
||||
private File tmpdir;
|
||||
|
||||
public WriteSignatureTest(File ktFile) {
|
||||
this.ktFile = ktFile;
|
||||
@@ -57,19 +55,6 @@ public class WriteSignatureTest extends UsefulTestCase {
|
||||
return ktFile.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
tmpdir = JetTestUtils.tmpDirForTest(this);
|
||||
JetTestUtils.recreateDirectory(tmpdir);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tearDown() throws Exception {
|
||||
Disposer.dispose(myTestRootDisposable);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void runTest() throws Throwable {
|
||||
jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
|
||||
|
||||
Reference in New Issue
Block a user