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

List:       kde-commits
Subject:    KDE/kdevplatform/veritas
From:       Manuel Breugelmans <mbr.nxi () gmail ! com>
Date:       2008-11-12 21:46:37
Message-ID: 1226526397.069251.21042.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 883431 by mbreugel:

ITestRunner was responsable for showing verbose test output, that's not quite right.
Refactor the virtual-protected-slot on ITestRunner that handled this into a factory \
method on Veritas::Test.


 M  +5 -3      internal/runnerwindow.cpp  
 M  +1 -2      internal/runnerwindow.h  
 M  +0 -3      itestrunner.h  
 M  +5 -0      test.cpp  
 M  +5 -0      test.h  


--- trunk/KDE/kdevplatform/veritas/internal/runnerwindow.cpp #883430:883431
@@ -37,6 +37,7 @@
 #include <ktexteditor/cursor.h>
 #include "interfaces/icore.h"
 #include "interfaces/idocumentcontroller.h"
+#include "interfaces/iruncontroller.h"
 
 #include "utils.h"
 #include "test_p.h"
@@ -114,7 +115,7 @@
     m_selection->setButton(selectionToggle);
     m_verbose = new OverlayManager(runnerView());
     m_verboseToggle = new VerboseToggle(runnerView()->viewport());
-    connect(m_verboseToggle, SIGNAL(clicked(bool)),SLOT(emitOpenVerbose()));
+    connect(m_verboseToggle, SIGNAL(clicked(bool)),SLOT(showVerboseTestOutput()));
     m_verbose->setButton(m_verboseToggle);
 
     QPixmap refresh = KIconLoader::global()->loadIcon("view-refresh", \
KIconLoader::Small); @@ -145,13 +146,14 @@
     runnerView()->setSelectionBehavior(QAbstractItemView::SelectRows);
 }
 
-void RunnerWindow::emitOpenVerbose()
+void RunnerWindow::showVerboseTestOutput()
 {
     const QModelIndex index = m_verboseToggle->index();
     if (index.isValid()) {
         Test* t = m_verbose->index2Test(index);
         if (t) {
-            emit openVerbose(t);
+            KJob* j = t->createVerboseOutputJob();
+            if (j) ICore::self()->runController()->registerJob(j);
         }
     }
 }
--- trunk/KDE/kdevplatform/veritas/internal/runnerwindow.h #883430:883431
@@ -98,11 +98,10 @@
 
 Q_SIGNALS:
     void runCompleted() const;
-    void openVerbose(Veritas::Test*);
 
 public Q_SLOTS:
 
-    void emitOpenVerbose();
+    void showVerboseTestOutput();
     void addProjectToPopup(KDevelop::IProject*);
     void rmProjectFromPopup(KDevelop::IProject*);
 
--- trunk/KDE/kdevplatform/veritas/itestrunner.h #883430:883431
@@ -64,9 +64,6 @@
 
     KDevelop::IProject* project() const;
 
-protected Q_SLOTS:
-    virtual void openVerbose(Test*) = 0;
-
 Q_SIGNALS:
     void registerFinished(Veritas::Test* root);
 
--- trunk/KDE/kdevplatform/veritas/test.cpp #883430:883431
@@ -77,6 +77,11 @@
 void Test::kill()
 {}
 
+KJob* Test::createVerboseOutputJob()
+{
+    return 0;
+}
+
 bool Test::needVerboseToggle() const
 {
     return d->needVerboseToggle;
--- trunk/KDE/kdevplatform/veritas/test.h #883430:883431
@@ -32,6 +32,7 @@
 #include <QtCore/QModelIndex>
 
 class QAbstractItemModel;
+class KJob;
 
 namespace Veritas
 {
@@ -138,6 +139,10 @@
     void signalStarted();
     void signalFinished();
 
+    /*! Factory method. May return 0. The job it returns is supposed to show
+     *  verbose test output. Eg a KDevelop::OutputJob. */
+    virtual KJob* createVerboseOutputJob();
+
     /*! Contains methods that are only to be used inside the library.
      *  This nested class is not exported nor is the header installed.
      *  Sole purpose is to hide stuff from the outside. */


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