From 7881d9d19f4540f4ff2c3cfe5687201d2cfc4251 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 26 Nov 2014 18:27:46 -0800 Subject: [PATCH] Move LinkManager testing to new LinkManagerTest --- src/qgcunittest/UASUnitTest.cc | 109 --------------------------------- src/qgcunittest/UASUnitTest.h | 2 - 2 files changed, 111 deletions(-) diff --git a/src/qgcunittest/UASUnitTest.cc b/src/qgcunittest/UASUnitTest.cc index 98d369212..f42f5c32f 100644 --- a/src/qgcunittest/UASUnitTest.cc +++ b/src/qgcunittest/UASUnitTest.cc @@ -298,112 +298,3 @@ void UASUnitTest::signalWayPoint_test() uas = NULL; delete wp2; } - -void UASUnitTest::signalUASLink_test() -{ - QSignalSpy spy(uas, SIGNAL(modeChanged(int,QString,QString))); - uas->setMode(2, 0); - QCOMPARE(spy.count(), 0);// not solve for UAS not receiving message from UAS - - QSignalSpy spyS(LinkManager::instance(), SIGNAL(newLink(LinkInterface*))); - SerialLink* link = new SerialLink(); - - LinkManager::instance()->add(link); - LinkManager::instance()->addProtocol(link, mav); - QCOMPARE(spyS.count(), 1); - - LinkManager::instance()->add(link); - LinkManager::instance()->addProtocol(link, mav); - QCOMPARE(spyS.count(), 1);// not add SerialLink, exist in list - - SerialLink* link2 = new SerialLink(); - LinkManager::instance()->add(link2); - LinkManager::instance()->addProtocol(link2, mav); - QCOMPARE(spyS.count(), 2);// add SerialLink, not exist in list - - QList links = LinkManager::instance()->getLinks(); - foreach(LinkInterface* link, links) - { - qDebug()<< link->getName(); - qDebug()<< QString::number(link->getId()); - QVERIFY(link != NULL); - uas->addLink(link); - } - - SerialLink* ff = static_cast(uas->getLinks()->at(0)); - - QCOMPARE(ff->isConnected(), false); - - QCOMPARE(ff->isRunning(), false); - - QCOMPARE(ff->isFinished(), false); - - QCOMPARE(links.count(), uas->getLinks()->count()); - QCOMPARE(uas->getLinks()->count(), 2); - - delete link2; - QCOMPARE(LinkManager::instance()->getLinks().count(), 1); - QCOMPARE(uas->getLinks()->count(), 1); - - QCOMPARE(static_cast(LinkManager::instance()->getLinks().at(0))->getId(), - static_cast(uas->getLinks()->at(0))->getId()); - - SerialLink* link3 = new SerialLink(); - LinkManager::instance()->add(link3); - LinkManager::instance()->addProtocol(link3, mav); - QCOMPARE(spyS.count(), 3); - QCOMPARE(LinkManager::instance()->getLinks().count(), 2); - - //all the links in LinkManager must be deleted because LinkManager::instance - //is static. - delete link3; - QCOMPARE(LinkManager::instance()->getLinks().count(), 1); - delete link; - - QCOMPARE(LinkManager::instance()->getLinks().count(), 0); -} - -void UASUnitTest::signalIdUASLink_test() -{ - - QCOMPARE(LinkManager::instance()->getLinks().count(), 0); - SerialLink* myLink = new SerialLink(); - myLink->setPortName("COM 17"); - LinkManager::instance()->add(myLink); - LinkManager::instance()->addProtocol(myLink, mav); - - SerialLink* myLink2 = new SerialLink(); - myLink2->setPortName("COM 18"); - LinkManager::instance()->add(myLink2); - LinkManager::instance()->addProtocol(myLink2, mav); - - SerialLink* myLink3 = new SerialLink(); - myLink3->setPortName("COM 19"); - LinkManager::instance()->add(myLink3); - LinkManager::instance()->addProtocol(myLink3, mav); - - SerialLink* myLink4 = new SerialLink(); - myLink4->setPortName("COM 20"); - LinkManager::instance()->add(myLink4); - LinkManager::instance()->addProtocol(myLink4, mav); - - QCOMPARE(LinkManager::instance()->getLinks().count(), 4); - - QList links = LinkManager::instance()->getLinks(); - - LinkInterface* a = static_cast(links.at(0)); - LinkInterface* b = static_cast(links.at(1)); - LinkInterface* c = static_cast(links.at(2)); - LinkInterface* d = static_cast(links.at(3)); - QCOMPARE(a->getName(), QString("COM 17")); - QCOMPARE(b->getName(), QString("COM 18")); - QCOMPARE(c->getName(), QString("COM 19")); - QCOMPARE(d->getName(), QString("COM 20")); - - delete myLink4; - delete myLink3; - delete myLink2; - delete myLink; - - QCOMPARE(LinkManager::instance()->getLinks().count(), 0); -} diff --git a/src/qgcunittest/UASUnitTest.h b/src/qgcunittest/UASUnitTest.h index 45b1828bd..ea2e1897c 100644 --- a/src/qgcunittest/UASUnitTest.h +++ b/src/qgcunittest/UASUnitTest.h @@ -54,8 +54,6 @@ private slots: void getWaypointList_test(); void signalWayPoint_test(); void getWaypoint_test(); - void signalUASLink_test(); - void signalIdUASLink_test(); }; DECLARE_TEST(UASUnitTest) -- 2.22.0