edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6218

Browse source 
6218: Add some more test to str_comp_filenames and restore old behavior r=def- a=Chairn

Actually, the two lines i deleted in #6206 were useful if first number is greater but second number is 0 prefixed.

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [x] Written a unit test (especially base/) or added coverage to integration test
- [x] Considered possible null pointers and out of bounds array indexing
- [x] Changed no physics that affect existing maps
- [x] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Chairn <chairn.nq@hotmail.fr>
This commit is contained in:
bors[bot] 2023-01-02 20:28:25 +00:00 committed by GitHub
parent 5282c8e2e5 8b3dfaf2d0
commit 1af2434cf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/base/system.cpp
View file

@ -2834,9 +2834,11 @@ int str_comp_filenames(const char *a, const char *b)
{
if(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9')
{
result = 0;
do
{
result = *a - *b;
if(!result)
result = *a - *b;
++a;
++b;
} while(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9');

14
src/test/str.cpp
View file

@ -827,6 +827,12 @@ TEST(Str, CompFilename)
EXPECT_GT(str_comp_filenames("1b", "1a"), 0);
EXPECT_GT(str_comp_filenames("12a", "1B"), 0);
EXPECT_LT(str_comp_filenames("1B", "12a"), 0);
EXPECT_GT(str_comp_filenames("10a", "1B"), 0);
EXPECT_LT(str_comp_filenames("1B", "10a"), 0);
EXPECT_GT(str_comp_filenames("10a", "00B"), 0);
EXPECT_LT(str_comp_filenames("00B", "10a"), 0);
EXPECT_GT(str_comp_filenames("10a", "09B"), 0);
EXPECT_LT(str_comp_filenames("09B", "10a"), 0);
EXPECT_LT(str_comp_filenames("abc", "abcd"), 0);
EXPECT_GT(str_comp_filenames("abcd", "abc"), 0);
EXPECT_LT(str_comp_filenames("abc2", "abcd1"), 0);
@ -840,6 +846,10 @@ TEST(Str, CompFilename)
EXPECT_GT(str_comp_filenames("file09", "file1"), 0);
EXPECT_LT(str_comp_filenames("file1", "file009"), 0);
EXPECT_GT(str_comp_filenames("file009", "file1"), 0);
EXPECT_GT(str_comp_filenames("file10", "file00"), 0);
EXPECT_LT(str_comp_filenames("file00", "file10"), 0);
EXPECT_GT(str_comp_filenames("file10", "file09"), 0);
EXPECT_LT(str_comp_filenames("file09", "file10"), 0);
EXPECT_LT(str_comp_filenames("file13", "file37"), 0);
EXPECT_GT(str_comp_filenames("file37", "file13"), 0);
EXPECT_LT(str_comp_filenames("file1.ext", "file09.ext"), 0);
@ -851,6 +861,10 @@ TEST(Str, CompFilename)
EXPECT_GT(str_comp_filenames("file37.ext", "file13.ext"), 0);
EXPECT_LT(str_comp_filenames("FILE13.EXT", "file37.ext"), 0);
EXPECT_GT(str_comp_filenames("file37.ext", "FILE13.EXT"), 0);
EXPECT_GT(str_comp_filenames("file10.ext", "file00.ext"), 0);
EXPECT_LT(str_comp_filenames("file00.ext", "file10.ext"), 0);
EXPECT_GT(str_comp_filenames("file10.ext", "file09.ext"), 0);
EXPECT_LT(str_comp_filenames("file09.ext", "file10.ext"), 0);
EXPECT_LT(str_comp_filenames("file42", "file1337"), 0);
EXPECT_GT(str_comp_filenames("file1337", "file42"), 0);
EXPECT_LT(str_comp_filenames("file42.ext", "file1337.ext"), 0);