add tests for fnewdir, fremovedir, chartoint, teamswitchdelay

bindweap is manually tested for now, seems to work properly

Author: Mohab Hassan

tests/bot_manager.py

@@ -181,12 +181,15 @@ def new_muliple_instances(self, n, should_connect=True):
 
         return insts
 
+    def join_team(self, team=b'axis'):
+        assert self.send_cmd_await_output(b'join_team ' + team, b'mohpc_test' + str(self.instance_id).encode() + b' has joined the ' + team.capitalize())
+        self.send_command(b'primarydmweapon rifle')
+    
     def spawn(self, team=b'axis'):
         print('BotManager: spawn: team:',  team.decode(), 'instance_id:', self.instance_id)
         self.send_command(b'set dm_playermodel american_army')
         self.send_command(b'set dm_playergermanmodel german_wehrmacht_soldier')
         assert self.instance_id != -1
-        assert self.send_cmd_await_output(b'join_team ' + team, b'mohpc_test' + str(self.instance_id).encode() + b' has joined the ' + team.capitalize())
-        self.send_command(b'primarydmweapon rifle')
+        self.join_team(team)
         time.sleep(1) #for spawn
         print('BotManager: spawned:', team.decode())

tests/file_manager.py

@@ -60,4 +60,13 @@ def unload(self):
             elif os.path.isdir(fpath):
                 shutil.rmtree(fpath, ignore_errors=True)
 
-        print('unloaded test files')
+        print('unloaded test files')
+    def delete(self, path, is_main=False):
+        if is_main:
+            fpath = self.game_path / path
+        else:
+            fpath = self.main_path / path
+        if os.path.isfile(fpath):
+            os.remove(fpath)
+        elif os.path.isdir(fpath):
+            shutil.rmtree(fpath, ignore_errors=True)

tests/testfiles/scriptfilesystem/mainfiles/tests/scriptfilesystem.scr

@@ -35,6 +35,9 @@ main:
     waitthread test_freadpak
     waitthread test_flist
 
+    waitthread test_fnewdir
+    waitthread test_fremovedir
+
     setcvar test_filesystem_score (level.filesystem_testcases_passed + "/" + level.filesystem_testcases_total)
     setcvar test_filesystem_failed level.filesystem_failed_testscases
     setcvar test_filesystem_status finished
@@ -229,4 +232,23 @@ test_flist:
     waitthread validate_test (local.ret[2]) "test_folder/" "(flist test25)" 
 
 
+end
+
+test_fnewdir:
+    local.ret = fnewdir "test_fnewdir"
+    waitthread validate_test (local.ret==0) 1 "(fnewdir test1)"
+    local.ret = fnewdir "test_fnewdir2/test_fnewdir" // non-existent path
+    waitthread validate_test (local.ret==0) 0 "(fnewdir test2)"
+    local.ret = fnewdir "test_fnewdir3" // already exists
+    waitthread validate_test (local.ret==0) 1 "(fnewdir test3)"
+end
+
+
+test_fremovedir:
+    local.ret = fremovedir "test_fremovedir" // empty
+    waitthread validate_test (local.ret==0) 1 "(fremovedir test1)"
+    local.ret = fremovedir "test_fremovedir2" // non-empty
+    waitthread validate_test (local.ret==0) 0 "(fremovedir test2)"
+    local.ret = fremovedir "test_fremovedir3" //non-existent
+    waitthread validate_test (local.ret==0) 1 "(fremovedir test3)"
 end

tests/testfiles/scriptfilesystem/test_fremovedir2/test.txt

@@ -20,6 +20,10 @@ main:
     local.t = "ttt"
     waitthread validate_test (typeof local.t) "const string" "(typeof local.t=ttt)"
 
+    waitthread validate_test (chartoint "a") 97 "(chartoint a)"
+    waitthread validate_test (chartoint "A") 65 "(chartoint A)"
+    waitthread validate_test (chartoint "#") 35 "(chartoint #)"
+
     waitthread validate_test (getproperty "nightfall_test") -3 "(getproperty nightfall_test)"
     waitthread validate_test (setproperty "nightfall_test" "nf_t_1") 0 "(setproperty nightfall_test nf_t_1)"
     waitthread validate_test (getproperty "nightfall_test") "nf_t_1" "(getproperty nightfall_test)"

tests/testfiles/scriptmiscall/mainfiles/tests/misc.scr

@@ -0,0 +1,3 @@
+main:
+    exec tests/teamswitchdelay.scr
+end

tests/testfiles/scriptteamswitchdelay/mainfiles/tests/main.scr

@@ -0,0 +1,19 @@
+main:
+    teamswitchdelay 16
+	wait 1
+    setcvar test_scriptteamswitchdelay_stage 1
+    
+    while(!$player) waitframe;
+    while($player.dmteam != "axis") waitframe;
+    local.axistime = level.time
+    while($player.dmteam == "axis") waitframe;
+    local.axistime = level.time - local.axistime
+    println "axistime " local.axistime
+    teamswitchdelay 60
+    
+    local.alliestime = level.time
+    while($player.dmteam == "allies") waitframe;
+    local.alliestime = level.time - local.alliestime
+    println "alliestime " local.axistime
+
+end

tests/testfiles/scriptteamswitchdelay/mainfiles/tests/teamswitchdelay.scr

@@ -24,4 +24,5 @@ def test_scriptfilesystem(self, game_manager, file_manager, rcon_manager):
         failed = rcon_manager.get_cvar_value(b'test_filesystem_failed')
         failed = failed.replace('\n','\\n')
         assert passed == total, f'Score is {score}, failed tests are: {failed}'
+        file_manager.delete('test_fnewdir')
 

tests/tests/test_scriptfilesystem.py

@@ -64,6 +64,23 @@ def test_scriptgettimezone(self, game_manager, file_manager, rcon_manager):
         tz = -time.timezone//3600
         assert int(res) == tz
 
+    #@pytest.mark.supported_game_vers('1.11')
+    @pytest.mark.timeout(240)
+    def test_scriptteamswitchdelay(self, game_manager, file_manager, rcon_manager, bot_manager):
+        time.sleep(30) #team switch delays are ignored for the first 30 seconds
+        bot_manager.spawn(b'axis')
+        time.sleep(1)
+        bot_manager.send_cmd_await_output(b'join_team allies', b'Can not change teams again for another')
+        time.sleep(16)
+        bot_manager.join_team(b'allies')
+        
+        time.sleep(1)
+        
+        #bot_manager.join_team(b'allies')
+        time.sleep(30)
+        bot_manager.send_cmd_await_output(b'join_team axis', b'Can not change teams again for another')
+        time.sleep(30)
+        bot_manager.join_team(b'axis')
 
 
     def test_scriptmiscall(self, game_manager, file_manager, rcon_manager, bot_manager):