Expanding disposal pipe UT failure info.

Author: MistakeNot4892

code/datums/trading/traders/ai.dm

@@ -49,7 +49,7 @@ They sell generic supplies and ask for generic supplies.
 		/obj/item/box/fancy                        = TRADER_SUBTYPES_ONLY,
 		/obj/item/laundry_basket                   = TRADER_THIS_TYPE,
 		/obj/item/secure_storage/briefcase         = TRADER_THIS_TYPE,
-		/obj/item/plant_satchel                           = TRADER_THIS_TYPE,
+		/obj/item/plant_satchel                    = TRADER_THIS_TYPE,
 		/obj/item/ore_satchel                      = TRADER_THIS_TYPE,
 		/obj/item/toolbox                          = TRADER_ALL,
 		/obj/item/wallet                           = TRADER_THIS_TYPE,

code/modules/recycling/disposalpipe.dm

@@ -592,9 +592,21 @@
 
 	dpdir = sortdir | posdir | negdir
 
-/obj/structure/disposalpipe/sortjunction/Initialize()
+/obj/structure/disposalpipe/sortjunction/proc/validate_sort_type()
+	. = istext(sort_type) && sort_type != ""
+	if(!.)
+		if(name == initial(name))
+			sort_type = "Unknown"
+		else
+			sort_type = name || "Unknown"
+		log_debug("Mapped untagged junction had empty sort_type, setting to '[sort_type]'.")
+
+/obj/structure/disposalpipe/sortjunction/Initialize(ml)
 	. = ..()
-	if(sort_type) global.tagger_locations |= sort_type
+	if(sort_type)
+		global.tagger_locations |= sort_type
+	if(ml && !validate_sort_type())
+		log_warning("Mapped sorting junction of type [type] initializing at [x],[y],[z] with invalid sort_type '[sort_type || "EMPTY"]'!")
 
 	updatedir()
 	updatename()
@@ -662,6 +674,9 @@
 	desc = "An underfloor disposal pipe which filters all wrapped and tagged items."
 	flipped_state = /obj/structure/disposalpipe/sortjunction/wildcard/flipped
 
+/obj/structure/disposalpipe/sortjunction/wildcard/validate_sort_type()
+	return TRUE // Special case
+
 /obj/structure/disposalpipe/sortjunction/wildcard/divert_check(var/checkTag)
 	return checkTag != ""
 
@@ -671,6 +686,12 @@
 	desc = "An underfloor disposal pipe which filters all untagged items."
 	flipped_state = /obj/structure/disposalpipe/sortjunction/untagged/flipped
 
+/obj/structure/disposalpipe/sortjunction/untagged/validate_sort_type()
+	. = (sort_type == "")
+	if(!.)
+		log_debug("Mapped untagged junction had non-empty sort_type, setting to empty string.")
+		sort_type = ""
+
 /obj/structure/disposalpipe/sortjunction/untagged/divert_check(var/checkTag)
 	return checkTag == ""
 

code/unit_tests/map_tests.dm

@@ -818,6 +818,15 @@ var/global/_unit_test_sort_junctions = list()
 	package.test = src
 	packages_awaiting_delivery[package] = start_tag
 
+/datum/unit_test/networked_disposals_shall_deliver_tagged_packages/fail(message)
+	. = ..()
+	if(length(packages_awaiting_delivery))
+		log_unit_test("[ascii_red]!!! FAILURE !!! [length(packages_awaiting_delivery)] package\s still processing.")
+		for(var/obj/structure/disposalholder/unit_test/package in packages_awaiting_delivery)
+			var/turf/package_turf = get_turf(package)
+			log_unit_test("[ascii_red] - [packages_awaiting_delivery[package]]: [package_turf?.x || "NULL"],[package_turf?.y || "NULL"],[package_turf?.z || "NULL"]")
+		packages_awaiting_delivery.Cut()
+
 /obj/structure/disposalholder/unit_test
 	is_spawnable_type = FALSE // NO
 	var/datum/unit_test/networked_disposals_shall_deliver_tagged_packages/test