[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-09-28 17:59:00
Message-ID: 1222624740.627706.23395.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 865698 by mbreugel:
- Do not set resize modes on the results-treeview when no model has been initialized \
yet. This fixes the it-runnerwindow test failure.
- Move ITestFrameworkPrivate to it's own file
- Move a handful of classes from the top directory to internal/
- Fix a memory leak in RunnerModelTest
- Add two edge cases to TreeTraverseTest
M +5 -4 CMakeLists.txt
A internal/itestframework_p.cpp [License: GPL (v2+)]
A internal/itestframework_p.h [License: GPL (v2+)]
M +1 -1 internal/overlaymanager.cpp
M +6 -1 internal/resultswidget.cpp
M +6 -1 internal/resultswidget.h
M +6 -15 internal/runnerwindow.cpp
M +1 -1 internal/selectionmanager.cpp
AM internal/selectionstore.cpp selectionstore.cpp#865265 [License: GPL \
(v2+)] AM internal/selectionstore.h selectionstore.h#865265 [License: \
GPL (v2+)] AM internal/testexecutor.cpp testexecutor.cpp#865265 \
[License: GPL (v2+)] AM internal/testexecutor.h testexecutor.h#865265 \
[License: GPL (v2+)] AM internal/toolviewdata.cpp \
toolviewdata.cpp#865265 [License: GPL (v2+)] AM internal/toolviewdata.h \
toolviewdata.h#865265 [License: GPL (v2+)] AM internal/utils.cpp \
utils.cpp#865265 [License: GPL (v2+)] AM internal/utils.h \
utils.h#865265 [License: GPL (v2+)] M +1 -1 internal/verbosemanager.cpp
M +1 -92 itestframework.cpp
M +0 -1 itestframework.h
M +2 -2 itestrunner.cpp
M +3 -0 mainpage_
D selectionstore.cpp
D selectionstore.h
D testexecutor.cpp
D testexecutor.h
M +1 -1 tests/CMakeLists.txt
A tests/resultswidgettest.cpp [License: GPL (v2+)]
A tests/resultswidgettest.h [License: GPL (v2+)]
M +2 -3 tests/runMemcheck.py
M +3 -1 tests/runnermodeltest.cpp
D tests/runnerproxymodeltest.cpp
M +1 -1 tests/selectionstoretest.cpp
M +1 -1 tests/testexecutortest.cpp
M +17 -1 tests/treetraversetest.cpp
M +2 -0 tests/treetraversetest.h
D toolviewdata.cpp
D toolviewdata.h
D utils.cpp
D utils.h
--- trunk/KDE/kdevplatform/veritas/CMakeLists.txt #865697:865698
@@ -8,13 +8,13 @@
set(veritas_SRCS
test.cpp
testresult.cpp
- testexecutor.cpp
+ internal/testexecutor.cpp
itestrunner.cpp
itestframework.cpp
- utils.cpp
- selectionstore.cpp
+ internal/utils.cpp
+ internal/selectionstore.cpp
testtoolviewfactory.cpp
- toolviewdata.cpp
+ internal/toolviewdata.cpp
internal/resultsmodel.cpp
internal/resultsproxymodel.cpp
internal/runnermodel.cpp
@@ -27,6 +27,7 @@
internal/overlaymanager.cpp
internal/overlaytoggle.cpp
internal/resultswidget.cpp
+ internal/itestframework_p.cpp
tests/runnertesthelper.cpp)
#${CMAKE_SOURCE_DIR}/tests/common/modeltest.cpp)
--- trunk/KDE/kdevplatform/veritas/internal/overlaymanager.cpp #865697:865698
@@ -21,7 +21,7 @@
#include "overlaymanager.h"
#include "veritas/test.h"
-#include "veritas/utils.h"
+#include "utils.h"
#include "runnermodel.h"
#include "overlaytoggle.h"
--- trunk/KDE/kdevplatform/veritas/internal/resultswidget.cpp #865697:865698
@@ -36,7 +36,12 @@
header()->setStretchLastSection(false);
header()->setMovable(false);
header()->setClickable(false);
- setResizeMode();
+
+ tree()->setStyleSheet(
+ "QTreeView::branch{"
+ "image: none;"
+ "border-image: none"
+ "}");
}
ResultsWidget::~ResultsWidget()
--- trunk/KDE/kdevplatform/veritas/internal/resultswidget.h #865697:865698
@@ -22,16 +22,21 @@
#define VERITAS_RESULTSWIDGET_H
#include <QTreeView>
+#include "../veritasexport.h"
namespace Veritas
{
-class ResultsWidget : public QTreeView
+class VERITAS_EXPORT ResultsWidget : public QTreeView
{
public:
ResultsWidget(QWidget* parent=0);
virtual ~ResultsWidget();
+ /*! WARNING Since recently, Qt asserts if no model with the right
+ * number of of columns (4 in this case) has been set.
+ * So _first_ initialize a resultsmodel on this widget's QTreeView
+ * or crash. */
void setResizeMode();
QTreeView* tree();
};
--- trunk/KDE/kdevplatform/veritas/internal/runnerwindow.cpp #865697:865698
@@ -33,13 +33,13 @@
#include "verbosemanager.h"
#include "verbosetoggle.h"
#include "selectiontoggle.h"
-#include "../testexecutor.h"
+#include "testexecutor.h"
#include <ktexteditor/cursor.h>
#include "interfaces/icore.h"
#include "interfaces/idocumentcontroller.h"
-#include "veritas/utils.h"
+#include "utils.h"
#include "resultswidget.h"
#include <QMessageBox>
@@ -132,11 +132,6 @@
"image: none;"
"border-image: none"
"}");
- resultsView()->setStyleSheet(
- "QTreeView::branch{"
- "image: none;"
- "border-image: none"
- "}");
connect(runnerView(), SIGNAL(clicked(QModelIndex)),
SLOT(expandOrCollapse(QModelIndex)));
@@ -278,8 +273,8 @@
runnerView()->reset();
delete m1;
- resultsView()->reset();
resultsModel()->clear();
+ m_results->setResizeMode();
prevModel->disconnect();
delete prevModel;
}
@@ -333,18 +328,14 @@
m_verbose->reset();
m_selection->reset();
stopPreviousModel();
- if (!model || model->columnCount() < 1) {
- // No user interaction without a model or a model without columns.
+ if (!model) {
+ // No user interaction without a model or an empty one
enableItemActions(false);
return;
}
initProxyModels(model);
-
- // Very limited user interaction without data.
- if (model->rowCount() < 1) {
+ if (model->rowCount() == 0) {
enableItemActions(false);
- m_ui->actionColumns->setEnabled(true);
- m_ui->actionSettings->setEnabled(true);
return;
}
connectItemStatistics(model);
--- trunk/KDE/kdevplatform/veritas/internal/selectionmanager.cpp #865697:865698
@@ -21,7 +21,7 @@
#include "selectionmanager.h"
#include "veritas/test.h"
-#include "veritas/utils.h"
+#include "utils.h"
#include "runnermodel.h"
#include "selectiontoggle.h"
** trunk/KDE/kdevplatform/veritas/internal/selectionstore.cpp #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/selectionstore.h #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/testexecutor.cpp #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/testexecutor.h #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/toolviewdata.cpp #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/toolviewdata.h #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/utils.cpp #property svn:mergeinfo
+
** trunk/KDE/kdevplatform/veritas/internal/utils.h #property svn:mergeinfo
+
--- trunk/KDE/kdevplatform/veritas/internal/verbosemanager.cpp #865697:865698
@@ -21,7 +21,7 @@
#include "verbosemanager.h"
#include "veritas/test.h"
-#include "veritas/utils.h"
+#include "utils.h"
#include "runnermodel.h"
#include "verbosetoggle.h"
--- trunk/KDE/kdevplatform/veritas/itestframework.cpp #865697:865698
@@ -20,99 +20,11 @@
#include "itestframework.h"
#include "toolviewdata.h"
+#include "internal/itestframework_p.h"
-#include <interfaces/icore.h>
-#include <interfaces/iuicontroller.h>
-#include <sublime/area.h>
-#include <sublime/controller.h>
-#include <sublime/document.h>
-#include <sublime/view.h>
-
-using KDevelop::ICore;
-using KDevelop::IUiController;
-using Sublime::Area;
-using Sublime::Document;
-using Sublime::View;
using Veritas::ITestFramework;
using Veritas::ITestFrameworkPrivate;
-using Veritas::ToolViewData;
-namespace
-{
-
-/*! Functor that looks for a results-view in a Sublime::Area
- * If one is found, @p found becomes true */
-class ResultsViewFinder
-{
-public:
- ResultsViewFinder(const QString& id) : m_id(id), found(false) {}
- Area::WalkerMode operator()(View *view, Sublime::Position position) {
- Document* doc = view->document();
- if (doc->documentSpecifier().startsWith(m_id)) {
- found = true;
- m_view = view;
- return Area::StopWalker;
- } else {
- return Area::ContinueWalker;
- }
- }
- QString m_id;
- bool found;
- View* m_view;
-};
-
-}
-
-class ITestFrameworkPrivate : public QObject
-{
-Q_OBJECT
-public:
- ITestFrameworkPrivate() {
- Sublime::Controller* c = ICore::self()->uiController()->controller();
- connect(c, SIGNAL(aboutToRemoveToolView(Sublime::View*)), \
SLOT(maybeRemoveResultsView(Sublime::View*)));
- connect(c, SIGNAL(toolViewMoved(Sublime::View*)), \
SLOT(fixMovedResultsView(Sublime::View*)));
- }
- ITestFramework* self;
-
-private:
- void removeResultsView(const QString& docId) {
- IUiController* uic = ICore::self()->uiController();
- Sublime::Controller* sc = uic->controller();
- sc->disconnect(this);
- QList<Area*> as = sc->allAreas();
- foreach(Area* a, as) {
- ResultsViewFinder rvf(docId);
- a->walkToolViews(rvf, Sublime::AllPositions);
- if (rvf.found) {
- a->removeToolView(rvf.m_view);
- }
- }
- connect(sc, SIGNAL(aboutToRemoveToolView(Sublime::View*)), \
SLOT(maybeRemoveResultsView(Sublime::View*)));
- connect(sc, SIGNAL(toolViewMoved(Sublime::View*)), \
SLOT(fixMovedResultsView(Sublime::View*)));
- }
-
-private slots:
- void fixMovedResultsView(Sublime::View* v) {
- maybeRemoveResultsView(v);
- Q_ASSERT(g_toolViewStore.contains(self));
- ToolViewData& tv = g_toolViewStore[self];
- if (tv.view2id.contains(v)) {
- tv.view2id[v] = tv.runnerToolCounter;
- }
- }
-
- void maybeRemoveResultsView(Sublime::View* v) {
- Q_ASSERT(g_toolViewStore.contains(self));
- ToolViewData& tv = g_toolViewStore[self];
- if (tv.view2id.contains(v)) {
- QString docId = QString("org.kdevelop.%1ResultsView").arg(self->name());
- docId += QString::number(tv.view2id[v]);
- removeResultsView(docId);
- }
- }
-
-};
-
ITestFramework::ITestFramework()
: d(new ITestFrameworkPrivate())
{
@@ -124,6 +36,3 @@
{
delete d;
}
-
-#include "moc_itestframework.cpp"
-#include "itestframework.moc"
--- trunk/KDE/kdevplatform/veritas/itestframework.h #865697:865698
@@ -27,7 +27,6 @@
namespace Veritas
{
class ITestRunner;
-class Test;
/*! An extension interface for (xUnit) test frameworks. Plugins that implement this
* will have access to the veritas runner & result toolview.
--- trunk/KDE/kdevplatform/veritas/itestrunner.cpp #865697:865698
@@ -21,9 +21,9 @@
// veritas
#include "itestrunner.h"
#include "itestframework.h"
-#include "toolviewdata.h"
+#include "internal/toolviewdata.h"
#include "test.h"
-#include "selectionstore.h"
+#include "internal/selectionstore.h"
#include "ui_runnerwindow.h"
#include "internal/runnermodel.h"
--- trunk/KDE/kdevplatform/veritas/mainpage_ #865697:865698
@@ -19,6 +19,9 @@
* 02110-1301, USA.
*/
+// WARNING this documentation is completly outdated
+// TODO update it
+
/*!
* \file mainpage.h
*
--- trunk/KDE/kdevplatform/veritas/tests/CMakeLists.txt #865697:865698
@@ -26,8 +26,8 @@
kdev_add_test2(ut-resultsmodel ${CMAKE_SOURCE_DIR}/tests/common/modeltest.cpp \
resultsmodeltest.cpp) kdev_add_test2(ut-runnermodel \
${CMAKE_SOURCE_DIR}/tests/common/modeltest.cpp runnermodeltest.cpp) \
kdev_add_test(ut-resultsproxymodel resultsproxymodeltest.cpp)
-kdev_add_test(ut-runnerproxymodel runnerproxymodeltest.cpp)
kdev_add_test(ut-testexecutor testexecutortest.cpp)
kdev_add_test(it-runnerwindow runnerwindowtest.cpp)
kdev_add_test(ut-selectionstoretest selectionstoretest.cpp)
kdev_add_test(ut-treetraverse treetraversetest.cpp)
+kdev_add_test(ut-resultswidget resultswidgettest.cpp)
--- trunk/KDE/kdevplatform/veritas/tests/runMemcheck.py #865697:865698
@@ -6,9 +6,8 @@
from subprocess import Popen, PIPE
from xml.dom.minidom import parse, parseString
-tests=['veritas-ut-proxymodelcommon', \
- 'veritas-ut-resultsmodel', 'veritas-ut-resultsproxymodel', \
- 'veritas-ut-runnermodel', 'veritas-ut-runnerproxymodel', \
+tests=['veritas-ut-resultsmodel', 'veritas-ut-resultsproxymodel', \
+ 'veritas-ut-runnermodel', \
'veritas-ut-selectionstoretest', 'veritas-ut-test', \
'veritas-ut-testexecutor', 'veritas-ut-treetraverse' ]
--- trunk/KDE/kdevplatform/veritas/tests/runnermodeltest.cpp #865697:865698
@@ -27,7 +27,7 @@
#include <qtest_kde.h>
#include "../test.h"
-#include "../testexecutor.h"
+#include "../internal/testexecutor.h"
#include "kasserts.h"
#include "modelcreation.h"
@@ -149,6 +149,7 @@
QString description = it.key();
it.remove();
KOMPARE_MSG(0, spy->size(), description);
+ delete spy;
}
}
@@ -176,6 +177,7 @@
KVERIFY(actualNames.contains("parent"));
delete model;
+ delete dataChanged;
}
//test command
--- trunk/KDE/kdevplatform/veritas/tests/selectionstoretest.cpp #865697:865698
@@ -23,7 +23,7 @@
#include <QtTest/QTest>
#include "../test.h"
-#include "../selectionstore.h"
+#include "../internal/selectionstore.h"
#include "kasserts.h"
using Veritas::SelectionStoreTest;
--- trunk/KDE/kdevplatform/veritas/tests/testexecutortest.cpp #865697:865698
@@ -30,7 +30,7 @@
#include "kasserts.h"
#include "../test.h"
-#include "../testexecutor.h"
+#include "../internal/testexecutor.h"
using Veritas::Test;
using Veritas::TestExecutor;
--- trunk/KDE/kdevplatform/veritas/tests/treetraversetest.cpp #865697:865698
@@ -21,7 +21,7 @@
#include "treetraversetest.h"
#include <QtTest/QTest>
-#include "../utils.h"
+#include "../internal/utils.h"
#include "../test.h"
using Veritas::TreeTraverseTest;
@@ -65,5 +65,21 @@
delete root;
}
+void TreeTraverseTest::nill()
+{
+ Visit v;
+ traverseTree(0, v);
+ QVERIFY(v.visited.isEmpty());
+}
+
+void TreeTraverseTest::rootOnly()
+{
+ Visit v;
+ Test* root = new Test("root", 0);
+ traverseTree(root, v);
+ QCOMPARE(1, v.visited.count());
+ QCOMPARE(root, v.visited[0]);
+}
+
QTEST_MAIN( TreeTraverseTest )
#include "treetraversetest.moc"
--- trunk/KDE/kdevplatform/veritas/tests/treetraversetest.h #865697:865698
@@ -35,6 +35,8 @@
void cleanup();
void simpleTree();
+ void nill();
+ void rootOnly();
};
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic