From 7d106ee8b5885229826745da1a84bf6629ce09ba Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 23 Oct 2014 17:29:28 +0400 Subject: [PATCH] Debugger tests: do not create breakpoints for FakeLightClassForFileOfPackage because we create them for KotlinLightClassForPackage --- .../jet/plugin/debugger/KotlinDebuggerTestCase.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index 47767e3cbea..5c1094183b7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -37,6 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.MockLibraryUtil; +import org.jetbrains.jet.asJava.FakeLightClassForFileOfPackage; import org.jetbrains.jet.asJava.KotlinLightClassForPackage; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.psi.JetFile; @@ -49,6 +50,7 @@ import org.jetbrains.jet.testing.ConfigLibraryUtil; import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { @@ -188,11 +190,14 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { for (PsiClass psiClass : psiClasses) { if (psiClass instanceof KotlinLightClassForPackage) { - PsiElement element = psiClass.getNavigationElement(); - if (element instanceof JetFile) { - createBreakpoints((JetFile) element); + Collection files = ((KotlinLightClassForPackage) psiClass).getFiles(); + for (JetFile jetFile : files) { + createBreakpoints(jetFile); } } + else if (psiClass instanceof FakeLightClassForFileOfPackage) { + // skip, because we already create breakpoints using KotlinLightClassForPackage + } else { createBreakpoints(psiClass.getContainingFile()); }