From e127ad39e742396030352240d829bc903b1d4464 Mon Sep 17 00:00:00 2001 From: Sophia Pearson Date: Mon, 3 Oct 2022 22:22:50 +0200 Subject: godot: inital Godot 4 migration --- Tests/Terminal/test_OutputArea.gd | 16 ++++++++-------- Tests/Terminal/test_OutputBlock.gd | 6 +++--- Tests/Terminal/test_StatusArea.gd | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'Tests/Terminal') diff --git a/Tests/Terminal/test_OutputArea.gd b/Tests/Terminal/test_OutputArea.gd index 88beddb..51be7ba 100644 --- a/Tests/Terminal/test_OutputArea.gd +++ b/Tests/Terminal/test_OutputArea.gd @@ -9,10 +9,10 @@ func _get_line_container() -> VBoxContainer: return _instance.get_node('%LineContainer') as VBoxContainer func after_each(): - yield(yield_frames(1), YIELD) + await yield_frames(1).YIELD func before_each(): - var scene = Scene.instance() + var scene = Scene.instantiate() scene.OutputBlockScene = preload('res://Scenes/Terminal/OutputBlock.tscn') _instance = add_child_autofree(scene) @@ -23,26 +23,26 @@ func test_can_be_instantiated(): assert_not_null(_instance) func test_LineContainer_is_empty_after_instantiation(): - assert_true(_get_line_container().get_children().empty()) + assert_true(_get_line_container().get_children().is_empty()) func test_TextBlocks_is_empty_after_instantiation(): - assert_true(_instance.TextBlocks.empty()) + assert_true(_instance.TextBlocks.is_empty()) func test_LineContainer_is_not_empty_after_calling_Push_with_a_non_empty_string_as_text(): _instance.Push('this is some test data') - assert_false(_get_line_container().get_children().empty()) + assert_false(_get_line_container().get_children().is_empty()) func test_LineContainer_is_empty_after_calling_Push_with_an_empty_string_as_text(): _instance.Push('') - assert_true(_get_line_container().get_children().empty()) + assert_true(_get_line_container().get_children().is_empty()) func test_TextBlocks_is_not_empty_after_calling_Push_with_a_non_empty_string_as_text(): _instance.Push('this is some test data') - assert_false(_instance.TextBlocks.empty()) + assert_false(_instance.TextBlocks.is_empty()) func test_TextBlocks_is_empty_after_calling_Push_with_an_empty_string_as_text(): _instance.Push('') - assert_true(_instance.TextBlocks.empty()) + assert_true(_instance.TextBlocks.is_empty()) func test_TextBlocks_contains_all_pushed_texts_in_the_push_order(): var texts = ['text block a', 'text block b'] diff --git a/Tests/Terminal/test_OutputBlock.gd b/Tests/Terminal/test_OutputBlock.gd index f586c55..f0c2b29 100644 --- a/Tests/Terminal/test_OutputBlock.gd +++ b/Tests/Terminal/test_OutputBlock.gd @@ -10,7 +10,7 @@ var _instance: OutputBlock = null func before_each(): - _instance = add_child_autofree(Scene.instance()) + _instance = add_child_autofree(Scene.instantiate()) func after_all(): assert_no_new_orphans() @@ -25,8 +25,8 @@ func test_ContentLabel_bbcode_enabled_is_enabled_after_instantiation(): assert_true(_instance.get_node('ContentLabel').bbcode_enabled) func test_ContentLabel_is_empty_after_instantiation(): - assert_eq(_instance.get_node('ContentLabel').bbcode_text, '') + assert_eq(_instance.get_node('ContentLabel').text, '') func test_setting_Content_sets_ContentLabel_bbcode_text(): _instance.Content = 'test' - assert_eq(_instance.get_node('ContentLabel').bbcode_text, 'test') + assert_eq(_instance.get_node('ContentLabel').text, 'test') diff --git a/Tests/Terminal/test_StatusArea.gd b/Tests/Terminal/test_StatusArea.gd index 8277210..752b5c8 100644 --- a/Tests/Terminal/test_StatusArea.gd +++ b/Tests/Terminal/test_StatusArea.gd @@ -9,7 +9,7 @@ func _get_title_label() -> RichTextLabel: return _instance.get_node('%TitleLabel') as RichTextLabel func before_each(): - _instance = add_child_autofree(Scene.instance()) + _instance = add_child_autofree(Scene.instantiate()) func after_all(): assert_no_new_orphans() @@ -18,15 +18,15 @@ func test_can_be_instantiated(): assert_not_null(_instance) func test_Title_is_empty_after_instantiation(): - assert_true(_instance.Title.empty()) + assert_true(_instance.Title.is_empty()) func test_TitleLabel_is_empty_after_instantiation(): - assert_true(_get_title_label().text.empty()) + assert_true(_get_title_label().text.is_empty()) func test_setting_Title_to_a_non_empty_string_makes_TitleLable_non_empty(): _instance.Title = 'this is a test title' - assert_false(_get_title_label().text.empty()) + assert_false(_get_title_label().text.is_empty()) func test_setting_Title_sets_the_bbcode_text_property_on_TitleLabel(): _instance.Title = '[wave]this is a test title[/wave]' - assert_false(_get_title_label().bbcode_text.empty()) + assert_false(_get_title_label().text.is_empty()) -- cgit v1.2.3