Index: tst_ui_alarms_dialog/test.py
===================================================================
diff -u -rebfdf6552a4c9e4e82d6c0d55e8a88ad7265560d -rb3070943b619120d7b14fb33b98ce03e831621ca
--- tst_ui_alarms_dialog/test.py	(.../test.py)	(revision ebfdf6552a4c9e4e82d6c0d55e8a88ad7265560d)
+++ tst_ui_alarms_dialog/test.py	(.../test.py)	(revision b3070943b619120d7b14fb33b98ce03e831621ca)
@@ -20,8 +20,11 @@
 
 ALARM_EXPIRES_TIME = (0, 10, 20, 30, 30, 100)
 
-logging.basicConfig(filename='log_file.log',level=logging.INFO,\
-                     datefmt='%d-%b-%y %H:%M:%S')
+logging.basicConfig(filename='log_file.log',level=logging.INFO, datefmt='%d-%b-%y %H:%M:%S')
+hd_simulator = HDSimulator()
+logger = logging.getLogger("INFO")
+messenger = DenaliCanMessenger('can0')
+alarm = HDAlarmsSimulator(can_interface=messenger, logger=logger)
 
 def minimize():
     """
@@ -43,14 +46,14 @@
     utils.waitForGUI(0.5) # this wait is necessary. Due to dialog animation it will be hide until the animation is done.
 
 
-def test_buttons(alarm_instance, flag, vButtons):
+def test_buttons(flag, vButtons):
     """
     Method to verify buttons on alarm dialog box
     @param alarm_instance - instance for hd 
     @param flag - alarm flag to be set
     @param vButtons - button binary
     """
-    alarm_instance.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag)
+    alarm.cmd_activate_alarm_id(state = 1, alarm = 1, flags = flag)
     test.compare(waitForObjectExists(names.o_alarm_button_ok        ).visible, 
                  vButtons == config.ALARM_BUTTONS_OK, 
                  "Button visible [OK]")
@@ -87,25 +90,23 @@
     
     utils.waitForGUI(1)
     
-    alarm_instance.cmd_alarm_condition_cleared(alarm_id = 1)
+    alarm.cmd_alarm_condition_cleared(alarm_id = 1)
 
 
-def verification_of_alarm_flag(alarm):
+def verification_of_alarm_flag():
     """
     Method to verify alarm flag
-    @param alarm - instance for hd simulator
-    @output N/A
     """
     test.startSection("verification of alarm flag.")
    
     flag_status = alarm.cmd_make_alarm_flags(no_resume=1, no_rinseback=1, no_end_treatment=1, user_must_ack=1)
-    test_buttons(alarm_instance = alarm, flag = flag_status, vButtons = config.ALARM_BUTTONS_OK)
+    test_buttons(flag = flag_status, vButtons = config.ALARM_BUTTONS_OK)
     flag_status = alarm.cmd_make_alarm_flags(no_resume=1, no_rinseback=1, no_end_treatment=0, user_must_ack=0)
-    test_buttons(alarm_instance = alarm, flag = flag_status, vButtons = config.ALARM_BUTTONS_END)
+    test_buttons(flag = flag_status, vButtons = config.ALARM_BUTTONS_END)
     flag_status = alarm.cmd_make_alarm_flags(no_resume=1, no_rinseback=0, no_end_treatment=1, user_must_ack=0)
-    test_buttons(alarm_instance = alarm, flag = flag_status, vButtons = config.ALARM_BUTTONS_RINSEBACK)
+    test_buttons(flag = flag_status, vButtons = config.ALARM_BUTTONS_RINSEBACK)
     flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=1, no_end_treatment=1, user_must_ack=0)
-    test_buttons(alarm_instance = alarm, flag = flag_status, vButtons = config.ALARM_BUTTONS_RESUME)
+    test_buttons(flag = flag_status, vButtons = config.ALARM_BUTTONS_RESUME)
     
     #enables all the flags at same time
     flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=1)
@@ -125,8 +126,7 @@
 def test_color_based_on_alarm_priority(alarm_priority):
     """
     Method to verify alarm dialog box color based on alarm priority
-    @param alarm_priority - alarm priority level
-    @output N/A
+    @param alarm_priority - (int) alarm priority level
     """
     test.startSection("verification of alarm dialog box color based on alarm priority -> " + config.ALARM_PRIORITY_OPTIONS[alarm_priority])
    
@@ -198,7 +198,7 @@
     test.endSection()
     
     
-def verification_of_alarm_messages(alarm):
+def verification_of_alarm_messages():
     
     test.startSection("verification of alarm bar parameters")
         
@@ -230,7 +230,7 @@
     test.endSection()           
 
 
-def verification_of_alarm_parameters(alarm):
+def verification_of_alarm_parameters():
   
     test.startSection("verification of alarm parameters")
     
@@ -270,18 +270,11 @@
 def main():
     
     utils.tstStart(__file__)
-    utility.start_application(config.AUT_NAME)
+    startApplication(config.AUT_NAME)
     
-    hd = HDSimulator()
-  
-    logger = logging.getLogger("INFO")
-    messenger = DenaliCanMessenger('can0')
-
-    alarm = HDAlarmsSimulator(can_interface=messenger, logger=logger)
-    
-    verification_of_alarm_messages(alarm)
-    verification_of_alarm_parameters(alarm)
-    verification_of_alarm_flag(alarm)
+    verification_of_alarm_messages()
+    verification_of_alarm_parameters()
+    verification_of_alarm_flag()
         
     utils.tstDone()
     
\ No newline at end of file