pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move zone cli out of source and into cmake

Browse Source
This commit is contained in:
KimLS 2025-12-10 00:02:38 -08:00
parent 7acff368ea
commit 76f8f1fb95
9 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/CMakeLists.txt
View File

@ -21,6 +21,13 @@ set(zone_sources
client_mods.cpp
client_packet.cpp
client_process.cpp
cli/cli_benchmark_databuckets.cpp
cli/cli_sidecar_serve_http.cpp
cli/tests/cli_test_util.cpp
cli/tests/cli_databuckets.cpp
cli/tests/cli_npc_handins.cpp
cli/tests/cli_npc_handins_multiquest.cpp
cli/tests/cli_zone_state.cpp
combat_record.cpp
corpse.cpp
doors.cpp

2
zone/cli/benchmark_databuckets.cpp → zone/cli/cli_benchmark_databuckets.cpp
View File

@ -1,6 +1,8 @@
#include <chrono>
#include <iostream>
#include <random>
#include "../zone_cli.h"
#include "../../common/cli/eqemu_command_handler.h"
#include "../../common/http/httplib.h"
#include "../../common/eqemu_logsys.h"
#include "../sidecar_api/sidecar_api.h"

2
zone/cli/sidecar_serve_http.cpp → zone/cli/cli_sidecar_serve_http.cpp
View File

@ -1,3 +1,5 @@
#include "../zone_cli.h"
#include "../../common/cli/eqemu_command_handler.h"
#include "../../common/http/httplib.h"
#include "../../common/eqemu_logsys.h"
#include "../sidecar_api/sidecar_api.h"

6
zone/cli/tests/databuckets.cpp → zone/cli/tests/cli_databuckets.cpp
View File

@ -1,3 +1,5 @@
#include "../../zone_cli.h"
#include "../../common/cli/eqemu_command_handler.h"
#include "../../common/http/httplib.h"
#include "../../common/eqemu_logsys.h"
#include "../../common/platform.h"
@ -7,6 +9,10 @@
extern Zone* zone;
void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
void RunTest(const std::string& test_name, bool expected, bool actual);
void RunTest(const std::string& test_name, int expected, int actual);
void ZoneCLI::TestDataBuckets(int argc, char** argv, argh::parser& cmd, std::string& description)
{
if (cmd[{"-h", "--help"}]) {

6
zone/cli/tests/npc_handins.cpp → zone/cli/tests/cli_npc_handins.cpp
View File

@ -1,3 +1,5 @@
#include "../../zone_cli.h"
#include "../../common/cli/eqemu_command_handler.h"
#include "../../common/http/httplib.h"
#include "../../common/eqemu_logsys.h"
#include "../../common/platform.h"
@ -9,6 +11,10 @@
extern Zone *zone;
using json = nlohmann::json;
void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
void RunTest(const std::string& test_name, bool expected, bool actual);
void RunTest(const std::string& test_name, int expected, int actual);
struct HandinEntry {
std::string item_id = "0";
uint32 count = 0;

6
zone/cli/tests/npc_handins_multiquest.cpp → zone/cli/tests/cli_npc_handins_multiquest.cpp
View File

@ -1,3 +1,5 @@
#include "../../zone_cli.h"
#include "../../common/cli/eqemu_command_handler.h"
#include "../../common/eqemu_logsys.h"
#include "../../common/platform.h"
#include "../../zone.h"
@ -6,6 +8,10 @@
extern Zone *zone;
void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
void RunTest(const std::string& test_name, bool expected, bool actual);
void RunTest(const std::string& test_name, int expected, int actual);
void ZoneCLI::TestNpcHandinsMultiQuest(int argc, char **argv, argh::parser &cmd, std::string &description)
{
if (cmd[{"-h", "--help"}]) {

8
zone/cli/tests/_test_util.cpp → zone/cli/tests/cli_test_util.cpp
View File

@ -1,6 +1,6 @@
#include "../../zone.h"
inline void RunTest(const std::string &test_name, const std::string &expected, const std::string &actual)
void RunTest(const std::string &test_name, const std::string &expected, const std::string &actual)
{
if (expected == actual) {
std::cout << "[✅] " << test_name << " PASSED\n";
@ -12,7 +12,7 @@ inline void RunTest(const std::string &test_name, const std::string &expected, c
}
}
inline void RunTest(const std::string &test_name, bool expected, bool actual)
void RunTest(const std::string &test_name, bool expected, bool actual)
{
if (expected == actual) {
std::cout << "[✅] " << test_name << " PASSED\n";
@ -25,7 +25,7 @@ inline void RunTest(const std::string &test_name, bool expected, bool actual)
}
}
inline void RunTest(const std::string &test_name, int expected, int actual)
void RunTest(const std::string &test_name, int expected, int actual)
{
if (expected == actual) {
std::cout << "[✅] " << test_name << " PASSED\n";
@ -40,7 +40,7 @@ inline void RunTest(const std::string &test_name, int expected, int actual)
extern Zone *zone;
inline void SetupZone(std::string zone_short_name, uint32 instance_id = 0) {
void SetupZone(std::string zone_short_name, uint32 instance_id = 0) {
EQEmuLogSys::Instance()->SilenceConsoleLogging();
EQEmuLogSys::Instance()->log_settings[Logs::ZoneState].log_to_console = std::getenv("DEBUG") ? 3 : 0;

11
zone/cli/tests/zone_state.cpp → zone/cli/tests/cli_zone_state.cpp
View File

@ -1,11 +1,18 @@
extern Zone *zone;
#include "../../zone_cli.h"
#include "../../common/cli/eqemu_command_handler.h"
#include <cereal/archives/json.hpp>
#include <cereal/types/map.hpp>
#include "../../common/repositories/npc_types_repository.h"
#include "../../corpse.h"
#include "../../../common/repositories/respawn_times_repository.h"
extern Zone* zone;
void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
void RunTest(const std::string& test_name, bool expected, bool actual);
void RunTest(const std::string& test_name, int expected, int actual);
void SetupZone(std::string zone_short_name, uint32 instance_id = 0);
inline void ClearState()
{
ZoneStateSpawnsRepository::DeleteWhere(database, "zone_id = 32 and instance_id = 0");

10
zone/zone_cli.cpp
View File

@ -39,13 +39,3 @@ void ZoneCLI::CommandHandler(int argc, char **argv)
EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
}
// cli
#include "cli/benchmark_databuckets.cpp"
#include "cli/sidecar_serve_http.cpp"
// tests
#include "cli/tests/_test_util.cpp"
#include "cli/tests/databuckets.cpp"
#include "cli/tests/npc_handins.cpp"
#include "cli/tests/npc_handins_multiquest.cpp"
#include "cli/tests/zone_state.cpp"