From 1469c1fe5edb34f7f6b23e7a58f64f46a18e1e0f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 19 Oct 2012 21:12:45 +0400 Subject: [PATCH] Fix numbering in debugger tests Line number in SourcePosition is actually 0-based --- idea/testData/debugger/twoClasses.kt | 2 ++ .../jet/plugin/debugger/JetPositionManagerTest.java | 4 ++++ .../jet/plugin/debugger/PositionManagerTestCase.java | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 idea/testData/debugger/twoClasses.kt diff --git a/idea/testData/debugger/twoClasses.kt b/idea/testData/debugger/twoClasses.kt new file mode 100644 index 00000000000..caec305f62f --- /dev/null +++ b/idea/testData/debugger/twoClasses.kt @@ -0,0 +1,2 @@ +class A { fun f() {} } // A +class B { fun g() {} } // B diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java b/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java index e0ecef0785a..61612baea92 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java @@ -117,4 +117,8 @@ public class JetPositionManagerTest extends PositionManagerTestCase { public void testTrait() { doTest(); } + + public void testTwoClasses() { + doTest(); + } } diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java index b08dccb1134..cd2fb739146 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java @@ -122,8 +122,7 @@ public abstract class PositionManagerTestCase extends MultiFileTestCase { for (int i = 0; i < lines.length; i++) { Matcher matcher = BREAKPOINT_PATTERN.matcher(lines[i]); if (matcher.matches()) { - // Line breakpoint numbers are 1-based - breakpoints.add(new Breakpoint(file, i + 1, matcher.group(1))); + breakpoints.add(new Breakpoint(file, i, matcher.group(1))); } } @@ -168,7 +167,7 @@ public abstract class PositionManagerTestCase extends MultiFileTestCase { private static class Breakpoint { private final JetFile file; - private final int lineNumber; + private final int lineNumber; // 0-based private final String className; private Breakpoint(JetFile file, int lineNumber, String className) {