Move KotlinTestWithEnvironment to org.jetbrains.kotlin.test

It's not really related to lazy-resolve and should be also probably located
near KotlinTestWithEnvironmentManagement
This commit is contained in:
Alexander Udalov
2016-02-25 20:50:41 +03:00
committed by Alexander Udalov
parent 25cebe03e9
commit c72f29b13a
13 changed files with 25 additions and 24 deletions
@@ -24,7 +24,6 @@ import com.intellij.testFramework.LightVirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment;
import org.junit.Assert;
public abstract class KotlinLiteFixture extends KotlinTestWithEnvironment {
@@ -0,0 +1,49 @@
/*
* Copyright 2010-2016 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.kotlin.test;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
public abstract class KotlinTestWithEnvironment extends KotlinTestWithEnvironmentManagement {
private KotlinCoreEnvironment environment;
@Override
protected void setUp() throws Exception {
super.setUp();
environment = createEnvironment();
}
@Override
protected void tearDown() throws Exception {
environment = null;
super.tearDown();
}
protected abstract KotlinCoreEnvironment createEnvironment() throws Exception;
@NotNull
public KotlinCoreEnvironment getEnvironment() {
return environment;
}
@NotNull
public Project getProject() {
return getEnvironment().getProject();
}
}
@@ -24,9 +24,9 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment;
import org.jetbrains.kotlin.resolve.lazy.LazyEntity;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import org.jetbrains.kotlin.utils.Printer;
import java.io.File;