Testing load messages

Arquisoft · Apr 2, 2019 · e7c0cdd · e7c0cdd
1 parent 7507c02
commit e7c0cdd
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 23 deletions.
diff --git a/lib/commprivate.js b/lib/commprivate.js
@@ -8,7 +8,6 @@ const Message = require('../src/message.js')
 
 
 class PrivateCommunication {
-
   constructor(fetch) {
     this.dataSync = new DataSync(fetch);
     this.fetch = fetch;
@@ -17,7 +16,7 @@ class PrivateCommunication {
   /**
   * Loads messages into the inbox
   */
-  async loadMessages(myUsername, a){
+  async loadMessages(myUsername, a,testing){
 
 	  var messages = new Array(); 	//here will be stored all messages loaded
 
@@ -55,7 +54,7 @@ class PrivateCommunication {
 	     messages.push(new Message(sender,dateTime,message));
      }
      myMsgRead = true;
-    }, err => $("#addOurMessages").empty() );
+    }, err => {if(!testing){$("#addOurMessages").empty()}});
 
     fc.readFile(fileWithMessagesSentByTheOtherUSer).then(  body => {
      var res = body.split("\n\n\n");
@@ -82,26 +81,27 @@ class PrivateCommunication {
      if(!myMsgRead){
       var that = this;
       setTimeout(function(){
-        that.orderAndShow(messages, me);
+        that.orderAndShow(messages, me,testing);
       }, 1000);
      }else {
-       this.orderAndShow(messages, me);
+       this.orderAndShow(messages, me,testing);
      }
-    }, err => $("#addOtherMessages").empty() );
+    }, err => {if(!testing){$("#addOurMessages").empty()}}  );
   }
 
-  orderAndShow(messages, me){
+  orderAndShow(messages, me,testing){
     //Now order the messages
 		messages.sort(function(a,b){
       // Turn your strings into dates, and then subtract them
       // to get a value that is either negative, positive, or zero.
       return new Date(b.dateTime) - new Date(a.dateTime);
     });
-
-    console.log(messages);
-    $("#addMessages").empty();
-    $("#addOurMessages").empty();
-    $("#addOtherMessages").empty();
+    if(!testing){
+		console.log(messages);
+		$("#addMessages").empty();
+		$("#addOurMessages").empty();
+		$("#addOtherMessages").empty();
+	}
     for ( var i=messages.length-1; i>=0; i--){
       var mesg = messages[i].content;
       var mesgToAdd = "";
@@ -119,7 +119,9 @@ class PrivateCommunication {
                       '</div>'+
                     '</div>'+
                   '</div>';
-          $("#addMessages").append(toAppend);
+          if(!testing){
+			  $("#addMessages").append(toAppend);
+		  }
       }else{
         console.log(messages[i].content + " en " + messages[i].sender);
 
@@ -128,7 +130,9 @@ class PrivateCommunication {
                     mesgToAdd + '<span id="userName" class="badge badge-secondary">'+messages[i].sender+'</span>'+
                     '</div>'+
                   '</div>';
-        $("#addMessages").append(toAppend);
+        if(!testing){
+			  $("#addMessages").append(toAppend);
+		  }
       }
     }
   }

diff --git a/src/index.js b/src/index.js
@@ -131,8 +131,10 @@ $('#create-button').click(async () => {
 });
 
 $('#start-new-chat-btn').click(async () => {
-   await core.sendMessage(personal,$("#data-name").val());
-   ("#data-name").val("")
+	var message = $("#data-name").val();
+    var receiver = $("#possible-people option:selected").val();
+    $("#data-name").val("");
+	core.sendMessage(personal, receiver, message);
 });
 
 
@@ -145,7 +147,7 @@ $('#start-new-chat-btn').click(async () => {
 async function checkForNotifications() {
   var length = $('#mySelectList > option').length;
   if(length === 0){
-    await core.loadMessages(personal, $("#possible-people option:selected").val());
+    await core.loadMessages(personal, $("#possible-people option:selected").val(),false);
   }   
 }
 
@@ -167,7 +169,7 @@ $("#cancel-group-menu").click(() => {
   $('#create-new-group').addClass('hidden');
 });
 
-$("#possible-people-btn").click( async () => core.loadMessages(personal));
+$("#possible-people-btn").click( async () => core.loadMessages(personal,$("#possible-people option:selected").val(),false));
 
  /////////////////////////////////////////////////////////////////////////////////////////
   ///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/test/core.test.js b/test/core.test.js
@@ -54,14 +54,14 @@ describe('Core testing', function () {
 
 
   it("Obtain chat groups",async function(){
-	 var username = await personal.loadNames("https://mariodiaz98.solid.community/profile/card#me")
-	 console.log(username);
+	 personal.username="enriquead";
 	 var loaded = await personal.loadInbox();
 	 var chats = await chat.getChatGroups(personal);
 	 assert.isNotNull(chats);
 
   })
 
+
 
 
 

diff --git a/test/private.test.js b/test/private.test.js
@@ -30,6 +30,12 @@ describe('Private communication testing', function () {
       assert.equal(comunicacion,true);
   })  
 
+  it("Loads messages properly",async function(){
+      var result = await privateComm.loadMessages("enriquead","mariodiaz98",true);
+
+
+  }) 
+
 
 
 

diff --git a/test/public.test.js b/test/public.test.js
@@ -21,7 +21,7 @@ describe('Private communication testing', function () {
 	assert.equal(rdom.length,5);
 
   }) 
-  it("Create core file",async function(){
+  it("Create core file and send message",async function(){
       personal.username = "mariodiaz98";
       var rand = publicComm.randomString(6);
       var groupName = "Testing group"+publicComm.randomString(3);
@@ -36,8 +36,11 @@ describe('Private communication testing', function () {
                         webId: "https://enriquead.solid.community/profile/card#me"});
 
      publicComm.createCoreFile(personal,rand,groupName,friendList);
+     publicComm.sendFirstMessage(personal,friendList[0],rand,groupName);  
      var comunicacion = await publicComm.communicationEstablished(personal.username,friendList[0]);
-      assert.equal(comunicacion,true);
-
+     assert.equal(comunicacion,true);
+     
   })   
+
+
 })