chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add record/replay test of downloading all sessions from oximeter.

Browse Source 
Also fix a crash when the recording is truncated.
This commit is contained in:
sawinglogz 2020-06-19 15:56:47 -04:00
parent e6258d321e
commit a651e1405d
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar/SleepLib/deviceconnection.cpp
View File

@ -114,6 +114,11 @@ public:
QByteArray getData() const QByteArray getData() const
{ {
Q_ASSERT(usesData() == true); Q_ASSERT(usesData() == true);
if (m_data.isEmpty()) {
qWarning().noquote() << "replaying event with missing data" << *this;
QByteArray empty;
return empty; // toUtf8() below crashes with an empty string.
}
return QByteArray::fromHex(m_data.toUtf8()); return QByteArray::fromHex(m_data.toUtf8());
} }
inline bool ok() const { return m_values.contains("error") == false; } inline bool ok() const { return m_values.contains("error") == false; }
@ -320,17 +325,6 @@ void XmlReplay::processPendingSignals(const QObject* target)
// and cannot alter the underlying target until the const method holding // and cannot alter the underlying target until the const method holding
// the lock releases it at function exit. // the lock releases it at function exit.
pending->signal(const_cast<QObject*>(target)); pending->signal(const_cast<QObject*>(target));
/*
XmlReplayEvent* next = m_pendingSignal->m_next;
if (next && next->isSignal() == false) {
next = nullptr;
}
if (next) {
qDebug() << "UNTESTED: multiple signal events in a row:" << m_pendingSignal->tag() << next->tag();
}
m_pendingSignal = next;
*/
} }
} }

49
oscar/tests/deviceconnectiontests.cpp
View File

@ -93,6 +93,36 @@ void DeviceConnectionTests::testSerialPortScanning()
} }
static void testDownload(const QString & loaderName)
{
SerialOximeter * oxi = qobject_cast<SerialOximeter*>(lookupLoader(loaderName));
Q_ASSERT(oxi);
if (oxi->openDevice()) {
oxi->resetDevice();
int session_count = oxi->getSessionCount();
qDebug() << session_count << "sessions";
for (int i = 0; i < session_count; i++) {
qDebug() << i+1 << oxi->getDateTime(i) << oxi->getDuration(i);
oxi->Open("import");
if (oxi->commandDriven()) {
oxi->getSessionData(i);
while (!oxi->isImporting() && !oxi->isAborted()) {
//QThread::msleep(10);
QCoreApplication::processEvents();
}
while (oxi->isImporting() && !oxi->isAborted()) {
//QThread::msleep(10);
QCoreApplication::processEvents();
}
}
oxi->openDevice(); // annoyingly import currently closes the device, so reopen it
}
}
oxi->closeDevice();
oxi->trashRecords();
}
void DeviceConnectionTests::testOximeterConnection() void DeviceConnectionTests::testOximeterConnection()
{ {
CMS50F37Loader::Register(); CMS50F37Loader::Register();
@ -131,22 +161,13 @@ void DeviceConnectionTests::testOximeterConnection()
qDebug().noquote() << string; qDebug().noquote() << string;
*/ */
SerialOximeter * oxi = qobject_cast<SerialOximeter*>(lookupLoader(cms50f37_class_name));
Q_ASSERT(oxi);
QFile file("cms50f37.xml"); QFile file("cms50f37.xml");
if (!file.exists()) { if (!file.exists()) {
qDebug() << "Recording oximeter connection"; qDebug() << "Recording oximeter connection";
Q_ASSERT(file.open(QFile::ReadWrite)); Q_ASSERT(file.open(QFile::ReadWrite));
devices.record(&file); devices.record(&file);
if (oxi->openDevice()) { testDownload(cms50f37_class_name);
oxi->resetDevice();
int session_count = oxi->getSessionCount();
qDebug() << session_count;
}
oxi->closeDevice();
oxi->trashRecords();
devices.record(nullptr); devices.record(nullptr);
file.close(); file.close();
} }
@ -154,13 +175,7 @@ void DeviceConnectionTests::testOximeterConnection()
qDebug() << "Replaying oximeter connection"; qDebug() << "Replaying oximeter connection";
Q_ASSERT(file.open(QFile::ReadOnly)); Q_ASSERT(file.open(QFile::ReadOnly));
devices.replay(&file); devices.replay(&file);
if (oxi->openDevice()) { testDownload(cms50f37_class_name);
oxi->resetDevice();
int session_count = oxi->getSessionCount();
qDebug() << session_count;
}
oxi->closeDevice();
oxi->trashRecords();
devices.replay(nullptr); devices.replay(nullptr);
file.close(); file.close();
} }