mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Phantastic-SwanandThe Sharkening
e7a01b6b27
## About The Pull Request As per the title. The unit test was never skipping any typepaths, regardless of whether or not they were defined in the modular folders. This made it so that even TG clothing was being checked. The regex which was used to find the typepaths was also broken, as it was prematurely cutting off at the letter `s`, and was also matching with typepaths that weren't actual definitions/overwrites. It also stopped searching for typepaths in the file after the first one was found. ## Why It's Good For The Game Fixes a unit test. ## Proof Of Testing <img width="258" height="56" alt="image" src="https://github.com/user-attachments/assets/24b8f8d7-42d1-429d-9a48-30eb9ef95e6b" /> It compiled and run the test fine. Checking with the debugger confirmed that the `typepaths_to_check` list (renamed from `typepath_files`) was being properly filled with clothing from `modular_skyrat` and `modular_zubbers` folders. This screenshot shows the status of the `typepath_files` list before the changes: <img width="1703" height="332" alt="image" src="https://github.com/user-attachments/assets/4e400269-016f-4a89-81b0-887b8f44d200" /> As can be seen, it is empty, meaning the `if(subtype_string in typepath_files)` line is never going to fire, because there is no item in the list. This screenshot shows the status of the `typepaths_to_check` list after my changes: <img width="1600" height="548" alt="image" src="https://github.com/user-attachments/assets/f0bf1fed-193d-41c0-950e-3c4285a6db3f" /> as you can see, it has 599 entries, all of which were defined or overwritten in `modular_zubbers` or `modular_skyrat` files.
64 lines
2.3 KiB
Plaintext
64 lines
2.3 KiB
Plaintext
/// the regex.find() proc returns 0 if it has found nothing.
|
|
/// So we're replacing the magic number with a name.
|
|
#define NO_MATCH 0
|
|
|
|
/datum/unit_test/modular_digitigrade_sprites
|
|
var/type_to_test = /obj/item/clothing/under
|
|
var/list/modular_folders = list(
|
|
"modular_skyrat",
|
|
"modular_zubbers",
|
|
)
|
|
|
|
/datum/unit_test/modular_digitigrade_sprites/proc/get_folders_of_typepaths()
|
|
var/typepaths_to_check = list()
|
|
for(var/folder_name in modular_folders)
|
|
var/dir = "[folder_name]/"
|
|
for(var/file in flist(dir))
|
|
var/list/files = find_all_dm_files(dir)
|
|
for(var/full_path in files)
|
|
var/text = rustg_file_read(full_path)
|
|
if(!text)
|
|
continue
|
|
var/list/matches = parse_typepaths_from_text(text)
|
|
if(!length(matches))
|
|
continue
|
|
typepaths_to_check |= matches
|
|
return typepaths_to_check
|
|
|
|
/datum/unit_test/modular_digitigrade_sprites/proc/parse_typepaths_from_text(text)
|
|
var/type_string = "[type_to_test]"
|
|
// escape the slashes in the typepath itself to make it valid for regex
|
|
type_string = replacetext(type_string, "/", "\\/")
|
|
// make sure we only look at the ones defined/overwritten in our folders (by using ^ and $ to find start and end of lines)
|
|
var/regex_string = "^" + type_string + @"[^\n]*$"
|
|
// g flag to find all, m flag to make sure ^ and $ work
|
|
var/regex/matcher = regex(regex_string, "gm")
|
|
var/list/matches = list()
|
|
var/match_index = matcher.Find(text)
|
|
while (match_index != NO_MATCH)
|
|
matches.Add(matcher.match)
|
|
match_index = matcher.Find(text, match_index)
|
|
return matches
|
|
|
|
/datum/unit_test/modular_digitigrade_sprites/proc/find_all_dm_files(dir)
|
|
var/list/results = list()
|
|
for(var/entry in flist(dir))
|
|
var/path = "[dir][entry]"
|
|
if(copytext(entry, -2) == "dm")
|
|
results += path
|
|
else if(copytext(entry, -1) == "/")
|
|
results += find_all_dm_files(path)
|
|
return results
|
|
|
|
/datum/unit_test/modular_digitigrade_sprites/Run()
|
|
var/list/typepaths_to_check = get_folders_of_typepaths()
|
|
for(var/obj/item/clothing/under/valid_subtype as anything in subtypesof(type_to_test))
|
|
var/subtype_string = "[valid_subtype]"
|
|
if(!(subtype_string in typepaths_to_check))
|
|
continue
|
|
var/flags = valid_subtype::supports_variations_flags
|
|
if(!(flags & CLOTHING_DIGITIGRADE_VARIATION) && !(flags & CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))
|
|
TEST_FAIL("[subtype_string] is missing required digitigrade variation flags.")
|
|
|
|
#undef NO_MATCH
|