yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 09:49:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Tidy up parameterised test names

Browse source
This commit is contained in:
Jonny 2025-09-07 22:45:12 +01:00
parent 5bb12915fe
commit 5555b38fea
4 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/CMakeLists.txt
View file

@ -71,7 +71,7 @@ add_executable(tests
safety_tests.cpp safety_tests.cpp
battery/NissanLeafTest.cpp battery/NissanLeafTest.cpp
can_log_based/canlog_safety_tests.cpp can_log_based/canlog_safety_tests.cpp
can_log_based/utils.cpp utils/utils.cpp
../Software/src/communication/can/obd.cpp ../Software/src/communication/can/obd.cpp
../Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp ../Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
../Software/src/communication/rs485/comm_rs485.cpp ../Software/src/communication/rs485/comm_rs485.cpp

22
test/can_log_based/canlog_safety_tests.cpp
View file

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "utils.h" #include "../utils/utils.h"
#include "../../Software/src/battery/BATTERIES.h" #include "../../Software/src/battery/BATTERIES.h"
#include "../../Software/src/devboard/utils/events.h" #include "../../Software/src/devboard/utils/events.h"
@ -171,23 +171,27 @@ void RegisterCanLogTests() {
}; };
if (has_flag("base")) { if (has_flag("base")) {
testing::RegisterTest("CanLogTestFixture", ("TestBaseValuesPresent_" + entry.path().filename().string()).c_str(), testing::RegisterTest("CanLogSafetyTests",
nullptr, entry.path().filename().string().c_str(), __FILE__, __LINE__, ("TestBaseValuesPresent" + snake_case_to_camel_case(entry.path().stem().string())).c_str(),
nullptr, nullptr, __FILE__, __LINE__,
[=]() -> CanLogTestFixture* { return new BaseValuesPresentTest(entry.path()); }); [=]() -> CanLogTestFixture* { return new BaseValuesPresentTest(entry.path()); });
} }
if (has_flag("ov")) { if (has_flag("ov")) {
testing::RegisterTest("CanLogTestFixture", ("TestOverVoltage_" + entry.path().filename().string()).c_str(), testing::RegisterTest("CanLogSafetyTests",
nullptr, entry.path().filename().string().c_str(), __FILE__, __LINE__, ("TestOverVoltage" + snake_case_to_camel_case(entry.path().stem().string())).c_str(),
nullptr, nullptr, __FILE__, __LINE__,
[=]() -> CanLogTestFixture* { return new OverVoltageTest(entry.path()); }); [=]() -> CanLogTestFixture* { return new OverVoltageTest(entry.path()); });
} }
if (has_flag("cov")) { if (has_flag("cov")) {
testing::RegisterTest("CanLogTestFixture", ("TestCellOverVoltage_" + entry.path().filename().string()).c_str(), testing::RegisterTest("CanLogSafetyTests",
nullptr, entry.path().filename().string().c_str(), __FILE__, __LINE__, ("TestCellOverVoltage" + snake_case_to_camel_case(entry.path().stem().string())).c_str(),
nullptr, nullptr, __FILE__, __LINE__,
[=]() -> CanLogTestFixture* { return new CellOverVoltageTest(entry.path()); }); [=]() -> CanLogTestFixture* { return new CellOverVoltageTest(entry.path()); });
} }
if (has_flag("cuv")) { if (has_flag("cuv")) {
testing::RegisterTest("CanLogTestFixture", ("TestCellUnderVoltage_" + entry.path().filename().string()).c_str(), testing::RegisterTest("CanLogSafetyTests",
nullptr, entry.path().filename().string().c_str(), __FILE__, __LINE__, ("TestCellUnderVoltage" + snake_case_to_camel_case(entry.path().stem().string())).c_str(),
nullptr, nullptr, __FILE__, __LINE__,
[=]() -> CanLogTestFixture* { return new CellUnderVoltageTest(entry.path()); }); [=]() -> CanLogTestFixture* { return new CellUnderVoltageTest(entry.path()); });
} }
} }

21
test/can_log_based/utils.cpp → test/utils/utils.cpp
View file

@ -27,6 +27,27 @@ void print_frame(const CAN_frame& frame) {
std::cout << std::dec << "\n"; std::cout << std::dec << "\n";
} }
std::string snake_case_to_camel_case(const std::string& str) {
std::string result;
bool toUpper = false;
for (char ch : str) {
if (ch == '_') {
toUpper = true;
} else if (ch < '0' || (ch > '9' && ch < 'A') || (ch > 'Z' && ch < 'a') || ch > 'z') {
// skip non-alphanumeric characters
toUpper = true;
} else {
if (toUpper) {
result += toupper(ch);
toUpper = false;
} else {
result += ch;
}
}
}
return result;
}
CAN_frame parse_can_log_line(const std::string& logLine) { CAN_frame parse_can_log_line(const std::string& logLine) {
std::stringstream ss(logLine); std::stringstream ss(logLine);
CAN_frame frame = {}; CAN_frame frame = {};

1
test/can_log_based/utils.h → test/utils/utils.h
View file

@ -7,5 +7,6 @@ namespace fs = std::filesystem;
bool ends_with(const std::string& str, const std::string& suffix); bool ends_with(const std::string& str, const std::string& suffix);
std::vector<std::string> split(const std::string& text, char sep); std::vector<std::string> split(const std::string& text, char sep);
std::string snake_case_to_camel_case(const std::string& str);
std::vector<CAN_frame> parse_can_log_file(const fs::path& filePath); std::vector<CAN_frame> parse_can_log_file(const fs::path& filePath);