azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove Jet from names of classes in tests: phase 2

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-03 14:05:20 +01:00
parent c604f98a1c
commit 19af88738b
382 changed files with 21630 additions and 21661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.renderer.*;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.MemberComparator;
import org.jetbrains.kotlin.resolve.scopes.KtScope;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.utils.Printer;
import org.junit.Assert;
@@ -266,7 +266,7 @@ public class RecursiveDescriptorComparator {
}
if (txtFile != null) {
JetTestUtils.assertEqualsToFile(txtFile, actualSerialized);
KotlinTestUtils.assertEqualsToFile(txtFile, actualSerialized);
}
}
compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java
+4 -4
View File
@@ -26,7 +26,7 @@ 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.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.utils.Printer;
import java.io.File;
@@ -36,15 +36,15 @@ import java.util.List;
public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment {
@Override
protected KotlinCoreEnvironment createEnvironment() {
return JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable());
return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable());
}
public void testRecursive() throws Exception {
File ktFile = new File("compiler/testData/recursiveProcessor/declarations.kt");
File txtFile = new File("compiler/testData/recursiveProcessor/declarations.txt");
String text = FileUtil.loadFile(ktFile, true);
KtFile jetFile = JetTestUtils.createFile("declarations.kt", text, getEnvironment().getProject());
AnalysisResult result = JetTestUtils.analyzeFile(jetFile, getEnvironment());
KtFile jetFile = KotlinTestUtils.createFile("declarations.kt", text, getEnvironment().getProject());
AnalysisResult result = KotlinTestUtils.analyzeFile(jetFile, getEnvironment());
PackageViewDescriptor testPackage = result.getModuleDescriptor().getPackage(FqName.topLevel(Name.identifier("test")));
List<String> descriptors = recursivelyCollectDescriptors(testPackage);