Revert "ability to compile text and small refactoring"

This reverts commit 4ddf101397.

compiler/tests/org/jetbrains/jet/JetLiteFixture.java

@@ -30,6 +30,7 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.testFramework.TestDataFile;
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.jet.compiler.CompileEnvironment;
 import org.jetbrains.jet.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.JetLanguage;
@@ -74,7 +75,7 @@ public abstract class JetLiteFixture extends UsefulTestCase {
 
     protected void createEnvironmentWithFullJdk() {
         myEnvironment = new JetCoreEnvironment(getTestRootDisposable());
-        final File rtJar = JetCoreEnvironment.findRtJar();
+        final File rtJar = CompileEnvironment.findRtJar();
         myEnvironment.addToClasspath(rtJar);
     }
 

compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java

@@ -223,4 +223,18 @@ public abstract class CodegenTestCase extends JetLiteFixture {
         return loadClass(name, codegens);
     }
 
+    private static class MyClassLoader extends ClassLoader {
+      public MyClassLoader(ClassLoader parent) {
+        super(parent);
+      }
+
+      public Class doDefineClass(String name, byte[] data) {
+        return defineClass(name, data, 0, data.length);
+      }
+
+      @Override
+      public Class<?> loadClass(String name) throws ClassNotFoundException {
+        return super.loadClass(name);
+      }
+    }
 }

compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2000-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.codegen;
-
-import junit.framework.TestCase;
-import org.jetbrains.jet.compiler.CompileEnvironment;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class CompileTextTest extends TestCase {
-    public void testMe() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        String text = "import org.jetbrains.jet.codegen.CompileTextTest; fun x() = CompileTextTest()";
-        CompileEnvironment compileEnvironment = new CompileEnvironment(getClass().getClassLoader());
-        ClassLoader classLoader = compileEnvironment.compileText(text);
-        Class<?> namespace = classLoader.loadClass("namespace");
-        Method x = namespace.getDeclaredMethod("x");
-        Object invoke = x.invoke(null);
-        assertTrue(invoke instanceof CompileTextTest);
-    }
-}

compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java

@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.codegen;
 
+import org.jetbrains.jet.compiler.CompileEnvironment;
+
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,7 +32,7 @@ public class StdlibTest extends CodegenTestCase {
         super.setUp();
         createEnvironmentWithFullJdk();
         myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
-        myEnvironment.ensureRuntime();
+        CompileEnvironment.ensureRuntime(myEnvironment);
     }
 
     @Override