Update gut

Author: CedNaru

harness/tests/.gutconfig.json

@@ -1,16 +1,36 @@
-{
-  "dirs":["res://test/unit/"],
-  "double_strategy":"partial",
-  "ignore_pause":false,
-  "include_subdirs":true,
-  "inner_class":"",
-  "log_level":3,
-  "opacity":100,
-  "prefix":"test_",
-  "selected":"",
-  "should_exit":true,
-  "should_maximize":true,
-  "suffix":".gd",
-  "tests":[],
-  "unit_test_name":""
+{
+ "background_color": "262626ff",
+ "compact_mode": false,
+ "configured_dirs": [
+  "res://test/unit"
+ ],
+ "dirs": [
+  "res://test/unit"
+ ],
+ "disable_colors": false,
+ "double_strategy": 1,
+ "failure_error_types": [
+  "gut"
+ ],
+ "font_color": "ccccccff",
+ "font_name": "CourierPrime",
+ "font_size": 16.0,
+ "gut_on_top": true,
+ "hide_orphans": false,
+ "ignore_pause": false,
+ "include_subdirs": false,
+ "junit_xml_file": "user://gut_report.xml",
+ "junit_xml_timestamp": false,
+ "log_level": 1.0,
+ "no_error_tracking": false,
+ "opacity": 100.0,
+ "paint_after": 0.1,
+ "post_run_script": "",
+ "pre_run_script": "",
+ "prefix": "test_",
+ "should_exit": false,
+ "should_exit_on_success": false,
+ "should_maximize": false,
+ "suffix": ".gd",
+ "wait_log_delay": 0.5
 }

harness/tests/addons/gut/GutScene.gd

@@ -8,120 +8,125 @@ extends Node2D
 @onready var _compact_gui = $Compact
 
 var gut = null :
-    set(val):
-        gut = val
-        _set_gut(val)
+	set(val):
+		gut = val
+		_set_gut(val)
 
 
 func _ready():
-    _normal_gui.switch_modes.connect(use_compact_mode.bind(true))
-    _compact_gui.switch_modes.connect(use_compact_mode.bind(false))
+	_normal_gui.switch_modes.connect(use_compact_mode.bind(true))
+	_compact_gui.switch_modes.connect(use_compact_mode.bind(false))
 
-    _normal_gui.set_title("GUT")
-    _compact_gui.set_title("GUT")
+	_normal_gui.set_title("GUT")
+	_compact_gui.set_title("GUT")
 
-    _normal_gui.align_right()
-    _compact_gui.to_bottom_right()
+	_normal_gui.align_right()
+	_compact_gui.to_bottom_right()
 
-    use_compact_mode(false)
+	use_compact_mode(false)
 
-    if(get_parent() == get_tree().root):
-        _test_running_setup()
+	if(get_parent() == get_tree().root):
+		_test_running_setup()
 
 func _test_running_setup():
-    set_font_size(100)
-    _normal_gui.get_textbox().text = "hello world, how are you doing?"
+	set_font_size(100)
+	_normal_gui.get_textbox().text = "hello world, how are you doing?"
 
 # ------------------------
 # Private
 # ------------------------
 func _set_gut(val):
-    if(_normal_gui.get_gut() == val):
-        return
-    _normal_gui.set_gut(val)
-    _compact_gui.set_gut(val)
+	if(_normal_gui.get_gut() == val):
+		return
+	_normal_gui.set_gut(val)
+	_compact_gui.set_gut(val)
 
-    val.start_run.connect(_on_gut_start_run)
-    val.end_run.connect(_on_gut_end_run)
-    val.start_pause_before_teardown.connect(_on_gut_pause)
-    val.end_pause_before_teardown.connect(_on_pause_end)
+	val.start_run.connect(_on_gut_start_run)
+	val.end_run.connect(_on_gut_end_run)
+	val.start_pause_before_teardown.connect(_on_gut_pause)
+	val.end_pause_before_teardown.connect(_on_pause_end)
 
 func _set_both_titles(text):
-    _normal_gui.set_title(text)
-    _compact_gui.set_title(text)
+	_normal_gui.set_title(text)
+	_compact_gui.set_title(text)
 
 
 # ------------------------
 # Events
 # ------------------------
 func _on_gut_start_run():
-    _set_both_titles('Running')
+	_set_both_titles('Running')
 
 func _on_gut_end_run():
-    _set_both_titles('Finished')
+	_set_both_titles('Finished')
 
 func _on_gut_pause():
-    _set_both_titles('-- Paused --')
+	_set_both_titles('-- Paused --')
 
 func _on_pause_end():
-    _set_both_titles('Running')
+	_set_both_titles('Running')
 
 
 # ------------------------
 # Public
 # ------------------------
 func get_textbox():
-    return _normal_gui.get_textbox()
+	return _normal_gui.get_textbox()
 
 
 func set_font_size(new_size):
-    var rtl = _normal_gui.get_textbox()
+	var rtl = _normal_gui.get_textbox()
 
-    rtl.set('theme_override_font_sizes/bold_italics_font_size', new_size)
-    rtl.set('theme_override_font_sizes/bold_font_size', new_size)
-    rtl.set('theme_override_font_sizes/italics_font_size', new_size)
-    rtl.set('theme_override_font_sizes/normal_font_size', new_size)
+	rtl.set('theme_override_font_sizes/bold_italics_font_size', new_size)
+	rtl.set('theme_override_font_sizes/bold_font_size', new_size)
+	rtl.set('theme_override_font_sizes/italics_font_size', new_size)
+	rtl.set('theme_override_font_sizes/normal_font_size', new_size)
 
 
 func set_font(font_name):
-    _set_all_fonts_in_rtl(_normal_gui.get_textbox(), font_name)
+	_set_all_fonts_in_rtl(_normal_gui.get_textbox(), font_name)
 
 
 func _set_font(rtl, font_name, custom_name):
-    if(font_name == null):
-        rtl.remove_theme_font_override(custom_name)
-    else:
-        var dyn_font = FontFile.new()
-        dyn_font.load_dynamic_font('res://addons/gut/fonts/' + font_name + '.ttf')
-        rtl.add_theme_font_override(custom_name, dyn_font)
+	if(font_name == null):
+		rtl.remove_theme_font_override(custom_name)
+	else:
+		var font_path = 'res://addons/gut/fonts/' + font_name + '.ttf'
+		if(FileAccess.file_exists(font_path)):
+			var dyn_font = FontFile.new()
+			dyn_font.load_dynamic_font('res://addons/gut/fonts/' + font_name + '.ttf')
+			rtl.add_theme_font_override(custom_name, dyn_font)
 
 
 func _set_all_fonts_in_rtl(rtl, base_name):
-    if(base_name == 'Default'):
-        _set_font(rtl, null, 'normal_font')
-        _set_font(rtl, null, 'bold_font')
-        _set_font(rtl, null, 'italics_font')
-        _set_font(rtl, null, 'bold_italics_font')
-    else:
-        _set_font(rtl, base_name + '-Regular', 'normal_font')
-        _set_font(rtl, base_name + '-Bold', 'bold_font')
-        _set_font(rtl, base_name + '-Italic', 'italics_font')
-        _set_font(rtl, base_name + '-BoldItalic', 'bold_italics_font')
+	if(base_name == 'Default'):
+		_set_font(rtl, null, 'normal_font')
+		_set_font(rtl, null, 'bold_font')
+		_set_font(rtl, null, 'italics_font')
+		_set_font(rtl, null, 'bold_italics_font')
+	else:
+		_set_font(rtl, base_name + '-Regular', 'normal_font')
+		_set_font(rtl, base_name + '-Bold', 'bold_font')
+		_set_font(rtl, base_name + '-Italic', 'italics_font')
+		_set_font(rtl, base_name + '-BoldItalic', 'bold_italics_font')
 
 
 func set_default_font_color(color):
-    _normal_gui.get_textbox().set('custom_colors/default_color', color)
+	_normal_gui.get_textbox().set('custom_colors/default_color', color)
 
 
 func set_background_color(color):
-    _normal_gui.set_bg_color(color)
+	_normal_gui.set_bg_color(color)
 
 
 func use_compact_mode(should=true):
-    _compact_gui.visible = should
-    _normal_gui.visible = !should
+	_compact_gui.visible = should
+	_normal_gui.visible = !should
 
 
 func set_opacity(val):
-    _normal_gui.modulate.a = val
-    _compact_gui.modulate.a = val
+	_normal_gui.modulate.a = val
+	_compact_gui.modulate.a = val
+
+func set_title(text):
+	_set_both_titles(text)

harness/tests/addons/gut/GutScene.gd.uid

@@ -1 +1 @@
-uid://cvnx8i73rnlmr
+uid://bw7tukh738kw1

harness/tests/addons/gut/GutScene.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://m28heqtswbuq"]
 
-[ext_resource type="Script" path="res://addons/gut/GutScene.gd" id="1_b4m8y"]
+[ext_resource type="Script" uid="uid://bw7tukh738kw1" path="res://addons/gut/GutScene.gd" id="1_b4m8y"]
 [ext_resource type="PackedScene" uid="uid://duxblir3vu8x7" path="res://addons/gut/gui/NormalGui.tscn" id="2_j6ywb"]
 [ext_resource type="PackedScene" uid="uid://cnqqdfsn80ise" path="res://addons/gut/gui/MinGui.tscn" id="3_3glw1"]
 

harness/tests/addons/gut/UserFileViewer.gd.uid

@@ -1 +1 @@
-uid://dtlcgeswwnm0u
+uid://x51wilphva3d

harness/tests/addons/gut/UserFileViewer.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://bsm7wtt1gie4v"]
 
-[ext_resource type="Script" path="res://addons/gut/UserFileViewer.gd" id="1"]
+[ext_resource type="Script" uid="uid://x51wilphva3d" path="res://addons/gut/UserFileViewer.gd" id="1"]
 
 [node name="UserFileViewer" type="Window"]
 exclusive = true

harness/tests/addons/gut/autofree.gd

@@ -5,7 +5,7 @@
 # The MIT License (MIT)
 # =====================
 #
-# Copyright (c) 2020 Tom "Butch" Wesley
+# Copyright (c) 2025 Tom "Butch" Wesley
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,30 +30,57 @@
 # ##############################################################################
 var _to_free = []
 var _to_queue_free = []
+var _ref_counted_doubles = []
+var _all_instance_ids = []
+
+
+func _add_instance_id(thing):
+	if(thing.has_method("get_instance_id")):
+		_all_instance_ids.append(thing.get_instance_id())
+
 
 func add_free(thing):
 	if(typeof(thing) == TYPE_OBJECT):
+		_add_instance_id(thing)
 		if(!thing is RefCounted):
 			_to_free.append(thing)
+		elif(GutUtils.is_double(thing)):
+			_ref_counted_doubles.append(thing)
+
 
 func add_queue_free(thing):
-	_to_queue_free.append(thing)
+	if(typeof(thing) == TYPE_OBJECT):
+		_add_instance_id(thing)
+		_to_queue_free.append(thing)
+
 
 func get_queue_free_count():
 	return _to_queue_free.size()
 
+
 func get_free_count():
 	return _to_free.size()
 
+
 func free_all():
-	for i in range(_to_free.size()):
-		if(is_instance_valid(_to_free[i])):
-			_to_free[i].free()
+	for node in _to_free:
+		if(is_instance_valid(node)):
+			if(GutUtils.is_double(node)):
+				node.__gutdbl_done()
+			node.free()
 	_to_free.clear()
 
 	for i in range(_to_queue_free.size()):
 		if(is_instance_valid(_to_queue_free[i])):
 			_to_queue_free[i].queue_free()
 	_to_queue_free.clear()
 
+	for ref_dbl in _ref_counted_doubles:
+		ref_dbl.__gutdbl_done()
+	_ref_counted_doubles.clear()
+
+	_all_instance_ids.clear()
+
 
+func has_instance_id(id):
+	return _all_instance_ids.has(id)

harness/tests/addons/gut/autofree.gd.uid

@@ -1 +1 @@
-uid://eex8rpla40vc
+uid://bxjfriqxgwe0r