Doing more test

Arquisoft · Apr 30, 2019 · 1790fb7 · 1790fb7
1 parent 1854ed6
commit 1790fb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/scripts/chatManager.js b/src/scripts/chatManager.js
@@ -27,7 +27,7 @@ var MESSAGES = {
     toShow: []
 }
 
-async function setUpFolder() {
+async function setUpFolder(dontHave) {
     var ret = false;
 
     //Define folders name
@@ -38,21 +38,23 @@ async function setUpFolder() {
     //WritingMessage
     try {
         var err3 = await podUtils.readFile(filename);
-        if (!err3) {
+        if (!err3 || dontHave) {
             throw ("error");
+        } else {
+            ret = true;
         }
     } catch (error) {
         //IF folder doesnt exist: create new user folder
         try {
             var err2 = await podUtils.readFolder(folder, ToLog);
-            if (!err2) {
+            if (!err2 || dontHave) {
                 throw ("error");
             }
         } catch (error) {
             //Check Folder SolidChat
             try {
                 var err = await podUtils.readFolder(solidChat, ToLog);
-                if (!err) {
+                if (!err || dontHave) {
                     throw ("error");
                 }
             } catch (error) {
@@ -63,7 +65,7 @@ async function setUpFolder() {
             //New Folder:
             await podUtils.createFolder(folder, ToLog);
         }
-        await podUtils.writeMessage(folder + "cache.txt", "");
+        return await podUtils.writeMessage(folder + "cache.txt", "");
     }
     return ret;
 }

diff --git a/test/ChatTest.js b/test/ChatTest.js
@@ -133,9 +133,11 @@ describe('Test Chat Manager', function() {
 
     it('sendMessage', async function() {
         this.timeout(timeout);
+        assert.equal(await chatM.setUpFolder(true), true);
         assert.equal(await chatM.checkNewMessages(receiver.idp + "/", receiver.username), false);
         assert.equal(await chatM.sendMessage("newMessage"), true);
         assert.notEqual(await podUtils.readFile(sendFolder, true), null);
+        assert.equal(await chatM.setUpFolder(false), true);
     });
     it('receiveMessage', async function() {
         this.timeout(timeout);