From 21133566c616258b90a430e426b6a8f6fb3c4262 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 1 Dec 2019 05:05:23 +0000
Subject: [PATCH] massif-visualizer: adjust tests

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 massif-visualizer/test/CMakeLists.txt   |  6 ++++--
 massif-visualizer/test/massifparser.cpp |  1 +
 massif-visualizer/test/modeltest.cpp    | 18 +++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/massif-visualizer/test/CMakeLists.txt b/massif-visualizer/test/CMakeLists.txt
index bff01626..04586c85 100644
--- a/massif-visualizer/test/CMakeLists.txt
+++ b/massif-visualizer/test/CMakeLists.txt
@@ -2,17 +2,19 @@ set(datamodeltest_SRCS
     datamodeltest.cpp
     modeltest.cpp
 )
-kde4_add_unit_test(datamodeltest ${datamodeltest_SRCS})
+kde4_add_test(datamodeltest ${datamodeltest_SRCS})
 target_link_libraries(datamodeltest LINK_PRIVATE
     mv-massifdata
     mv-visualizer
     ${QT_QTTEST_LIBRARY}
+    ${KDE4_KIO_LIBS}
 )
 
-kde4_add_executable(massifparser massifparser.cpp)
+add_executable(massifparser massifparser.cpp)
 
 target_link_libraries(massifparser LINK_PRIVATE
     ${QT_QTCORE_LIBRARY}
     ${KDE4_KDECORE_LIBS}
+    ${KDE4_KIO_LIBS}
     mv-massifdata
 )
diff --git a/massif-visualizer/test/massifparser.cpp b/massif-visualizer/test/massifparser.cpp
index 367a9c6b..0ef9b648 100644
--- a/massif-visualizer/test/massifparser.cpp
+++ b/massif-visualizer/test/massifparser.cpp
@@ -25,6 +25,7 @@
 
 #include <QCoreApplication>
 #include <QElapsedTimer>
+#include <QScopedPointer>
 #include <QDebug>
 
 #include "massifdata/parser.h"
diff --git a/massif-visualizer/test/modeltest.cpp b/massif-visualizer/test/modeltest.cpp
index 4044908e..ae9191e6 100644
--- a/massif-visualizer/test/modeltest.cpp
+++ b/massif-visualizer/test/modeltest.cpp
@@ -416,27 +416,27 @@ void ModelTest::data()
     // General Purpose roles that should return a QString
     QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole );
     if ( variant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QString> ( variant ) );
+        Q_ASSERT ( variant.canConvert<QString>() );
     }
     variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole );
     if ( variant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QString> ( variant ) );
+        Q_ASSERT ( variant.canConvert<QString>() );
     }
     variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole );
     if ( variant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QString> ( variant ) );
+        Q_ASSERT ( variant.canConvert<QString>() );
     }
 
     // General Purpose roles that should return a QSize
     variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole );
     if ( variant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QSize> ( variant ) );
+        Q_ASSERT ( variant.canConvert<QSize>() );
     }
 
     // General Purpose roles that should return a QFont
     QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole );
     if ( fontVariant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QFont> ( fontVariant ) );
+        Q_ASSERT ( fontVariant.canConvert<QFont>() );
     }
 
     // Check that the alignment is one we know about
@@ -447,14 +447,14 @@ void ModelTest::data()
     }
 
     // General Purpose roles that should return a QColor
-    QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole );
+    QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundRole );
     if ( colorVariant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) );
+        Q_ASSERT ( colorVariant.canConvert<QColor>() );
     }
 
-    colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole );
+    colorVariant = model->data ( model->index ( 0, 0 ), Qt::ForegroundRole );
     if ( colorVariant.isValid() ) {
-        Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) );
+        Q_ASSERT ( colorVariant.canConvert<QColor>() );
     }
 
     // Check that the "check state" is one we know about.