From 1eaaadf6270019cd9d50320850fe3cfd5bdfb617 Mon Sep 17 00:00:00 2001 From: Davide Cappellini Date: Sun, 20 Sep 2026 10:49:31 +0200 Subject: [PATCH] refactor: move adversarial test bots to common_libs/test_framework/adversaries/ --- ModularBot_garage/tests/test_accel_gun.nim | 2 +- ModularBot_garage/tests/test_all_enemies.nim | 4 ++-- ModularBot_garage/tests/test_gauntlet.nim | 2 +- ModularBot_garage/tests/test_gauntlet_guns.nim | 2 +- ModularBot_garage/tests/test_gun_switching.nim | 4 ++-- .../adversaries/PatternMover_garage}/PatternMover | Bin .../PatternMover_garage}/PatternMover.nimble | 0 .../PatternMover_garage}/PatternMover_garage.json | 0 .../PatternMover_garage}/PatternMover_garage.sh | 0 .../adversaries/PatternMover_garage}/config.nims | 0 .../PatternMover_garage}/src/PatternMover.json | 0 .../PatternMover_garage}/src/PatternMover.nim | 0 .../adversaries/RandomMover_garage}/RandomMover | Bin .../RandomMover_garage}/RandomMover.nimble | 0 .../RandomMover_garage}/RandomMover_garage.json | 0 .../RandomMover_garage}/RandomMover_garage.sh | 0 .../adversaries/RandomMover_garage}/config.nims | 0 .../RandomMover_garage}/src/RandomMover.json | 0 .../RandomMover_garage}/src/RandomMover.nim | 0 .../adversaries/WaveSurfer_garage}/WaveSurfer | Bin .../WaveSurfer_garage}/WaveSurfer.nimble | 0 .../WaveSurfer_garage}/WaveSurfer_garage.json | 0 .../WaveSurfer_garage}/WaveSurfer_garage.sh | 0 .../adversaries/WaveSurfer_garage}/config.nims | 0 .../WaveSurfer_garage}/src/WaveSurfer.json | 0 .../WaveSurfer_garage}/src/WaveSurfer.nim | 0 test_decaygf_battles.nim | 4 ++-- test_displacement_battles.nim | 4 ++-- 28 files changed, 11 insertions(+), 11 deletions(-) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/PatternMover (100%) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/PatternMover.nimble (100%) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/PatternMover_garage.json (100%) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/PatternMover_garage.sh (100%) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/config.nims (100%) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/src/PatternMover.json (100%) rename {PatternMover_garage => common_libs/test_framework/adversaries/PatternMover_garage}/src/PatternMover.nim (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/RandomMover (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/RandomMover.nimble (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/RandomMover_garage.json (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/RandomMover_garage.sh (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/config.nims (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/src/RandomMover.json (100%) rename {RandomMover_garage => common_libs/test_framework/adversaries/RandomMover_garage}/src/RandomMover.nim (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/WaveSurfer (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/WaveSurfer.nimble (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/WaveSurfer_garage.json (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/WaveSurfer_garage.sh (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/config.nims (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/src/WaveSurfer.json (100%) rename {WaveSurfer_garage => common_libs/test_framework/adversaries/WaveSurfer_garage}/src/WaveSurfer.nim (100%) diff --git a/ModularBot_garage/tests/test_accel_gun.nim b/ModularBot_garage/tests/test_accel_gun.nim index 162dab3..79c7225 100644 --- a/ModularBot_garage/tests/test_accel_gun.nim +++ b/ModularBot_garage/tests/test_accel_gun.nim @@ -9,7 +9,7 @@ const samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7" crazyDir = samplesDir / "Crazy" wallsDir = samplesDir / "Walls" - randomMoverDir = "/home/davide/Projects/SirRoboGarage/RandomMover_garage" + randomMoverDir = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/RandomMover_garage" if not fileExists("/home/davide/Projects/tank-royale/server/build/libs/robocode-tankroyale-server-0.35.5-all.jar") or not fileExists("/home/davide/Projects/tank-royale/runner/examples/lib/robocode-tankroyale-runner.jar"): diff --git a/ModularBot_garage/tests/test_all_enemies.nim b/ModularBot_garage/tests/test_all_enemies.nim index e71f658..8d87a22 100644 --- a/ModularBot_garage/tests/test_all_enemies.nim +++ b/ModularBot_garage/tests/test_all_enemies.nim @@ -5,8 +5,8 @@ const myBotDir = currentSourcePath().parentDir.parentDir let enemies = @[ ("/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7/Walls", "Walls"), ("/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7/SpinBot", "SpinBot"), - ("/home/davide/Projects/SirRoboGarage/WaveSurfer_garage", "WaveSurfer"), - ("/home/davide/Projects/SirRoboGarage/PatternMover_garage", "PatternMover"), + ("/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/WaveSurfer_garage", "WaveSurfer"), + ("/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/PatternMover_garage", "PatternMover"), ("/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7/TrackFire", "TrackFire"), ] diff --git a/ModularBot_garage/tests/test_gauntlet.nim b/ModularBot_garage/tests/test_gauntlet.nim index d226f46..2e1a6c2 100644 --- a/ModularBot_garage/tests/test_gauntlet.nim +++ b/ModularBot_garage/tests/test_gauntlet.nim @@ -8,7 +8,7 @@ import test_framework/test_framework const modularBotDir = currentSourcePath().parentDir.parentDir samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7" - waveSurferDir = "/home/davide/Projects/SirRoboGarage/WaveSurfer_garage" + waveSurferDir = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/WaveSurfer_garage" spinBotDir = samplesDir / "SpinBot" crazyDir = samplesDir / "Crazy" diff --git a/ModularBot_garage/tests/test_gauntlet_guns.nim b/ModularBot_garage/tests/test_gauntlet_guns.nim index 7bf016b..c727bb5 100644 --- a/ModularBot_garage/tests/test_gauntlet_guns.nim +++ b/ModularBot_garage/tests/test_gauntlet_guns.nim @@ -10,7 +10,7 @@ import test_framework/battle_result const modularBotDir = currentSourcePath().parentDir.parentDir samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7" - waveSurferDir = "/home/davide/Projects/SirRoboGarage/WaveSurfer_garage" + waveSurferDir = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/WaveSurfer_garage" spinBotDir = samplesDir / "SpinBot" crazyDir = samplesDir / "Crazy" diff --git a/ModularBot_garage/tests/test_gun_switching.nim b/ModularBot_garage/tests/test_gun_switching.nim index 1af4634..85a26e3 100644 --- a/ModularBot_garage/tests/test_gun_switching.nim +++ b/ModularBot_garage/tests/test_gun_switching.nim @@ -17,8 +17,8 @@ let enemies = @[ ("Target", sampleBots / "Target"), ("SpinBot", sampleBots / "SpinBot"), ("Crazy", sampleBots / "Crazy"), - ("PatternMover", "/home/davide/Projects/SirRoboGarage/PatternMover_garage"), - ("RandomMover", "/home/davide/Projects/SirRoboGarage/RandomMover_garage"), + ("PatternMover", "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/PatternMover_garage"), + ("RandomMover", "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/RandomMover_garage"), ] const logFile = "/tmp/modularbot_stdout.log" diff --git a/PatternMover_garage/PatternMover b/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover similarity index 100% rename from PatternMover_garage/PatternMover rename to common_libs/test_framework/adversaries/PatternMover_garage/PatternMover diff --git a/PatternMover_garage/PatternMover.nimble b/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover.nimble similarity index 100% rename from PatternMover_garage/PatternMover.nimble rename to common_libs/test_framework/adversaries/PatternMover_garage/PatternMover.nimble diff --git a/PatternMover_garage/PatternMover_garage.json b/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.json similarity index 100% rename from PatternMover_garage/PatternMover_garage.json rename to common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.json diff --git a/PatternMover_garage/PatternMover_garage.sh b/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.sh similarity index 100% rename from PatternMover_garage/PatternMover_garage.sh rename to common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.sh diff --git a/PatternMover_garage/config.nims b/common_libs/test_framework/adversaries/PatternMover_garage/config.nims similarity index 100% rename from PatternMover_garage/config.nims rename to common_libs/test_framework/adversaries/PatternMover_garage/config.nims diff --git a/PatternMover_garage/src/PatternMover.json b/common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.json similarity index 100% rename from PatternMover_garage/src/PatternMover.json rename to common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.json diff --git a/PatternMover_garage/src/PatternMover.nim b/common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.nim similarity index 100% rename from PatternMover_garage/src/PatternMover.nim rename to common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.nim diff --git a/RandomMover_garage/RandomMover b/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover similarity index 100% rename from RandomMover_garage/RandomMover rename to common_libs/test_framework/adversaries/RandomMover_garage/RandomMover diff --git a/RandomMover_garage/RandomMover.nimble b/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover.nimble similarity index 100% rename from RandomMover_garage/RandomMover.nimble rename to common_libs/test_framework/adversaries/RandomMover_garage/RandomMover.nimble diff --git a/RandomMover_garage/RandomMover_garage.json b/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.json similarity index 100% rename from RandomMover_garage/RandomMover_garage.json rename to common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.json diff --git a/RandomMover_garage/RandomMover_garage.sh b/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.sh similarity index 100% rename from RandomMover_garage/RandomMover_garage.sh rename to common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.sh diff --git a/RandomMover_garage/config.nims b/common_libs/test_framework/adversaries/RandomMover_garage/config.nims similarity index 100% rename from RandomMover_garage/config.nims rename to common_libs/test_framework/adversaries/RandomMover_garage/config.nims diff --git a/RandomMover_garage/src/RandomMover.json b/common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.json similarity index 100% rename from RandomMover_garage/src/RandomMover.json rename to common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.json diff --git a/RandomMover_garage/src/RandomMover.nim b/common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.nim similarity index 100% rename from RandomMover_garage/src/RandomMover.nim rename to common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.nim diff --git a/WaveSurfer_garage/WaveSurfer b/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer similarity index 100% rename from WaveSurfer_garage/WaveSurfer rename to common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer diff --git a/WaveSurfer_garage/WaveSurfer.nimble b/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer.nimble similarity index 100% rename from WaveSurfer_garage/WaveSurfer.nimble rename to common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer.nimble diff --git a/WaveSurfer_garage/WaveSurfer_garage.json b/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.json similarity index 100% rename from WaveSurfer_garage/WaveSurfer_garage.json rename to common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.json diff --git a/WaveSurfer_garage/WaveSurfer_garage.sh b/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.sh similarity index 100% rename from WaveSurfer_garage/WaveSurfer_garage.sh rename to common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.sh diff --git a/WaveSurfer_garage/config.nims b/common_libs/test_framework/adversaries/WaveSurfer_garage/config.nims similarity index 100% rename from WaveSurfer_garage/config.nims rename to common_libs/test_framework/adversaries/WaveSurfer_garage/config.nims diff --git a/WaveSurfer_garage/src/WaveSurfer.json b/common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.json similarity index 100% rename from WaveSurfer_garage/src/WaveSurfer.json rename to common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.json diff --git a/WaveSurfer_garage/src/WaveSurfer.nim b/common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.nim similarity index 100% rename from WaveSurfer_garage/src/WaveSurfer.nim rename to common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.nim diff --git a/test_decaygf_battles.nim b/test_decaygf_battles.nim index d9db405..aca8cdc 100644 --- a/test_decaygf_battles.nim +++ b/test_decaygf_battles.nim @@ -5,8 +5,8 @@ const modularBotDir = "/home/davide/Projects/SirRoboGarage/ModularBot_garage" samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7" crazy = samplesDir / "Crazy" - waveSurfer = "/home/davide/Projects/SirRoboGarage/WaveSurfer_garage" - randomMover = "/home/davide/Projects/SirRoboGarage/RandomMover_garage" + waveSurfer = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/WaveSurfer_garage" + randomMover = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/RandomMover_garage" const serverJar = "/home/davide/Projects/tank-royale/server/build/libs/robocode-tankroyale-server-0.35.5-all.jar" const runnerJar = "/home/davide/Projects/tank-royale/runner/examples/lib/robocode-tankroyale-runner.jar" diff --git a/test_displacement_battles.nim b/test_displacement_battles.nim index 0b0be57..f311ba1 100644 --- a/test_displacement_battles.nim +++ b/test_displacement_battles.nim @@ -5,8 +5,8 @@ const modularBotDir = "/home/davide/Projects/SirRoboGarage/ModularBot_garage" samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7" crazy = samplesDir / "Crazy" - waveSurfer = "/home/davide/Projects/SirRoboGarage/WaveSurfer_garage" - patternMover = "/home/davide/Projects/SirRoboGarage/PatternMover_garage" + waveSurfer = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/WaveSurfer_garage" + patternMover = "/home/davide/Projects/SirRoboGarage/common_libs/test_framework/adversaries/PatternMover_garage" const serverJar = "/home/davide/Projects/tank-royale/server/build/libs/robocode-tankroyale-server-0.35.5-all.jar" const runnerJar = "/home/davide/Projects/tank-royale/runner/examples/lib/robocode-tankroyale-runner.jar"