Index: tst_post/test.py =================================================================== diff -u -r00646b8eb394609f14bc93180f56eeeb38d87eb2 -r5985872d9acb96ae2ef85f620a159bcbf21cc3ca --- tst_post/test.py (.../test.py) (revision 00646b8eb394609f14bc93180f56eeeb38d87eb2) +++ tst_post/test.py (.../test.py) (revision 5985872d9acb96ae2ef85f620a159bcbf21cc3ca) @@ -5,8 +5,8 @@ # WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # file tst_post -# @author (last) Papiya Mandal, Sai Chaitainya Ela -# @date (last) 21-Jan-2022 +# @author (last) Papiya Mandal +# @date (last) 27-Jan-2022 # # NOTE: @@ -19,14 +19,16 @@ # from dialin.ui import unittests from builtins import int as pyInt +from configuration.assertion_helper import * from dialin.ui.hd_simulator import HDSimulator # from dialin.ui.dg_simulator import DGSimulator # from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator MSGS_AND_CONDITIONS = { 5: [True, False], 10: [True, False], 2: [True, False], 18: [True, True], 7: [False, True], } - + +assertion = AssertionHelper() hd = HDSimulator() #dg = DGSimulator() @@ -43,14 +45,22 @@ return progress_bar_val.text.toUtf8().constData() -def verify_the_progress(value) -> None: +def verify_the_progress(value, final_msg_posted) -> None: """ Method to verify the progress @param value: int single message """ - progress = pyInt(get_progress()) - test.compare(progress-1, value, - f"Single value {value} is updated in Progress bar") + progress = pyInt(get_progress())-1 + if final_msg_posted is True: + assertion.are_not_equal(expected_value=value, + actual_value=progress, + message=f"Final value {value} should " + + "not reflect on the progress bar") + elif final_msg_posted is False: + assertion.are_equal(expected_value=value, + actual_value=progress, + message=f"{value} should reflect "+ + "on progress bar") def post_a_message_and_verify_progress_and_completion(msgs_and_conditions): @@ -63,12 +73,8 @@ final_msg_posted = conditions[1] hd.cmd_send_hd_post(msg, final_msg, final_msg_posted) snooze(2) - if final_msg_posted != True: - verify_the_progress(value=msg) - verify_final_message_posted(final_msg=final_msg, final_msg_posted=final_msg_posted) - else: - test.log("Final message won't posted on progress bar") - verify_final_message_posted(final_msg=final_msg, final_msg_posted=final_msg_posted) + verify_the_progress(value=msg, final_msg_posted=final_msg_posted) + verify_final_message_posted(final_msg=final_msg, final_msg_posted=final_msg_posted) def verify_final_message_posted(final_msg=None, final_msg_posted=None) -> None: