From d94dad19dc9bb1e73c42b8119931975992ec710e Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 10 Jul 2012 18:42:20 +0400
Subject: [PATCH] Proper test fixture

---
 .../AbstractLazyResolveDescriptorRendererTest.java   |  4 +---
 .../lang/resolve/lazy/AbstractLazyResolveTest.java   | 12 +++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
index 86b5eaa251b..91f4789a333 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
@@ -36,12 +36,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * @author abreslav
  */
-public class AbstractLazyResolveDescriptorRendererTest extends AbstractLazyResolveTest {
+public abstract class AbstractLazyResolveDescriptorRendererTest extends AbstractLazyResolveTest {
 
 
     protected void doTest(@NotNull String testFile) throws IOException {
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
index c52282bd02f..38a1ffd01d2 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
@@ -35,7 +35,6 @@ 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.name.Name;
-import org.junit.After;
 
 import java.util.Collections;
 
@@ -66,13 +65,20 @@ public abstract class AbstractLazyResolveTest extends TestCase {
 
     }
 
-    protected final JetCoreEnvironmentWithDisposable regularEnvironment = new JetCoreEnvironmentWithDisposable(ConfigurationKind.ALL);
+    protected JetCoreEnvironmentWithDisposable regularEnvironment;
 
     protected Project getProject() {
         return regularEnvironment.project;
     }
 
-    @After
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        regularEnvironment = new JetCoreEnvironmentWithDisposable(ConfigurationKind.ALL);
+    }
+
+    @Override
     public void tearDown() throws Exception {
         Disposer.dispose(rootDisposable);
     }