Unit tests formatting

This commit is contained in:
Klaus Basan
2017-03-01 03:35:55 +01:00
committed by Mathew Sutcliffe
parent 6d39be2657
commit 88106d6d8a
5 changed files with 10 additions and 37 deletions

View File

@@ -11,11 +11,8 @@
#define BLACKMISCTEST_TESTGEO_H #define BLACKMISCTEST_TESTGEO_H
//! \cond PRIVATE_TESTS //! \cond PRIVATE_TESTS
//! \file
/*! //! \ingroup testblackmisc
* \file
* \ingroup testblackmisc
*/
#include <QObject> #include <QObject>

View File

@@ -8,11 +8,8 @@
*/ */
//! \cond PRIVATE_TESTS //! \cond PRIVATE_TESTS
//! \file
/*! //! \ingroup testblackmisc
* \file
* \ingroup testblackmisc
*/
#include "testinput.h" #include "testinput.h"
#include "blackmisc/compare.h" #include "blackmisc/compare.h"
@@ -32,10 +29,6 @@ using namespace BlackMisc::Input;
namespace BlackMiscTest namespace BlackMiscTest
{ {
/*
* Constructor
*/
CTestInput::CTestInput(QObject *parent): QObject(parent) CTestInput::CTestInput(QObject *parent): QObject(parent)
{ {
// void // void
@@ -58,7 +51,6 @@ namespace BlackMiscTest
CKeyboardKey key3(Key_AltRight); CKeyboardKey key3(Key_AltRight);
QVERIFY2(key3.isModifier(), "RightAlt is a modifier"); QVERIFY2(key3.isModifier(), "RightAlt is a modifier");
} }
void CTestInput::hotkeyCombination() void CTestInput::hotkeyCombination()
@@ -186,7 +178,6 @@ namespace BlackMiscTest
QVERIFY2(!list1.findSubsetsOf(actionHotkey2).isEmpty(), "CTRL+F is a subset of CTRL"); 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"); QVERIFY2(list1.findSubsetsOf(actionHotkey3).isEmpty(), "Shift+F is not a subset of CTRL");
} }
} // namespace } // namespace
//! \endcond //! \endcond

View File

@@ -11,11 +11,8 @@
#define BLACKMISCTEST_TESTINPUT_H #define BLACKMISCTEST_TESTINPUT_H
//! \cond PRIVATE_TESTS //! \cond PRIVATE_TESTS
//! \file
/*! //! \ingroup testblackmisc
* \file
* \ingroup testblackmisc
*/
#include <QObject> #include <QObject>
@@ -25,14 +22,12 @@ namespace BlackMiscTest
class CTestInput : public QObject class CTestInput : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
//! Standard test case constructor //! Standard test case constructor
explicit CTestInput(QObject *parent = nullptr); explicit CTestInput(QObject *parent = nullptr);
signals:
private slots: private slots:
//! CKeyboardKey basic tests //! CKeyboardKey basic tests
void keyboardKey(); void keyboardKey();

View File

@@ -38,9 +38,6 @@ using namespace BlackMisc::Network;
namespace BlackMiscTest namespace BlackMiscTest
{ {
/*
* Variant tests
*/
void CTestVariantAndMap::variant() void CTestVariantAndMap::variant()
{ {
// ATC station // ATC station
@@ -89,9 +86,6 @@ namespace BlackMiscTest
QVERIFY2(compare(station1, station3) != 0, "Station should not be equal"); QVERIFY2(compare(station1, station3) != 0, "Station should not be equal");
} }
/*
* Variant map tests
*/
void CTestVariantAndMap::valueMap() void CTestVariantAndMap::valueMap()
{ {
// ATC station // ATC station
@@ -128,7 +122,6 @@ namespace BlackMiscTest
vmCopy.setWildcard(!vm.isWildcard()); vmCopy.setWildcard(!vm.isWildcard());
QVERIFY2(qHash(vm) != qHash(vmCopy), "Hashs should not be equal (detailed)"); QVERIFY2(qHash(vm) != qHash(vmCopy), "Hashs should not be equal (detailed)");
} }
} // namespace } // namespace
//! \endcond //! \endcond

View File

@@ -11,11 +11,8 @@
#define BLACKMISCTEST_TESTVARIANTANDMAP_H #define BLACKMISCTEST_TESTVARIANTANDMAP_H
//! \cond PRIVATE_TESTS //! \cond PRIVATE_TESTS
//! \file
/*! //! \ingroup testblackmisc
* \file
* \ingroup testblackmisc
*/
#include <QObject> #include <QObject>
@@ -33,10 +30,10 @@ namespace BlackMiscTest
private slots: private slots:
//! Basic unit tests for value objects and variants //! Basic unit tests for value objects and variants
void variant(); void variant();
//! Unit tests for value maps and value objects //! Unit tests for value maps and value objects
void valueMap(); void valueMap();
}; };
} // namespace } // namespace
//! \endcond //! \endcond