Skip to content
Snippets Groups Projects
Commit 63db7c8c authored by shined day's avatar shined day
Browse files

Merge branch '35-communicating-agent-mail-should-have-a-sending-date' into 'master'

Mail now have sending date

Closes #35

See merge request be-pyamak/pyamak-noyau!18
parents 2e056f12 b5fbfa58
Branches
Tags
No related merge requests found
...@@ -17,10 +17,11 @@ class Mail: ...@@ -17,10 +17,11 @@ class Mail:
Class message Class message
""" """
def __init__(self, id_sender: int, id_receiver: int, message: Any) -> None: def __init__(self, id_sender: int, id_receiver: int, message: Any, sending_date: int) -> None:
self.__id_sender = id_sender self.__id_sender = id_sender
self.__id_receiver = id_receiver self.__id_receiver = id_receiver
self.__message = message self.__message = message
self.__sending_date = sending_date
def get_id_sender(self): def get_id_sender(self):
""" """
...@@ -40,6 +41,12 @@ class Mail: ...@@ -40,6 +41,12 @@ class Mail:
""" """
return self.__message return self.__message
def get_sending_date(self):
"""
return sending_date
"""
return self.__sending_date
class Mailbox: class Mailbox:
""" """
...@@ -72,7 +79,7 @@ class Mailbox: ...@@ -72,7 +79,7 @@ class Mailbox:
""" """
this method is called to send a message this method is called to send a message
""" """
mail = Mail(self.__owner_id, id_receiver, message) mail = Mail(self.__owner_id, id_receiver, message, self.__amas.get_cycle())
for agent in self.__amas.get_agents(): for agent in self.__amas.get_agents():
if agent.get_id() == id_receiver: if agent.get_id() == id_receiver:
......
...@@ -15,17 +15,18 @@ class TestMail(TestCase): ...@@ -15,17 +15,18 @@ class TestMail(TestCase):
""" """
Test mail init Test mail init
""" """
mail = Mail(1, 5, None) mail = Mail(1, 5, None, 0)
self.assertEqual(mail.get_id_sender(), 1) self.assertEqual(mail.get_id_sender(), 1)
self.assertEqual(mail.get_id_receiver(), 5) self.assertEqual(mail.get_id_receiver(), 5)
self.assertEqual(mail.get_message(), None) self.assertEqual(mail.get_message(), None)
self.assertEqual(mail.get_sending_date(), 0)
mail = Mail(255, 0, "test") mail = Mail(255, 0, "test", 12)
self.assertEqual(mail.get_id_sender(), 255) self.assertEqual(mail.get_id_sender(), 255)
self.assertEqual(mail.get_id_receiver(), 0) self.assertEqual(mail.get_id_receiver(), 0)
self.assertEqual(mail.get_message(), "test") self.assertEqual(mail.get_message(), "test")
self.assertEqual(mail.get_sending_date(), 12)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment