From ddde7cce4a26747703811e9d1e19d5544071e639 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 4 Dec 2014 15:48:08 -0800
Subject: [PATCH] Must new MockUAS otherwise qt resource system is not ready

---
 src/qgcunittest/QGCUASFileManagerTest.cc | 14 +++++++++++---
 src/qgcunittest/QGCUASFileManagerTest.h  |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/qgcunittest/QGCUASFileManagerTest.cc b/src/qgcunittest/QGCUASFileManagerTest.cc
index 0d55b3c1a..84134650a 100644
--- a/src/qgcunittest/QGCUASFileManagerTest.cc
+++ b/src/qgcunittest/QGCUASFileManagerTest.cc
@@ -42,8 +42,16 @@ QGCUASFileManagerUnitTest::QGCUASFileManagerUnitTest(void) :
 // Called once before all test cases are run
 void QGCUASFileManagerUnitTest::initTestCase(void)
 {
-    _mockUAS.setMockSystemId(_systemIdServer);
-    _mockUAS.setMockMavlinkPlugin(&_mockFileServer);
+    _mockUAS = new MockUAS();
+    Q_CHECK_PTR(_mockUAS);
+    
+    _mockUAS->setMockSystemId(_systemIdServer);
+    _mockUAS->setMockMavlinkPlugin(&_mockFileServer);
+}
+
+void QGCUASFileManagerUnitTest::cleanupTestCase(void)
+{
+    delete _mockUAS;
 }
 
 // Called before every test case
@@ -53,7 +61,7 @@ void QGCUASFileManagerUnitTest::init(void)
     
     Q_ASSERT(_multiSpy == NULL);
     
-    _fileManager = new QGCUASFileManager(NULL, &_mockUAS, _systemIdQGC);
+    _fileManager = new QGCUASFileManager(NULL, _mockUAS, _systemIdQGC);
     Q_CHECK_PTR(_fileManager);
     
     // Reset any internal state back to normal
diff --git a/src/qgcunittest/QGCUASFileManagerTest.h b/src/qgcunittest/QGCUASFileManagerTest.h
index cf29decd4..13b3a0d93 100644
--- a/src/qgcunittest/QGCUASFileManagerTest.h
+++ b/src/qgcunittest/QGCUASFileManagerTest.h
@@ -48,6 +48,7 @@ public:
 private slots:
     // Test case initialization
     void initTestCase(void);
+    void cleanupTestCase(void);
     void init(void);
     void cleanup(void);
     
@@ -84,7 +85,7 @@ private:
     static const uint8_t    _systemIdQGC = 255;
     static const uint8_t    _systemIdServer = 128;
 
-    MockUAS                 _mockUAS;
+    MockUAS*                _mockUAS;
     MockMavlinkFileServer   _mockFileServer;
     
     QGCUASFileManager*  _fileManager;
-- 
2.22.0