|
@@ -204,11 +204,9 @@ if $ARGS[0] = 'test_prostitute_work_hours_735am':
|
|
|
|
|
|
EXPECTED = _FALSE
|
|
|
$EXPECTED_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<EXPECTED>>"
|
|
|
-
|
|
|
- gs $LOCATIONNAME, $FUNCTIONNAME
|
|
|
- *clr & cla
|
|
|
- ACTUAL = FUNC('prostitution_functions', 'prostitute_work_hours')
|
|
|
- $ACTUAL_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<ACTUAL>>"
|
|
|
+
|
|
|
+ ACTUAL = FUNC($LOCATIONNAME, $FUNCTIONNAME)
|
|
|
+ $ACTUAL_MESSAGE = "FUNC('<<$LOCATIONNAME>>', '<<$FUNCTIONNAME>>') => <<ACTUAL>>"
|
|
|
TESTRESULT = EXPECTED = ACTUAL
|
|
|
else:
|
|
|
$ACTUAL_MESSAGE = '<<$LOCATIONNAME>> <<$FUNCTIONNAME>> does not exist.'
|
|
@@ -229,12 +227,10 @@ if $ARGS[0] = 'test_prostitute_work_hours_535pm_check_loc':
|
|
|
minut = 35
|
|
|
|
|
|
EXPECTED = _TRUE
|
|
|
- $EXPECTED_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<EXPECTED>>"
|
|
|
-
|
|
|
- gs $LOCATIONNAME, $FUNCTIONNAME
|
|
|
- *clr & cla
|
|
|
- ACTUAL = FUNC('prostitution_functions', 'prostitute_work_hours')
|
|
|
- $ACTUAL_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<ACTUAL>>"
|
|
|
+ $EXPECTED_MESSAGE = "FUNC('<<$LOCATIONNAME>>', '<<$FUNCTIONNAME>>') => <<EXPECTED>>"
|
|
|
+
|
|
|
+ ACTUAL = FUNC($LOCATIONNAME, $FUNCTIONNAME)
|
|
|
+ $ACTUAL_MESSAGE = "FUNC('<<$LOCATIONNAME>>', <<$FUNCTIONNAME>>') => <<ACTUAL>>"
|
|
|
TESTRESULT = EXPECTED = ACTUAL
|
|
|
else:
|
|
|
$ACTUAL_MESSAGE = '<<$LOCATIONNAME>> <<$FUNCTIONNAME>> does not exist.'
|
|
@@ -254,12 +250,10 @@ if $ARGS[0] = 'test_prostitute_work_hours_1am_Pavlovsk':
|
|
|
hour = 1
|
|
|
minut = 0
|
|
|
EXPECTED = _FALSE
|
|
|
- $EXPECTED_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<EXPECTED>>"
|
|
|
-
|
|
|
- gs $LOCATIONNAME, $FUNCTIONNAME
|
|
|
- *clr & cla
|
|
|
- ACTUAL = FUNC('prostitution_functions', 'prostitute_work_hours')
|
|
|
- $ACTUAL_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<ACTUAL>>"
|
|
|
+ $EXPECTED_MESSAGE = "FUNC('<<$LOCATIONNAME>>', <<$FUNCTIONNAME>>') => <<EXPECTED>>"
|
|
|
+
|
|
|
+ ACTUAL = FUNC($LOCATIONNAME, $FUNCTIONNAME)
|
|
|
+ $ACTUAL_MESSAGE = "FUNC('<<$LOCATIONNAME>>', <<$FUNCTIONNAME>>') => <<ACTUAL>>"
|
|
|
TESTRESULT = EXPECTED = ACTUAL
|
|
|
else:
|
|
|
$ACTUAL_MESSAGE = '<<$LOCATIONNAME>> <<$FUNCTIONNAME>> does not exist.'
|
|
@@ -280,12 +274,10 @@ if $ARGS[0] = 'test_prostitute_work_hours_1am_Pushkin':
|
|
|
minut = 0
|
|
|
|
|
|
EXPECTED = _TRUE
|
|
|
- $EXPECTED_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<EXPECTED>>"
|
|
|
-
|
|
|
- gs $LOCATIONNAME, $FUNCTIONNAME
|
|
|
- *clr & cla
|
|
|
- ACTUAL = FUNC('prostitution_functions', 'prostitute_work_hours')
|
|
|
- $ACTUAL_MESSAGE = "FUNC('prostitution_functions', 'prostitute_work_hours') => <<ACTUAL>>"
|
|
|
+ $EXPECTED_MESSAGE = "FUNC('<<$LOCATIONNAME>>', <<$FUNCTIONNAME>>') => <<EXPECTED>>"
|
|
|
+
|
|
|
+ ACTUAL = FUNC($LOCATIONNAME, $FUNCTIONNAME)
|
|
|
+ $ACTUAL_MESSAGE = "FUNC('<<$LOCATIONNAME>>', <<$FUNCTIONNAME>>') => <<ACTUAL>>"
|
|
|
TESTRESULT = EXPECTED = ACTUAL
|
|
|
else:
|
|
|
$ACTUAL_MESSAGE = '<<$LOCATIONNAME>> <<$FUNCTIONNAME>> does not exist.'
|