1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00

Fix logicalCmp not sorting in natural order, refactor the entire thing

This commit is contained in:
ζeh Matt
2025-09-24 16:01:59 +03:00
parent 3bf75a1bc1
commit 43f7d2d912
3 changed files with 120 additions and 30 deletions

View File

@@ -10,6 +10,7 @@
#include "AssertHelpers.hpp"
#include "helpers/StringHelpers.hpp"
#include <algorithm>
#include <gtest/gtest.h>
#include <openrct2/core/CodepointView.hpp>
#include <openrct2/core/EnumUtils.hpp>
@@ -17,6 +18,7 @@
#include <string>
#include <tuple>
#include <utility>
#include <vector>
using namespace OpenRCT2;
@@ -250,3 +252,38 @@ TEST_F(CodepointViewTest, CodepointView_iterate)
AssertCodepoints("ゲスト", { U'', U'', U'' });
AssertCodepoints("<🎢>", { U'<', U'🎢', U'>' });
}
TEST_F(StringTest, LogicalCompare)
{
std::vector<std::string> expected = {
"1001 Troubles", "3D Cinema 1", "Aerial Cycles", "Batflyer", "bpb",
"bpb.sv6", "Drive-by", "foo", "foobar", "Guest 10",
"Guest 99", "Guest 100", "John v2.0", "John v2.1", "River of the Damned",
"Terror-dactyl",
};
std::vector<std::string> inputs = {
"Guest 99",
"Batflyer",
"John v2.1",
"bpb",
"3D Cinema 1",
"Drive-by",
"John v2.0",
"Guest 10",
"Terror-dactyl",
"Aerial Cycles",
"foobar",
"1001 Troubles",
"River of the Damned",
"bpb.sv6",
"Guest 100",
"foo",
};
std::sort(inputs.begin(), inputs.end(), [](const auto& a, const auto& b) {
return String::logicalCmp(a.c_str(), b.c_str()) < 0;
});
AssertVector<std::string>(inputs, expected);
}