From 290a2a06201ca330af89941db87f7b9bb64d5fcf Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 13 Jun 2012 17:02:51 +0400 Subject: [PATCH] AbstractLazyResolveTest extracted --- ...ractLazyResolveNamespaceComparingTest.java | 32 +---------- .../resolve/lazy/AbstractLazyResolveTest.java | 54 +++++++++++++++++++ ...esolveNamespaceComparingTestGenerated.java | 8 +-- 3 files changed, 59 insertions(+), 35 deletions(-) create mode 100644 compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java index da2457bf9ca..5740dc4c199 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -18,16 +18,11 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import com.intellij.util.Function; -import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.cli.jvm.compiler.NamespaceComparator; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -37,11 +32,7 @@ import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; -import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.name.Name; -import org.junit.After; -import org.junit.BeforeClass; import java.io.File; import java.io.IOException; @@ -51,28 +42,7 @@ import java.util.List; /** * @author abreslav */ -public abstract class AbstractLazyResolveNamespaceComparingTest { - private final Disposable rootDisposable = new Disposable() { - @Override - public void dispose() { - } - }; - - private final CompilerDependencies - compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true); - private final JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(rootDisposable, compilerDependencies); - private final Project project = jetCoreEnvironment.getProject(); - - @BeforeClass - public static void setUp() throws Exception { - System.setProperty("java.awt.headless", "true"); - } - - @After - public void tearDown() throws Exception { - Disposer.dispose(rootDisposable); - } - +public abstract class AbstractLazyResolveNamespaceComparingTest extends AbstractLazyResolveTest { protected void doTest( String testFileName, Function, Pair> transform, diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java new file mode 100644 index 00000000000..ef0e095532b --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java @@ -0,0 +1,54 @@ +/* + * Copyright 2010-2012 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.lang.resolve.lazy; + +import com.intellij.openapi.Disposable; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Disposer; +import org.jetbrains.jet.CompileCompilerDependenciesTest; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; +import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; +import org.junit.After; +import org.junit.BeforeClass; + +/** + * @author abreslav + */ +public class AbstractLazyResolveTest { + private final Disposable rootDisposable = new Disposable() { + @Override + public void dispose() { + } + }; + + protected final CompilerDependencies + compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true); + protected final JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(rootDisposable, compilerDependencies); + protected final Project project = jetCoreEnvironment.getProject(); + + @BeforeClass + public static void setUp() throws Exception { + System.setProperty("java.awt.headless", "true"); + } + + @After + public void tearDown() throws Exception { + Disposer.dispose(rootDisposable); + } + +} diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 20b887e4ea8..1bbf2b605fb 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -25,7 +25,7 @@ import java.lang.reflect.Method; import java.util.HashSet; import java.util.Set; -/* This class is generated by LazyResolveNamespaceComparingTestGenerator. DO NOT MODIFY MANUALLY */ +/* This class is generated by LazyResolveTestGenerator. DO NOT MODIFY MANUALLY */ @RunWith(Suite.class) @Suite.SuiteClasses({ LazyResolveNamespaceComparingTestGenerated.ReadKotlinBinaryClass.class, @@ -710,7 +710,7 @@ public class LazyResolveNamespaceComparingTestGenerated { else { String name = file.getName(); if (name.endsWith(".kt") && !methodNames.contains("test" + name.toLowerCase())) { - Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveNamespaceComparingTestGenerator"); + Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveTestGenerator"); } } } @@ -964,7 +964,7 @@ public class LazyResolveNamespaceComparingTestGenerated { else { String name = file.getName(); if (name.endsWith(".kt") && !methodNames.contains("test" + name.toLowerCase())) { - Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveNamespaceComparingTestGenerator"); + Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveTestGenerator"); } } } @@ -1003,7 +1003,7 @@ public class LazyResolveNamespaceComparingTestGenerated { else { String name = file.getName(); if (name.endsWith(".kt") && !methodNames.contains("test" + name.toLowerCase())) { - Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveNamespaceComparingTestGenerator"); + Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveTestGenerator"); } } }