mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace cleanup tests

Browse source 
Again, entirely script based.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-07-25 12:39:04 -07:00 • committed by Lubomir I. Ivanov
parent 128fc5f4b8
commit afe7e847d6
27 changed files with 321 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/testdivesiteduplication.h
View file

@ -4,8 +4,7 @@
#include <QTest> #include <QTest>
class TestDiveSiteDuplication : public QObject class TestDiveSiteDuplication : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:
void testReadV2(); void testReadV2();

3
tests/testgitstorage.h
View file

@ -4,8 +4,7 @@
#include <QTest> #include <QTest>
class TestGitStorage : public QObject class TestGitStorage : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:
void initTestCase(); void initTestCase();

2
tests/testmerge.cpp
View file

@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testmerge.h" #include "testmerge.h"
#include "core/dive.h" #include "core/dive.h"
#include "core/file.h"
#include "core/divelist.h" #include "core/divelist.h"
#include "core/file.h"
#include <QTextStream> #include <QTextStream>
void TestMerge::initTestCase() void TestMerge::initTestCase()

22
tests/testparse.cpp
View file

@ -1,12 +1,12 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testparse.h" #include "testparse.h"
#include "core/dive.h" #include "core/dive.h"
#include "core/subsurface-string.h"
#include "core/parse.h"
#include "core/file.h"
#include "core/divelist.h" #include "core/divelist.h"
#include <QTextStream> #include "core/file.h"
#include "core/parse.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/subsurface-string.h"
#include <QTextStream>
/* We have to use a macro since QCOMPARE /* We have to use a macro since QCOMPARE
* can only be called from a test method * can only be called from a test method
@ -24,7 +24,7 @@
while (readin.size() && written.size()) { \ while (readin.size() && written.size()) { \
QCOMPARE(written.takeFirst().trimmed(), \ QCOMPARE(written.takeFirst().trimmed(), \
readin.takeFirst().trimmed()); \ readin.takeFirst().trimmed()); \
} \ }
void TestParse::initTestCase() void TestParse::initTestCase()
{ {
@ -215,7 +215,8 @@ void TestParse::testParseHUDC()
params[pnr++] = NULL; params[pnr++] = NULL;
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearHUDC.csv", QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearHUDC.csv",
params, pnr - 1, "csv"), 0); params, pnr - 1, "csv"),
0);
QCOMPARE(dive_table.nr, 1); QCOMPARE(dive_table.nr, 1);
@ -256,7 +257,11 @@ void TestParse::testParseNewFormat()
for (int i = 0; i < files.size(); ++i) { for (int i = 0; i < files.size(); ++i) {
QCOMPARE(parse_seabear_log(QString::fromLatin1(SUBSURFACE_TEST_DATA QCOMPARE(parse_seabear_log(QString::fromLatin1(SUBSURFACE_TEST_DATA
"/dives/").append(files.at(i)).toLatin1().data()), 0); "/dives/")
.append(files.at(i))
.toLatin1()
.data()),
0);
QCOMPARE(dive_table.nr, i + 1); QCOMPARE(dive_table.nr, i + 1);
} }
@ -504,7 +509,8 @@ void TestParse::parseDL7()
clear_dive_file_data(); clear_dive_file_data();
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/DL7.zxu", QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/DL7.zxu",
params, pnr - 1 , "DL7"), 0); params, pnr - 1, "DL7"),
0);
QCOMPARE(dive_table.nr, 3); QCOMPARE(dive_table.nr, 3);
QCOMPARE(save_dives("./testdl7out.ssrf"), 0); QCOMPARE(save_dives("./testdl7out.ssrf"), 0);

2
tests/testpicture.cpp
View file

@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testpicture.h" #include "testpicture.h"
#include "core/dive.h" #include "core/dive.h"
#include "core/file.h"
#include "core/divelist.h" #include "core/divelist.h"
#include "core/file.h"
#include <QString> #include <QString>
#include <core/qthelper.h> #include <core/qthelper.h>

45
tests/testplan.cpp
View file

@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "core/dive.h"
#include "testplan.h" #include "testplan.h"
#include "core/dive.h"
#include "core/planner.h" #include "core/planner.h"
#include "core/units.h"
#include "core/subsurfacestartup.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/subsurfacestartup.h"
#include "core/units.h"
#include <QDebug> #include <QDebug>
#define DEBUG 1 #define DEBUG 1
@ -373,7 +373,8 @@ void TestPlan::testMetric()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 148l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 148l);
// check first gas change to EAN36 at 33m // check first gas change to EAN36 at 33m
struct event *ev = displayed_dive.dc.events; struct event *ev = displayed_dive.dc.events;
@ -413,7 +414,8 @@ void TestPlan::testImperial()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 154l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 154l);
// check first gas change to EAN36 at 33m // check first gas change to EAN36 at 33m
struct event *ev = displayed_dive.dc.events; struct event *ev = displayed_dive.dc.events;
@ -453,7 +455,8 @@ void TestPlan::testVpmbMetric45m30minTx()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 108l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 108l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -483,7 +486,8 @@ void TestPlan::testVpmbMetric60m10minTx()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 162l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 162l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -513,7 +517,8 @@ void TestPlan::testVpmbMetric60m30minAir()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 180l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 180l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -543,7 +548,8 @@ void TestPlan::testVpmbMetric60m30minEan50()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 155l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 155l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -579,7 +585,8 @@ void TestPlan::testVpmbMetric60m30minTx()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 159l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 159l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -615,7 +622,8 @@ void TestPlan::testVpmbMetric100m60min()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 157l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 157l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -657,7 +665,8 @@ void TestPlan::testVpmbMetricMultiLevelAir()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 101l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 101l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -687,7 +696,8 @@ void TestPlan::testVpmbMetric100m10min()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 175l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 175l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -733,7 +743,8 @@ void TestPlan::testVpmbMetricRepeat()
// check minimum gas result // check minimum gas result
struct divedatapoint *dp = testPlan.dp; struct divedatapoint *dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 61l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 61l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -753,7 +764,8 @@ void TestPlan::testVpmbMetricRepeat()
// check minimum gas result // check minimum gas result
dp = testPlan.dp; dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 80l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 80l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));
@ -789,7 +801,8 @@ void TestPlan::testVpmbMetricRepeat()
// check minimum gas result // check minimum gas result
dp = testPlan.dp; dp = testPlan.dp;
while(!dp->minimum_gas.mbar && dp->next) dp = dp->next; while (!dp->minimum_gas.mbar && dp->next)
dp = dp->next;
QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 61l); QCOMPARE(lrint(dp->minimum_gas.mbar / 1000.0), 61l);
// print first ceiling // print first ceiling
printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001)); printf("First ceiling %.1f m\n", (mbar_to_depth(test_deco_state.first_ceiling_pressure.mbar, &displayed_dive) * 0.001));

2
tests/testpreferences.cpp
View file

@ -3,8 +3,8 @@
#include "core/subsurface-qt/SettingsObjectWrapper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h"
#include <QtTest>
#include <QDate> #include <QDate>
#include <QtTest>
#define TEST(METHOD, VALUE) \ #define TEST(METHOD, VALUE) \
QCOMPARE(METHOD, VALUE); \ QCOMPARE(METHOD, VALUE); \

3
tests/testpreferences.h
View file

@ -5,8 +5,7 @@
#include <QTest> #include <QTest>
#include <functional> #include <functional>
class TestPreferences : public QObject class TestPreferences : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:
void initTestCase(); void initTestCase();

2
tests/testqPrefAnimations.cpp
View file

@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testqPrefAnimations.h" #include "testqPrefAnimations.h"
#include "core/settings/qPref.h"
#include "core/pref.h" #include "core/pref.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPref.h"
#include <QDate> #include <QDate>
#include <QTest> #include <QTest>

3
tests/testqPrefAnimations.h
View file

@ -4,8 +4,7 @@
#include <QObject> #include <QObject>
class TestQPrefAnimations : public QObject class TestQPrefAnimations : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:
void initTestCase(); void initTestCase();

3
tests/testqPrefCloudStorage.cpp
View file

@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testqPrefCloudStorage.h" #include "testqPrefCloudStorage.h"
#include "core/settings/qPref.h"
#include "core/pref.h" #include "core/pref.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPref.h"
#include <QTest> #include <QTest>
@ -48,7 +48,6 @@ void TestQPrefCloudStorage::test_struct_get()
QCOMPARE(tst->save_password_local(), prefs.save_password_local); QCOMPARE(tst->save_password_local(), prefs.save_password_local);
QCOMPARE(tst->save_userid_local(), prefs.save_userid_local); QCOMPARE(tst->save_userid_local(), prefs.save_userid_local);
QCOMPARE(tst->userid(), QString(prefs.userid)); QCOMPARE(tst->userid(), QString(prefs.userid));
} }
void TestQPrefCloudStorage::test_set_struct() void TestQPrefCloudStorage::test_set_struct()

3
tests/testqPrefCloudStorage.h
View file

@ -4,8 +4,7 @@
#include <QObject> #include <QObject>
class TestQPrefCloudStorage : public QObject class TestQPrefCloudStorage : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:

2
tests/testqPrefDisplay.cpp
View file

@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testqPrefDisplay.h" #include "testqPrefDisplay.h"
#include "core/settings/qPref.h"
#include "core/pref.h" #include "core/pref.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPref.h"
#include <QDate> #include <QDate>
#include <QTest> #include <QTest>

3
tests/testqPrefDisplay.h
View file

@ -4,8 +4,7 @@
#include <QObject> #include <QObject>
class TestQPrefDisplay : public QObject class TestQPrefDisplay : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:
void initTestCase(); void initTestCase();

3
tests/testqPrefDiveComputer.cpp
View file

@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testqPrefDiveComputer.h" #include "testqPrefDiveComputer.h"
#include "core/settings/qPref.h"
#include "core/pref.h" #include "core/pref.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPref.h"
#include <QTest> #include <QTest>
@ -152,4 +152,3 @@ void TestQPrefDiveComputer::test_oldPreferences()
} }
QTEST_MAIN(TestQPrefDiveComputer) QTEST_MAIN(TestQPrefDiveComputer)

3
tests/testqPrefDiveComputer.h
View file

@ -4,8 +4,7 @@
#include <QObject> #include <QObject>
class TestQPrefDiveComputer : public QObject class TestQPrefDiveComputer : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:

7
tests/testqml.cpp
View file

@ -1,13 +1,12 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <QApplication>
#include <QQmlContext>
#include <QQmlEngine> #include <QQmlEngine>
#include <QtQuickTest> #include <QtQuickTest>
#include <QtTest> #include <QtTest>
#include <QQmlEngine>
#include <QQmlContext>
#include <QApplication>
#include "core/settings/qPref.h"
#include "core/qt-gui.h" #include "core/qt-gui.h"
#include "core/settings/qPref.h"
// this is the content of QUICK_TEST_MAIN amended with // this is the content of QUICK_TEST_MAIN amended with
// registration of ssrf classes // registration of ssrf classes

2
tests/testrenumber.cpp
View file

@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "testrenumber.h" #include "testrenumber.h"
#include "core/dive.h" #include "core/dive.h"
#include "core/file.h"
#include "core/divelist.h" #include "core/divelist.h"
#include "core/file.h"
#include <QTextStream> #include <QTextStream>
void TestRenumber::setup() void TestRenumber::setup()

3
tests/testrenumber.h
View file

@ -4,8 +4,7 @@
#include <QtTest> #include <QtTest>
class TestRenumber : public QObject class TestRenumber : public QObject {
{
Q_OBJECT Q_OBJECT
private slots: private slots:
void setup(); void setup();