Merge pull request #144 from smartdevicelink/feature/rc1-unit-tests

Include FileManager tests

Author: renonick87

lib/js/src/manager/file/FileManager.js

@@ -56,7 +56,11 @@ class FileManager extends _FileManagerBase {
      */
     async _createPutFile (file) {
         const putFile = new PutFile();
-        putFile.setFileName(file.getName());
+        if (file.getName() === null || file.getName() === undefined) {
+            throw new Error('You must specify a file name in the SdlFile');
+        } else {
+            putFile.setFileName(file.getName());
+        }
         if (typeof file.getFilePath() === 'string') {
             const data = await _FileUtils.getFileData(file.getFilePath());
 

package-lock.json

@@ -41,6 +41,7 @@
     "babel-plugin-transform-async-to-promises": "^0.8.15",
     "bson": "^4.0.2",
     "chai": "^4.2.0",
+    "chai-as-promised": "^7.1.1",
     "eslint": "^6.8.0",
     "eslint-plugin-jsdoc": "^22.1.0",
     "esm": "^3.2.25",

package.json

@@ -35,13 +35,6 @@ const CONFIG = require('./config.js');
 
 class AppClient {
     constructor (wsClient, ready) {
-        const fileName = `${CONFIG.appId}_icon.gif`;
-        const file = new SDL.manager.file.filetypes.SdlFile()
-            .setName(fileName)
-            .setFilePath('./test_icon_1.png')
-            .setType(SDL.rpc.enums.FileType.GRAPHIC_PNG)
-            .setPersistent(true);
-
         this._lifecycleConfig = new SDL.manager.LifecycleConfig()
             .setAppId(CONFIG.appId)
             .setAppName(CONFIG.appName)
@@ -54,8 +47,7 @@ class AppClient {
                     wsClient,
                     CONFIG.connectionLostTimeout
                 )
-            )
-            .setAppIcon(file);
+            );
 
         this._appConfig = new SDL.manager.AppConfig()
             .setLifecycleConfig(this._lifecycleConfig);
@@ -75,19 +67,30 @@ class AppClient {
             .addRpcListener(SDL.rpc.enums.FunctionID.OnHMIStatus, this._onHmiStatusListener.bind(this));
 
         this._ready = ready;
+        // for a cloud server app the hmi full will be received before the managers report that they're ready!
+        this._managersReady = false;
+        this._hmiFull = false;
     }
 
     async _onConnected () {
-        
+        this._managersReady = true;
+        this._checkReadyState();
     }
 
     async _onHmiStatusListener (onHmiStatus) {
         const hmiLevel = onHmiStatus.getHmiLevel();
 
         // wait for the FULL state for more functionality
         if (hmiLevel === SDL.rpc.enums.HMILevel.HMI_FULL) {
+            this._hmiFull = true;
+            this._checkReadyState();
+        }
+    }
+
+    async _checkReadyState () {
+        if (this._managersReady && this._hmiFull) {
             if (typeof this._ready === 'function') {
-                this._ready(async () => {
+                await this._ready(async () => {
                     // tests complete. tear down the app
                     await this._sdlManager.sendRpc(new SDL.rpc.messages.UnregisterAppInterface());
                     this._sdlManager.dispose();
@@ -103,4 +106,4 @@ class AppClient {
     }
 }
 
-module.exports = AppClient;
+module.exports = AppClient;