Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r8b2acf92efde9ddbeb292e0fb420b595dbd8c618 -r59650aded821ddd00b4e431cb6a44a11484dd23d --- shared/scripts/configuration/utility.py (.../utility.py) (revision 8b2acf92efde9ddbeb292e0fb420b595dbd8c618) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 59650aded821ddd00b4e431cb6a44a11484dd23d) @@ -15,7 +15,6 @@ import names import sys import test -import squish from configuration import config from builtins import int as pyInt Index: tst_main_treatment_pressure/test.py =================================================================== diff -u -r8b2acf92efde9ddbeb292e0fb420b595dbd8c618 -r59650aded821ddd00b4e431cb6a44a11484dd23d --- tst_main_treatment_pressure/test.py (.../test.py) (revision 8b2acf92efde9ddbeb292e0fb420b595dbd8c618) +++ tst_main_treatment_pressure/test.py (.../test.py) (revision 59650aded821ddd00b4e431cb6a44a11484dd23d) @@ -12,6 +12,7 @@ # author Papiya Mandal import names +# import squish from builtins import int as pyInt from configuration.config import * @@ -146,28 +147,31 @@ elif arterial_min < art_low: while arterial_min != art_low: mouseDrag(low_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) arterial_min += 10 - if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(low_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) break else: continue elif arterial_min > art_low: while arterial_min != art_low: mouseDrag(low_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) arterial_min -= 10 - if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(low_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) break else: continue - if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: # arterial blood pressure low limit should be lower than the high limit by atleast 30mmHg + # arterial blood pressure low limit should be lower than the high limit by atleast 30mmHg + if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_arterial_limitbar).minimum, arterial_min, "Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) else: @@ -200,28 +204,31 @@ elif arterial_max < art_high: while arterial_max != art_high: mouseDrag(high_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) arterial_max += 10 - if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Arterial range maximum value cannot be moved beyond {}".format(arterial_max)) break else: continue elif arterial_max > art_high: while arterial_max != art_high: mouseDrag(high_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) arterial_max -= 10 - if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Arterial range maximum value cannot be moved beyond {}".format(arterial_max)) break else: continue - if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg + if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_arterial_limitbar).maximum, arterial_max, "Arterial range maximum value cannot be moved beyond {}".format(arterial_max)) else: @@ -254,28 +261,30 @@ elif ven_min < ven_low: while ven_min != ven_low: mouseDrag(low_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) ven_min += 10 if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg mouseDrag(low_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Venous range minimum value cannot be moved beyond {}".format(ven_min)) break else: continue elif ven_min > ven_low: while ven_min != ven_low: mouseDrag(low_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) ven_min -= 10 - if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(low_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Venous range minimum value cannot be moved beyond {}".format(ven_min)) break else: continue - if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_venous_limitbar).minimum, ven_min, "Venous range minimum value cannot be moved beyond {}".format(ven_min)) else: @@ -308,28 +317,31 @@ elif ven_max < ven_high: while ven_max != ven_high: mouseDrag(high_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) ven_max += 10 - if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, 1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Venous range maximum value cannot be moved beyond {}".format(ven_max)) break else: continue elif ven_max > ven_high: while ven_max != ven_high: mouseDrag(high_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) ven_max -= 10 - if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, -1, 0, - squish.Qt.NoModifier, squish.Qt.LeftButton) + Qt.NoModifier, Qt.LeftButton) test.log("Venous range maximum value cannot be moved beyond {}".format(ven_max)) break else: continue - if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_venous_limitbar).maximum, ven_max, "Venous range maximum value cannot be moved beyond {}".format(ven_max)) else: