[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] debuggers/gdb/unittests: Adjust gdbtest to the recent changes in the BreakpointModel
From:       Vlas Puhov <vlas.puhov () mail ! ru>
Date:       2014-01-08 11:01:24
Message-ID: E1W0qt2-00047K-TI () scm ! kde ! org
[Download RAW message or body]

Git commit e8aae0a48037fb69201d4ceaa683be3b3115d792 by Vlas Puhov.
Committed on 08/01/2014 at 10:03.
Pushed by vpuhov into branch 'master'.

Adjust gdbtest to the recent changes in the BreakpointModel

M  +6    -6    debuggers/gdb/unittests/gdbtest.cpp

http://commits.kde.org/kdevelop/e8aae0a48037fb69201d4ceaa683be3b3115d792

diff --git a/debuggers/gdb/unittests/gdbtest.cpp \
b/debuggers/gdb/unittests/gdbtest.cpp index 1aeea62..fe2c557 100644
--- a/debuggers/gdb/unittests/gdbtest.cpp
+++ b/debuggers/gdb/unittests/gdbtest.cpp
@@ -321,12 +321,12 @@ void GdbTest::testDeleteBreakpoint()
 
     TestLaunchConfiguration cfg;
 
-    QCOMPARE(KDevelop::ICore::self()->debugController()->breakpointModel()->rowCount(), \
1); //one for the "insert here" entry +    \
QCOMPARE(breakpoints()->rowCount(), 0);  //add breakpoint before \
startProgram  breakpoints()->addCodeBreakpoint(debugeeFileName, 21);
-    QCOMPARE(KDevelop::ICore::self()->debugController()->breakpointModel()->rowCount(), \
2); +    QCOMPARE(breakpoints()->rowCount(), 1);
     breakpoints()->removeRow(0);
-    QCOMPARE(KDevelop::ICore::self()->debugController()->breakpointModel()->rowCount(), \
1); +    QCOMPARE(breakpoints()->rowCount(), 0);
 
     breakpoints()->addCodeBreakpoint(debugeeFileName, 22);
 
@@ -362,7 +362,7 @@ void GdbTest::testUpdateBreakpoint()
     TestLaunchConfiguration cfg;
 
     KDevelop::Breakpoint * b = \
                breakpoints()->addCodeBreakpoint(debugeeFileName, 28);
-    QCOMPARE(KDevelop::ICore::self()->debugController()->breakpointModel()->rowCount(), \
2); +    QCOMPARE(breakpoints()->rowCount(), 1);
 
     session->startProgram(&cfg, m_iface);
 
@@ -373,7 +373,7 @@ void GdbTest::testUpdateBreakpoint()
     QTest::qWait(100);
     session->stepInto();
     WAIT_FOR_STATE(session, DebugSession::PausedState);
-    QCOMPARE(KDevelop::ICore::self()->debugController()->breakpointModel()->rowCount(), \
3); +    QCOMPARE(breakpoints()->rowCount(), 2);
     b = breakpoints()->breakpoint(1);
     QCOMPARE(b->url(), KUrl(debugeeFileName));
     QCOMPARE(b->line(), 27);
@@ -1318,7 +1318,7 @@ void GdbTest::testPickupManuallyInsertedBreakpoint()
     WAIT_FOR_STATE(session, DebugSession::PausedState);
     QTest::qWait(1000); //wait for breakpoints update
     QCOMPARE(breakpoints()->breakpoints().count(), 2);
-    QCOMPARE(breakpoints()->rowCount(), 2+1);
+    QCOMPARE(breakpoints()->rowCount(), 2);
     KDevelop::Breakpoint *b = breakpoints()->breakpoint(1);
     QVERIFY(b);
     QCOMPARE(b->line(), 31); //we start with 0, gdb with 1


[prev in list] [next in list] [prev in thread] [next in thread]