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

List:       kde-commits
Subject:    [ktexteditor] autotests: split the indent test into separate runs
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2016-09-07 14:34:31
Message-ID: E1bhdvr-0008TM-U0 () code ! kde ! org
[Download RAW message or body]

Git commit a01bec55365d8fcfe5462d86ea9eb33a4b25096b by Christoph Cullmann.
Committed on 07/09/2016 at 14:34.
Pushed by cullmann into branch 'master'.

split the indent test into separate runs

M  +27   -2    autotests/CMakeLists.txt
M  +2    -2    autotests/src/indenttest.cpp
M  +2    -2    autotests/src/indenttest.h

http://commits.kde.org/ktexteditor/a01bec55365d8fcfe5462d86ea9eb33a4b25096b

diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 98d6262..371edb5 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -38,7 +38,8 @@ set (KTEXTEDITOR_TEST_LINK_LIBS KF5TextEditor
   KF5::I18n
   KF5::IconThemes
   KF5::GuiAddons
-  Qt5::Script)
+  Qt5::Script
+)
 =

 include(ECMMarkAsTest)
 =

@@ -85,6 +86,31 @@ KTEXTEDITOR_ENCODING_TEST ("utf-8" "koi8-r.txt")
 # one character latin-15 test, segfaulted
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "one-char-latin-15.txt")
 =

+# test executable for indentation
+add_executable(kateindenttest src/indenttest.cpp src/script_test_base.cpp =
src/testutils.cpp)
+target_link_libraries(kateindenttest ${KTEXTEDITOR_TEST_LINK_LIBS}
+    Qt5::Test)
+ecm_mark_as_test(kateindenttest)
+
+# test macro for indentation tests
+MACRO(KTEXTEDITOR_INDENT_TEST _testname)
+  ADD_TEST (NAME kateindenttest_${_testname} COMMAND kateindenttest ${_tes=
tname})
+ENDMACRO(KTEXTEDITOR_INDENT_TEST)
+
+# test different indenters sepearately to have smaller test chunks, that t=
akes LONG
+KTEXTEDITOR_INDENT_TEST ("testPython")
+KTEXTEDITOR_INDENT_TEST ("testCstyle")
+KTEXTEDITOR_INDENT_TEST ("testCppstyle")
+KTEXTEDITOR_INDENT_TEST ("testCMake")
+KTEXTEDITOR_INDENT_TEST ("testRuby")
+KTEXTEDITOR_INDENT_TEST ("testHaskell")
+KTEXTEDITOR_INDENT_TEST ("testLatex")
+KTEXTEDITOR_INDENT_TEST ("testPascal")
+KTEXTEDITOR_INDENT_TEST ("testAda")
+KTEXTEDITOR_INDENT_TEST ("testXml")
+KTEXTEDITOR_INDENT_TEST ("testNormal")
+KTEXTEDITOR_INDENT_TEST ("testReplicode")
+
 macro(ktexteditor_unit_test testname)
   ecm_add_test(src/${testname}.cpp ${ARGN}
                TEST_NAME ${testname}
@@ -117,7 +143,6 @@ ecm_add_tests(
 )
 =

 ktexteditor_unit_test(completion_test src/codecompletiontestmodel.cpp src/=
codecompletiontestmodels.cpp)
-ktexteditor_unit_test(indenttest src/script_test_base.cpp src/testutils.cp=
p)
 ktexteditor_unit_test(commands_test src/script_test_base.cpp src/testutils=
.cpp)
 ktexteditor_unit_test(scripting_test src/script_test_base.cpp src/testutil=
s.cpp)
 ktexteditor_unit_test(bug313759 src/testutils.cpp)
diff --git a/autotests/src/indenttest.cpp b/autotests/src/indenttest.cpp
index 1a357f6..b0e3630 100644
--- a/autotests/src/indenttest.cpp
+++ b/autotests/src/indenttest.cpp
@@ -108,12 +108,12 @@ void IndentTest::testHaskell()
     runTest(ExpectedFailures());
 }
 =

-void IndentTest::latex_data()
+void IndentTest::testLatex_data()
 {
     getTestData("latex");
 }
 =

-void IndentTest::latex()
+void IndentTest::testLatex()
 {
     runTest(ExpectedFailures());
 }
diff --git a/autotests/src/indenttest.h b/autotests/src/indenttest.h
index ad33cf3..4582e52 100644
--- a/autotests/src/indenttest.h
+++ b/autotests/src/indenttest.h
@@ -46,8 +46,8 @@ private Q_SLOTS:
     void testHaskell_data();
     void testHaskell();
 =

-    void latex_data();
-    void latex();
+    void testLatex_data();
+    void testLatex();
 =

     void testPascal_data();
     void testPascal();
[prev in list] [next in list] [prev in thread] [next in thread]