unified codingstyle

Author: rtschu

tests/behat/generator/generator.py

@@ -132,12 +132,12 @@ def get_scenario(mode, standardtime, students_state, idnumber_state, mapped_stat
     This constructs the actual scenario by building all courses, states etc.
     :return: string the combined enviroment specifiing string for a scenario
     """
-    behat_scenario = manual_auto_mode[mode].replace("{{category}}", str(category)) + "\n"
-    behat_scenario += standardtimeMode[standardtime].replace("{{category}}", str(category)) + "\n"
-    behat_scenario += studentsState[students_state] + "\n"
-    behat_scenario += idnumberState(idnumber_state, actual_state)
-    behat_scenario += mappedState(mapped_state, actual_state)
-    behat_scenario += internalState[internal_state].replace("{{course}}", str(coursename)) + "\n"
+    behat_scenario = step_manual_auto_mode[mode].replace("{{category}}", str(category)) + "\n"
+    behat_scenario += step_standardtime_mode[standardtime].replace("{{category}}", str(category)) + "\n"
+    behat_scenario += step_students_state[students_state] + "\n"
+    behat_scenario += step_idnumberstate(idnumber_state, actual_state)
+    behat_scenario += step_mappedstate(mapped_state, actual_state)
+    behat_scenario += step_internal_state[internal_state].replace("{{course}}", str(coursename)) + "\n"
     behat_scenario += "And I turn editing mode on\n"
     behat_scenario += "And I add the \"EvaSys Sync\" block\n"
     behat_scenario += "And I turn editing mode off\n"

tests/behat/generator/steps.py

@@ -45,25 +45,25 @@
 
 # Environment configuration
 
-manual_auto_mode = {
+step_manual_auto_mode = {
     "manual": "Given category {{category}} is in manual mode",
     "auto": "Given category {{category}} is in auto mode"
 }
 
-standardtimeMode = {
+step_standardtime_mode = {
     0: "And category {{category}} is not in standardtime mode",
     1: "And category {{category}} is in standardtime mode with dates 1581043586 1582043586"
 }
 
-internalState = {
+step_internal_state = {
     "notopened": "And the internal state of course {{course}} is \"notopened\"",
     "opened": "And the internal state of course {{course}} is \"opened\"",
     "closed": "And the internal state of course {{course}} is \"closed\"",
     "manual": "And the internal state of course {{course}} is \"manual\"",
     "none": "And there is no internal record of course {{course}}"
 }
 
-studentsState = {
+step_students_state = {
     "none": "And no students enrolled in course " + coursename,
     "onlytutors": "And only tutors enrolled in course " + coursename,
     "multi": "And students enrolled in course " + coursename
@@ -123,7 +123,7 @@
 # or something has to be added programatically (like coursenames or ids)
 
 
-def idnumberState(state, openstate):
+def step_idnumberstate(state, openstate):
     """
     :param state: idnumber state (none/invalid/one)
     :return: String either creating none, an invalid or one evasys-course - moodle-course link via idnumber
@@ -137,7 +137,7 @@ def idnumberState(state, openstate):
         return x
 
 
-def mappedState(state, openstate):
+def step_mappedstate(state, openstate):
     """
     :param state: mapped state (none/invalid/one/multi)
     :return: a string creating none, only invalid, one or multiple mappings of a moodle-course to evasys-courses