hamradio/klog
1
0
Fork 0
mirror of https://github.com/ea4k/klog.git synced 2024-09-21 02:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test for subdivisions

Browse Source
This commit is contained in:
ea4k 2024-08-18 22:15:42 +02:00
parent c538549fb0
commit 5efb0239e1
5 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -202,3 +202,6 @@ tests/tst_mainwindowinputothers/moc_qso.cpp
tests/tst_mainwindowinputothers/moc_queryexecutor.cpp
tests/tst_mainwindowinputothers/moc_utilities.cpp
tests/tst_mainwindowinputothers/target_wrapper.sh
tests/tst_dataproxy/moc_predefs.h
tests/tst_mainwindowinputothers/tst_mainwindowinputothers
tests/tst_mainwindowinputothers/tst_mainwindowinputothers

4
src/dataproxy_sqlite.cpp
View File

@ -5620,7 +5620,7 @@ QList<PrimarySubdivision> DataProxy_SQLite::getPrimarySubDivisions(const int _en
if ((_pref.length()>0))
{
//qDebug() << Q_FUNC_INFO << " - Running for no pref, delivering ALL for the entity";
queryString = QString("SELECT name, shortname, cqz, ituz FROM primary_subdivisions WHERE prefix = :prefix");
queryString = QString("SELECT name, shortname, cqz, ituz FROM primary_subdivisions WHERE prefix = :prefix ORDER BY shortname");
query.prepare(queryString);
query.bindValue(":prefix", _pref);
}
@ -5633,7 +5633,7 @@ QList<PrimarySubdivision> DataProxy_SQLite::getPrimarySubDivisions(const int _en
//qDebug() << Q_FUNC_INFO << " - END: entity <= 0";
return list;
}
queryString = QString("SELECT name, shortname, cqz, ituz FROM primary_subdivisions WHERE dxcc = :dxcc");
queryString = QString("SELECT name, shortname, cqz, ituz FROM primary_subdivisions WHERE dxcc = :dxcc ORDER BY shortname");
query.prepare(queryString);
query.bindValue(":dxcc", _entity);
}

61
tests/tst_dataproxy/tst_dataproxy.cpp
View File

@ -54,6 +54,7 @@ private slots:
void test_modes();
void test_bands();
void test_continents();
void test_primarySubdivisions();
//void test_getProgresStepForDialog();
@ -191,6 +192,66 @@ void tst_DataProxy::test_continents()
QVERIFY2(dataProxy->getContinentShortNameFromEntity (13) == "AN", "Continent for Antartica (dxcc=13) failed");
}
void tst_DataProxy::test_primarySubdivisions()
{
//ps.name = (query.value(0)).toString();
//ps.shortName = (query.value(1)).toString();
//ps.cqz = (query.value(2)).toInt();
//ps.ituz = (query.value(3)).toInt();
QList<PrimarySubdivision> subdivisions;
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(281, "EA4"));
QVERIFY2(subdivisions.first().name == "Badajoz", "Primary Subdivision first name failed (EA4)");
QVERIFY2(subdivisions.first().shortName == "BA", "Primary Subdivision first shortname failed (EA4)");
QVERIFY2(subdivisions.first().cqz == 14, "Primary Subdivision first cqz failed (EA4)");
QVERIFY2(subdivisions.first().ituz == 37, "Primary Subdivision first ituz failed (EA4)");
QVERIFY2(subdivisions.last().name == "Toledo", "Primary Subdivision last name failed (EA4)");
QVERIFY2(subdivisions.last().shortName == "TO", "Primary Subdivision last shortname failed (EA4)");
QVERIFY2(subdivisions.last().cqz == 14, "Primary Subdivision last cqz failed (EA4)");
QVERIFY2(subdivisions.last().ituz == 37, "Primary Subdivision last ituz failed (EA4)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(281, QString()));
QVERIFY2(subdivisions.count() == 47, "Primary Subdivision number failed (281 - Spain)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(1, QString()));
QVERIFY2(subdivisions.count() == 20, "Primary Subdivision number failed (1 - Canada)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(50, QString()));
QVERIFY2(subdivisions.count() == 32, "Primary Subdivision number failed (50 - Mexico)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(100, QString()));
QVERIFY2(subdivisions.count() == 24, "Primary Subdivision number failed (100 - Argentina)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(108, QString()));
QVERIFY2(subdivisions.count() == 27, "Primary Subdivision number failed (108 - Brazil)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(272, QString()));
QVERIFY2(subdivisions.count() == 18, "Primary Subdivision number failed (272 - Portugal)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(291, QString()));
QVERIFY2(subdivisions.count() == 61, "Primary Subdivision number failed (291 - United States)");
subdivisions.clear();
subdivisions.append(dataProxy->getPrimarySubDivisions(339, QString()));
QVERIFY2(subdivisions.count() == 47, "Primary Subdivision number failed (339 - Japan)");
//PrimarySubdivision subdivision;
//foreach(subdivision, subdivisions)
//{
// qDebug() << Q_FUNC_INFO << ": " << subdivision.name;
//}
//getPrimarySubDivisions(currentInt, prefUsed)
}
QTEST_APPLESS_MAIN(tst_DataProxy)
#include "tst_dataproxy.moc"

BIN
tests/tst_mainwindowinputothers/tst_mainwindowinputothers
View File

Binary file not shown.

1
tests/tst_mainwindowinputothers/tst_mainwindowinputothers.cpp
View File

@ -179,7 +179,6 @@ void tst_MainWindowInputOthers::test_Subdivisions()
//QVERIFY2( util->isSameFreq (mainWindowInputQSO->getRXPwr(), 1.1), "Wrong RX Pwr");
}