From 88106d6d8a46bde5b7915abab6a6a7a0818aad93 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 1 Mar 2017 03:35:55 +0100 Subject: [PATCH] Unit tests formatting --- tests/blackmisc/testgeo.h | 7 ++----- tests/blackmisc/testinput.cpp | 13 ++----------- tests/blackmisc/testinput.h | 11 +++-------- tests/blackmisc/testvariantandmap.cpp | 7 ------- tests/blackmisc/testvariantandmap.h | 9 +++------ 5 files changed, 10 insertions(+), 37 deletions(-) diff --git a/tests/blackmisc/testgeo.h b/tests/blackmisc/testgeo.h index 0b36e363d..f58d92c07 100644 --- a/tests/blackmisc/testgeo.h +++ b/tests/blackmisc/testgeo.h @@ -11,11 +11,8 @@ #define BLACKMISCTEST_TESTGEO_H //! \cond PRIVATE_TESTS - -/*! - * \file - * \ingroup testblackmisc - */ +//! \file +//! \ingroup testblackmisc #include diff --git a/tests/blackmisc/testinput.cpp b/tests/blackmisc/testinput.cpp index db1e777ea..fa0ceb73a 100644 --- a/tests/blackmisc/testinput.cpp +++ b/tests/blackmisc/testinput.cpp @@ -8,11 +8,8 @@ */ //! \cond PRIVATE_TESTS - -/*! - * \file - * \ingroup testblackmisc - */ +//! \file +//! \ingroup testblackmisc #include "testinput.h" #include "blackmisc/compare.h" @@ -32,10 +29,6 @@ using namespace BlackMisc::Input; namespace BlackMiscTest { - - /* - * Constructor - */ CTestInput::CTestInput(QObject *parent): QObject(parent) { // void @@ -58,7 +51,6 @@ namespace BlackMiscTest CKeyboardKey key3(Key_AltRight); QVERIFY2(key3.isModifier(), "RightAlt is a modifier"); - } void CTestInput::hotkeyCombination() @@ -186,7 +178,6 @@ namespace BlackMiscTest QVERIFY2(!list1.findSubsetsOf(actionHotkey2).isEmpty(), "CTRL+F is a subset of CTRL"); QVERIFY2(list1.findSubsetsOf(actionHotkey3).isEmpty(), "Shift+F is not a subset of CTRL"); } - } // namespace //! \endcond diff --git a/tests/blackmisc/testinput.h b/tests/blackmisc/testinput.h index de27f012d..6522cff68 100644 --- a/tests/blackmisc/testinput.h +++ b/tests/blackmisc/testinput.h @@ -11,11 +11,8 @@ #define BLACKMISCTEST_TESTINPUT_H //! \cond PRIVATE_TESTS - -/*! - * \file - * \ingroup testblackmisc - */ +//! \file +//! \ingroup testblackmisc #include @@ -25,14 +22,12 @@ namespace BlackMiscTest class CTestInput : public QObject { Q_OBJECT + public: //! Standard test case constructor explicit CTestInput(QObject *parent = nullptr); - signals: - private slots: - //! CKeyboardKey basic tests void keyboardKey(); diff --git a/tests/blackmisc/testvariantandmap.cpp b/tests/blackmisc/testvariantandmap.cpp index d4971cd2d..40d64932b 100644 --- a/tests/blackmisc/testvariantandmap.cpp +++ b/tests/blackmisc/testvariantandmap.cpp @@ -38,9 +38,6 @@ using namespace BlackMisc::Network; namespace BlackMiscTest { - /* - * Variant tests - */ void CTestVariantAndMap::variant() { // ATC station @@ -89,9 +86,6 @@ namespace BlackMiscTest QVERIFY2(compare(station1, station3) != 0, "Station should not be equal"); } - /* - * Variant map tests - */ void CTestVariantAndMap::valueMap() { // ATC station @@ -128,7 +122,6 @@ namespace BlackMiscTest vmCopy.setWildcard(!vm.isWildcard()); QVERIFY2(qHash(vm) != qHash(vmCopy), "Hashs should not be equal (detailed)"); } - } // namespace //! \endcond diff --git a/tests/blackmisc/testvariantandmap.h b/tests/blackmisc/testvariantandmap.h index 2f4a35dc8..f3d7b8c39 100644 --- a/tests/blackmisc/testvariantandmap.h +++ b/tests/blackmisc/testvariantandmap.h @@ -11,11 +11,8 @@ #define BLACKMISCTEST_TESTVARIANTANDMAP_H //! \cond PRIVATE_TESTS - -/*! - * \file - * \ingroup testblackmisc - */ +//! \file +//! \ingroup testblackmisc #include @@ -33,10 +30,10 @@ namespace BlackMiscTest private slots: //! Basic unit tests for value objects and variants void variant(); + //! Unit tests for value maps and value objects void valueMap(); }; - } // namespace //! \endcond