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

List:       kde-commits
Subject:    [konsole/frameworks] src: TerminalInterfaceTest is not working ATM on KF5
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2014-02-23 20:34:21
Message-ID: E1WHfkj-0003M9-Vh () scm ! kde ! org
[Download RAW message or body]

Git commit fde60e877346a5d82064e97f3ab9798da96f0074 by Kurt Hindenburg.
Committed on 23/02/2014 at 20:33.
Pushed by hindenburg into branch 'frameworks'.

TerminalInterfaceTest is not working ATM on KF5

M  +8    -0    src/autotests/CMakeLists.txt
R  +3    -2    src/autotests/TerminalInterfaceTest.cpp [from: \
src/tests/TerminalInterfaceTest.cpp - 097% similarity] R  +1    -1    \
src/autotests/TerminalInterfaceTest.h [from: src/tests/TerminalInterfaceTest.h - 096% \
similarity] M  +0    -5    src/tests/CMakeLists.txt

http://commits.kde.org/konsole/fde60e877346a5d82064e97f3ab9798da96f0074

diff --git a/src/autotests/CMakeLists.txt b/src/autotests/CMakeLists.txt
index 48c4af3..7cca033 100644
--- a/src/autotests/CMakeLists.txt
+++ b/src/autotests/CMakeLists.txt
@@ -66,3 +66,11 @@ ecm_mark_as_test(TerminalTest)
 add_test(TerminalTest TerminalTest)
 target_link_libraries(TerminalTest ${KONSOLE_TEST_LIBS})
 
+##add_executable(TerminalInterfaceTest TerminalInterfaceTest.cpp)
+##ecm_mark_as_test(TerminalInterface)
+##add_test(TerminalInterfaceTest TerminalInterfaceTest)
+##target_link_libraries(TerminalInterfaceTest
+##                      ${KDE4_KPARTS_LIBS}
+##                      ${KDE4_KPTY_LIBS}
+##                      ${KONSOLE_TEST_LIBS})
+
diff --git a/src/tests/TerminalInterfaceTest.cpp \
b/src/autotests/TerminalInterfaceTest.cpp similarity index 97%
rename from src/tests/TerminalInterfaceTest.cpp
rename to src/autotests/TerminalInterfaceTest.cpp
index 50cf017..a2face0 100644
--- a/src/tests/TerminalInterfaceTest.cpp
+++ b/src/autotests/TerminalInterfaceTest.cpp
@@ -27,11 +27,12 @@
 #include <KService>
 #include <KDebug>
 #include <qtest_kde.h>
-#include "../Part.h"
+//#include "../Part.h"
 
 using namespace Konsole;
 
 /* In KDE 4.x there are 2 versions: TerminalInterface and TerminalInterfaceV2
+   In KDE 5.x only one: TerminalInterface
    The code below uses both as well the KonsolePart API
 */
 void TerminalInterfaceTest::testTerminalInterface()
@@ -45,7 +46,7 @@ void TerminalInterfaceTest::testTerminalInterface()
     if (!_terminalPart)
         QSKIP("konsolepart not found.", SkipSingle);
 
-    TerminalInterfaceV2* terminal = \
qobject_cast<TerminalInterfaceV2*>(_terminalPart); +    TerminalInterface* terminal = \
qobject_cast<TerminalInterface*>(_terminalPart);  QVERIFY(terminal);
     terminal->showShellInDir(QDir::home().path());
 
diff --git a/src/tests/TerminalInterfaceTest.h \
b/src/autotests/TerminalInterfaceTest.h similarity index 96%
rename from src/tests/TerminalInterfaceTest.h
rename to src/autotests/TerminalInterfaceTest.h
index fcfc75f..98123f0 100644
--- a/src/tests/TerminalInterfaceTest.h
+++ b/src/autotests/TerminalInterfaceTest.h
@@ -20,7 +20,7 @@
 #ifndef TERMINALINTERFACETEST_H
 #define TERMINALINTERFACETEST_H
 
-#include <kde_terminal_interface_v2.h>
+#include <kde_terminal_interface.h>
 #include <KParts/Part>
 
 namespace Konsole
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8d12817..3ea6f4d 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -9,8 +9,3 @@ ecm_mark_as_test(PartManualTest)
 target_link_libraries(PartManualTest KF5::XmlGui KF5::Parts KF5::Pty
                      ${KONSOLE_TEST_LIBS})
 
-kde4_add_unit_test(TerminalInterfaceTest TerminalInterfaceTest.cpp)
-target_link_libraries(TerminalInterfaceTest
-                      ${KDE4_KPARTS_LIBS}
-                      ${KDE4_KPTY_LIBS}
-                      ${KONSOLE_TEST_LIBS})


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