@@ -4,6 +4,7 @@ use crate::config::Config;
44use crate :: constants:: DC_CHAT_ID_TRASH ;
55use crate :: message:: MessageState ;
66use crate :: receive_imf:: receive_imf;
7+ use crate :: test_utils;
78use crate :: test_utils:: { TestContext , TestContextManager } ;
89
910struct CallSetup {
@@ -634,20 +635,23 @@ async fn test_forward_call() -> Result<()> {
634635async fn test_end_text_call ( ) -> Result < ( ) > {
635636 let mut tcm = TestContextManager :: new ( ) ;
636637 let alice = & tcm. alice ( ) . await ;
638+ let bob = & tcm. bob ( ) . await ;
637639
638- let received1 = receive_imf (
639- alice ,
640- b"From: bob@example.net \n \
641- To: alice @example.org \n \
642- Message-ID: <first @example.net> \n \
643- Date: Sun, 22 Mar 2020 22:37:57 +0000 \n \
644- Chat-Version: 1.0 \n \
645- \n \
646- Hello \n " ,
647- false ,
640+ let encrypted_message = test_utils :: encrypt_raw_message (
641+ bob ,
642+ & [ alice ] ,
643+ b"From: bob @example.net \r \n \
644+ To: alice @example.org \r \n \
645+ Message-ID: <first@example.net> \r \n \
646+ Date: Sun, 22 Mar 2020 22:37:57 +0000 \r \n \
647+ Chat-Version: 1.0 \r \n \
648+ \r \n \
649+ Hello \r \n " ,
648650 )
649- . await ?
650- . unwrap ( ) ;
651+ . await ?;
652+ let received1 = receive_imf ( alice, encrypted_message. as_bytes ( ) , false )
653+ . await ?
654+ . unwrap ( ) ;
651655 assert_eq ! ( received1. msg_ids. len( ) , 1 ) ;
652656 let msg = Message :: load_from_db ( alice, received1. msg_ids [ 0 ] )
653657 . await
@@ -656,21 +660,23 @@ async fn test_end_text_call() -> Result<()> {
656660
657661 // Receiving "Call ended" message that refers
658662 // to the text message does not result in an error.
659- let received2 = receive_imf (
660- alice ,
661- b"From: bob@example.net \n \
662- To: alice @example.org \n \
663- Message-ID: <second @example.net> \n \
664- Date: Sun, 22 Mar 2020 23:37:57 +0000 \n \
665- In-Reply-To: <first@example.net> \n \
666- Chat-Version: 1.0 \n \
667- Chat-Content: call-ended \n \
668- \n \
669- Call ended \n " ,
670- false ,
663+ let encrypted_message2 = test_utils :: encrypt_raw_message (
664+ bob ,
665+ & [ alice ] ,
666+ b"From: bob @example.net \r \n \
667+ To: alice @example.org \r \n \
668+ Message-ID: <second@example.net> \r \n \
669+ Date: Sun, 22 Mar 2020 23:37:57 +0000 \r \n \
670+ In-Reply-To: <first@example.net> \r \n \
671+ Chat-Version: 1.0 \r \n \
672+ Chat-Content: call-ended \r \n \
673+ \r \n \
674+ Call ended \r \n " ,
671675 )
672- . await ?
673- . unwrap ( ) ;
676+ . await ?;
677+ let received2 = receive_imf ( alice, encrypted_message2. as_bytes ( ) , false )
678+ . await ?
679+ . unwrap ( ) ;
674680 assert_eq ! ( received2. msg_ids. len( ) , 1 ) ;
675681 assert_eq ! ( received2. chat_id, DC_CHAT_ID_TRASH ) ;
676682
0 commit comments