diff --git a/file_templates/testing/cpp_qtestlib_kdevelop/class.h b/file_templates/testing/cpp_qtestlib_kdevelop/class.h --- a/file_templates/testing/cpp_qtestlib_kdevelop/class.h +++ b/file_templates/testing/cpp_qtestlib_kdevelop/class.h @@ -2,25 +2,27 @@ {% include "license_header_cpp.txt" %} -#ifndef {{ name|upper }}_H -#define {{ name|upper }}_H +#ifndef {% include "include_guard_cpp.txt" %} +#define {% include "include_guard_cpp.txt" %} #include class {{ name }} : public QObject { Q_OBJECT -private slots: + + +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); {% for case in testCases %} - void {{ case }}(); + void {% if test_prefixMethods %}test{{ case|upper_first }}{% else %}{{ case }}{% endif %}(); {% endfor %} }; -#endif // {{ name|upper }}_H +#endif // {% include "include_guard_cpp.txt" %} diff --git a/file_templates/testing/cpp_qtestlib_kdevelop/class.cpp b/file_templates/testing/cpp_qtestlib_kdevelop/class.cpp --- a/file_templates/testing/cpp_qtestlib_kdevelop/class.cpp +++ b/file_templates/testing/cpp_qtestlib_kdevelop/class.cpp @@ -9,16 +9,16 @@ #include -QTEST_GUILESS_MAIN({{ name }}); +QTEST_{% if test_nogui %}GUILESS_{% endif %}MAIN({{ name }}); using namespace KDevelop; void {{ name }}::initTestCase() { AutoTestShell::init(); - TestCore::initialize(Core::NoUi); + TestCore::initialize(Core::{% if test_nogui %}NoUi{% else %}Default{% endif %}); } @@ -28,9 +28,23 @@ } +{% if test_initAndCleanup %} +void {{name}}::init() +{ + // Called before each testfunction is executed +} + + +void {{name}}::cleanup() +{ + // Called after every testfunction +} + + +{% endif %} {% for case in testCases %} -void {{ name }}::{{ case }}() +void {{ name }}::{% if test_prefixMethods %}test{{ case|upper_first }}{% else %}{{ case }}{% endif %}() { diff --git a/file_templates/testing/cpp_qtestlib_kdevelop/cpp_qtestlib_kdevelop.desktop b/file_templates/testing/cpp_qtestlib_kdevelop/cpp_qtestlib_kdevelop.desktop --- a/file_templates/testing/cpp_qtestlib_kdevelop/cpp_qtestlib_kdevelop.desktop +++ b/file_templates/testing/cpp_qtestlib_kdevelop/cpp_qtestlib_kdevelop.desktop @@ -99,6 +99,7 @@ Language[zh_TW]=C++ Type=Test Files=Header,Implementation +OptionsFile=options.kcfg [Header] Name=Header diff --git a/file_templates/testing/cpp_qtestlib_kdevelop/options.kcfg b/file_templates/testing/cpp_qtestlib_kdevelop/options.kcfg new file mode 100644 --- /dev/null +++ b/file_templates/testing/cpp_qtestlib_kdevelop/options.kcfg @@ -0,0 +1,21 @@ + + + + + + + true + + + + false + + + + true + + +