From f72f67ed973af6c8ce023e8ee050dfc245b61cbc Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 4 Dec 2014 17:09:06 +0300 Subject: [PATCH] Update NavigateToDecompiledLibraryTest --- .../navigation/NavigateToDecompiledLibraryTest.java | 9 +++------ .../AbstractReferenceResolveInLibrarySourcesTest.kt | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java index f7a25e0144e..3695d2b4d38 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java @@ -90,14 +90,11 @@ public class NavigateToDecompiledLibraryTest extends AbstractNavigateToLibraryTe private void doTest() { classFile = getClassFile(PACKAGE, getTestName(false), myModule); - PsiFile clsFileForClassFile = PsiManager.getInstance(getProject()).findFile(classFile); - assertNotNull(clsFileForClassFile); - assertTrue("Expecting kotlin class file, was: " + clsFileForClassFile.getClass(), clsFileForClassFile instanceof JetClsFile); - PsiFile decompiledPsiFile = ((ClsFileImpl) clsFileForClassFile).getDecompiledPsiFile(); + PsiFile decompiledPsiFile = PsiManager.getInstance(getProject()).findFile(classFile); assertNotNull(decompiledPsiFile); - assertTrue("Expecting decompiled Kotlin file, was: " + decompiledPsiFile.getClass(), decompiledPsiFile instanceof JetFile); + assertTrue("Expecting kotlin class file, was: " + decompiledPsiFile.getClass(), decompiledPsiFile instanceof JetClsFile); Map map = getRenderedDescriptorToKotlinPsiMap( - (JetFile) decompiledPsiFile, ((JetClsFile) clsFileForClassFile).getRenderedDescriptorsToRange() + (JetFile) decompiledPsiFile, ((JetClsFile) decompiledPsiFile).getRenderedDescriptorsToRange() ); String decompiledTextWithMarks = getDecompiledTextWithMarks(map); diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index f7e4ee6ac1c..71bcc0ef6f8 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -39,7 +39,7 @@ public abstract class AbstractReferenceResolveInLibrarySourcesTest : JetLightCod val gotoData = NavigationTestUtils.invokeGotoImplementations(fixture.getEditor(), fixture.getFile())!! Assert.assertEquals("Single target expected for origianl file", 1, gotoData.targets.size) - val testedPsiElement = gotoData.targets[0] + val testedPsiElement = gotoData.targets[0].getNavigationElement() val testedElementFile = testedPsiElement.getContainingFile()!! val lineContext = InTextDirectivesUtils.findStringWithPrefixes(fixture.getFile()!!.getText(), "CONTEXT:")