removed lsfcourseid var and introduced checking for coursetitle

Author: rtschu

tests/behat/generator/__pycache__/generator.cpython-36.pyc

@@ -7,7 +7,6 @@
 category = 1
 coursename = "C1"
 tags = "@block @block_evasys_sync @block_evasys_sync_fulltest"
-lsfcourseid = 0
 # options
 OPTIONS = {
     "automode": ["manual", "auto"],
@@ -19,13 +18,6 @@
     "actualstate": ["open", "closed", "mixed"]
 }
 
-### GLOBAL VARIABLES ###
-# Section for non-intuitive global variables
-# - lsfcourseid:
-#   This variable gets reset to 0 everytime a new scenario is building. Everytime a scenario is added via
-#   declaring a valid idnumber (+1) a single link course (+1) or mutiple linked courses(+2) it gets incremented.
-#   after these parameters have been processed, the text to mock *idnumber* evasyscourses will be added.
-
 
 def get_checks(mode, standardtime, students_state, idnumber_state, mapped_state, internal_state, actual_state):
     """
@@ -77,16 +69,16 @@ def get_checks(mode, standardtime, students_state, idnumber_state, mapped_state,
     return checks
 
 
-def get_postcondensing_checks():
+def get_postcondensing_checks(idnumber_state, mapped_state):
     """
     :return: checks for a scenario that should NOT be considered in the condense step
     """
     postchecks = ""
     # Check that surveys are actually shown.
     # We don't want to include this in the sorting, because it only tests a for loop, but multiplies the tests by 2.
-    global lsfcourseid
-    for i in range(0, lsfcourseid):
-        postchecks += "And I should see \"Name: Evatestcourse " + str(i) + "\"\n"
+    postchecks += postcheck_idnumber(idnumber_state)
+    postchecks += postcheck_mappedstate(mapped_state)
+
     postchecks = postchecks.replace("\n", "\n    ")
     return postchecks
 
@@ -140,8 +132,6 @@ 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
     """
-    global lsfcourseid
-    lsfcourseid = 0
     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"
@@ -153,7 +143,8 @@ def get_scenario(mode, standardtime, students_state, idnumber_state, mapped_stat
     behat_scenario += "And I turn editing mode off\n"
     behat_scenario = behat_scenario.replace("\n", "\n    ")
 
-    if actual_state == "mixed" and lsfcourseid < 2:
+    if actual_state == "mixed" and not ((idnumber_state == "one" and (mapped_state == "multi" or mapped_state == "one"))
+                                        or mapped_state == "multi"):
         # a mixed state is impossible with less than 2 lsfscourseids, so we skip this.
         return False
     return behat_scenario
@@ -308,7 +299,7 @@ def main():
             if not scen_text:
                 print("Warning impossible scenario!!!")
                 continue
-            postcheck = get_postcondensing_checks()
+            postcheck = get_postcondensing_checks(idnumber_state, mapped_state)
             output += make_scenario(desc, scen_text, check + postcheck)
 
     output = output.replace("\n    \n", "\n\n")  # remove whitespaces on empty lines

tests/behat/generator/__pycache__/steps.cpython-36.pyc

@@ -1,4 +1,4 @@
-from generator import coursename, lsfcourseid
+from generator import coursename
 import random
 # Background
 background = '  Background:\n\
@@ -121,15 +121,13 @@
 # There are only methods when using a dict (like above) is either unnecessarry complicated
 # needs preparation (from a state like "multi" to an array of surveys)
 # or something has to be added programatically (like coursenames or ids)
-lsfcourseid = 0
 
 
 def 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
     """
-    global lsfcourseid
     if state == "none":
         return "And there is no idnumber mapped to course " + coursename + "\n"
     elif state == "invalid":
@@ -144,7 +142,6 @@ def 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
     """
-    global lsfcourseid
     if state == "none":
         return "And no courses are mapped to course " + coursename + "\n"
     elif state == "invalid":
@@ -199,6 +196,26 @@ def checks_internalstate(internal_state, actual_state, student_state, no_valid_m
     return checks
 
 
+def postcheck_idnumber(idnumber_state):
+    if idnumber_state == "one":
+        return 'And I should see "IdnumberSurvey"\n'
+    else:
+        return 'And I should not see "IdnumberSurvey"\n'
+
+
+def postcheck_mappedstate(mapped_state):
+    postchecks = ""
+    if mapped_state == "one":
+        postchecks += 'And I should see "DynamicSurvey0"\n'
+        postchecks += 'And I should not see "DynamicSurvey1"\n'
+    elif mapped_state == "mulit":
+        postchecks += 'And I should see "DynamicSurvey0"\n'
+        postchecks += 'And I should see "DynamicSurvey1"\n'
+    else:
+        postchecks += 'And I should not see "DynamicSurvey"\n'
+    return postchecks
+
+
 def description_modeconsistency(mode, internal_state, actual_state):
     description = ""
     # check if there is a mismatch in internal_state and mode (i.E. auto mode but manually opened internal state)