asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #63916 from akien-mga/tests-silence-some-intentional-errors

Browse source 
Tests: Silence some intentional errors
This commit is contained in:
Rémi Verschelde 2022-08-05 10:00:10 +02:00 committed by GitHub
commit 44d3c8402e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/main.cpp
View file

@ -431,6 +431,7 @@ Error Main::test_setup() {
/** INITIALIZE SERVERS **/ /** INITIALIZE SERVERS **/
register_server_types(); register_server_types();
XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests.
initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS); initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
NativeExtensionManager::get_singleton()->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_SERVERS); NativeExtensionManager::get_singleton()->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_SERVERS);

2
tests/core/io/test_marshalls.h
View file

@ -254,11 +254,13 @@ TEST_CASE("[Marshalls] Invalid data Variant decoding") {
uint8_t some_buffer[1] = { 0x00 }; uint8_t some_buffer[1] = { 0x00 };
uint8_t out_of_range_type_buffer[4] = { 0xff }; // Greater than Variant::VARIANT_MAX uint8_t out_of_range_type_buffer[4] = { 0xff }; // Greater than Variant::VARIANT_MAX
ERR_PRINT_OFF;
CHECK(decode_variant(variant, some_buffer, /* less than 4 */ 1, &r_len) == ERR_INVALID_DATA); CHECK(decode_variant(variant, some_buffer, /* less than 4 */ 1, &r_len) == ERR_INVALID_DATA);
CHECK(r_len == 0); CHECK(r_len == 0);
CHECK(decode_variant(variant, out_of_range_type_buffer, 4, &r_len) == ERR_INVALID_DATA); CHECK(decode_variant(variant, out_of_range_type_buffer, 4, &r_len) == ERR_INVALID_DATA);
CHECK(r_len == 0); CHECK(r_len == 0);
ERR_PRINT_ON;
} }
TEST_CASE("[Marshalls] NIL Variant decoding") { TEST_CASE("[Marshalls] NIL Variant decoding") {

20
tests/core/math/test_aabb.h
View file

@ -299,34 +299,28 @@ TEST_CASE("[AABB] Get longest/shortest axis") {
"get_shortest_axis_size() should return the expected value."); "get_shortest_axis_size() should return the expected value.");
} }
#ifndef _MSC_VER
#warning Support tests need to be re-done
#endif
/* Support function was actually broken. As it was fixed, the tests now fail. Tests need to be re-done.
TEST_CASE("[AABB] Get support") { TEST_CASE("[AABB] Get support") {
const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6)); const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
CHECK_MESSAGE( CHECK_MESSAGE(
aabb.get_support(Vector3(1, 0, 0)).is_equal_approx(Vector3(-1.5, 7, 3.5)), aabb.get_support(Vector3(1, 0, 0)).is_equal_approx(Vector3(2.5, 2, -2.5)),
"get_support() should return the expected value."); "get_support() should return the expected value.");
CHECK_MESSAGE( CHECK_MESSAGE(
aabb.get_support(Vector3(0.5, 1, 0)).is_equal_approx(Vector3(-1.5, 2, 3.5)), aabb.get_support(Vector3(0.5, 1, 0)).is_equal_approx(Vector3(2.5, 7, -2.5)),
"get_support() should return the expected value."); "get_support() should return the expected value.");
CHECK_MESSAGE( CHECK_MESSAGE(
aabb.get_support(Vector3(0.5, 1, -400)).is_equal_approx(Vector3(-1.5, 2, 3.5)), aabb.get_support(Vector3(0.5, 1, -400)).is_equal_approx(Vector3(2.5, 7, -2.5)),
"get_support() should return the expected value."); "get_support() should return the expected value.");
CHECK_MESSAGE( CHECK_MESSAGE(
aabb.get_support(Vector3(0, -1, 0)).is_equal_approx(Vector3(2.5, 7, 3.5)), aabb.get_support(Vector3(0, -1, 0)).is_equal_approx(Vector3(-1.5, 2, -2.5)),
"get_support() should return the expected value."); "get_support() should return the expected value.");
CHECK_MESSAGE( CHECK_MESSAGE(
aabb.get_support(Vector3(0, -0.1, 0)).is_equal_approx(Vector3(2.5, 7, 3.5)), aabb.get_support(Vector3(0, -0.1, 0)).is_equal_approx(Vector3(-1.5, 2, -2.5)),
"get_support() should return the expected value."); "get_support() should return the expected value.");
CHECK_MESSAGE( CHECK_MESSAGE(
aabb.get_support(Vector3()).is_equal_approx(Vector3(2.5, 7, 3.5)), aabb.get_support(Vector3()).is_equal_approx(Vector3(-1.5, 2, -2.5)),
"get_support() should return the expected value with a null vector."); "get_support() should return the expected value with a null vector.");
} }
*/
TEST_CASE("[AABB] Grow") { TEST_CASE("[AABB] Grow") {
const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6)); const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
CHECK_MESSAGE( CHECK_MESSAGE(

4
tests/core/object/test_class_db.h
View file

@ -493,13 +493,13 @@ void add_exposed_classes(Context &r_context) {
} }
if (!ClassDB::is_class_exposed(class_name)) { if (!ClassDB::is_class_exposed(class_name)) {
MESSAGE(vformat("Ignoring class '%s' because it's not exposed.", class_name).utf8().get_data()); MESSAGE(vformat("Ignoring class '%s' because it's not exposed.", class_name));
class_list.pop_front(); class_list.pop_front();
continue; continue;
} }
if (!ClassDB::is_class_enabled(class_name)) { if (!ClassDB::is_class_enabled(class_name)) {
MESSAGE(vformat("Ignoring class '%s' because it's not enabled.", class_name).utf8().get_data()); MESSAGE(vformat("Ignoring class '%s' because it's not enabled.", class_name));
class_list.pop_front(); class_list.pop_front();
continue; continue;
} }

1
tests/core/object/test_method_bind.h
View file

@ -155,7 +155,6 @@ public:
TEST_CASE("[MethodBind] check all method binds") { TEST_CASE("[MethodBind] check all method binds") {
MethodBindTester *mbt = memnew(MethodBindTester); MethodBindTester *mbt = memnew(MethodBindTester);
print_line("testing method bind");
mbt->run_tests(); mbt->run_tests();
CHECK(mbt->test_valid[MethodBindTester::TEST_METHOD]); CHECK(mbt->test_valid[MethodBindTester::TEST_METHOD]);

4
tests/core/string/test_string.h
View file

@ -697,7 +697,9 @@ TEST_CASE("[String] sprintf") {
format = "fish %-05d frog"; format = "fish %-05d frog";
args.clear(); args.clear();
args.push_back(-5); args.push_back(-5);
ERR_PRINT_OFF; // Silence warning about 0 ignored.
output = format.sprintf(args, &error); output = format.sprintf(args, &error);
ERR_PRINT_ON;
REQUIRE(error == false); REQUIRE(error == false);
CHECK(output == String("fish -5 frog")); CHECK(output == String("fish -5 frog"));
@ -795,7 +797,9 @@ TEST_CASE("[String] sprintf") {
format = "fish %-011f frog"; format = "fish %-011f frog";
args.clear(); args.clear();
args.push_back(-99.99); args.push_back(-99.99);
ERR_PRINT_OFF; // Silence warning about 0 ignored.
output = format.sprintf(args, &error); output = format.sprintf(args, &error);
ERR_PRINT_ON;
REQUIRE(error == false); REQUIRE(error == false);
CHECK(output == String("fish -99.990000 frog")); CHECK(output == String("fish -99.990000 frog"));

2
tests/core/templates/test_hash_set.h
View file

@ -38,7 +38,6 @@
namespace TestHashSet { namespace TestHashSet {
TEST_CASE("[HashSet] Insert element") { TEST_CASE("[HashSet] Insert element") {
print_line("SMALL BEGIN MEM: ", Memory::get_mem_usage());
HashSet<int> set; HashSet<int> set;
HashSet<int>::Iterator e = set.insert(42); HashSet<int>::Iterator e = set.insert(42);
@ -47,7 +46,6 @@ TEST_CASE("[HashSet] Insert element") {
CHECK(set.has(42)); CHECK(set.has(42));
CHECK(set.find(42)); CHECK(set.find(42));
set.reset(); set.reset();
print_line("SMALL END MEM: ", Memory::get_mem_usage());
} }
TEST_CASE("[HashSet] Insert existing element") { TEST_CASE("[HashSet] Insert existing element") {

4
tests/core/templates/test_vector.h
View file

@ -291,8 +291,10 @@ TEST_CASE("[Vector] Slice") {
CHECK(slice6[1] == 3); CHECK(slice6[1] == 3);
CHECK(slice6[2] == 4); CHECK(slice6[2] == 4);
ERR_PRINT_OFF;
Vector<int> slice7 = vector.slice(5, 1); Vector<int> slice7 = vector.slice(5, 1);
CHECK(slice7.size() == 0); CHECK(slice7.size() == 0); // Expected to fail.
ERR_PRINT_ON;
} }
TEST_CASE("[Vector] Find, has") { TEST_CASE("[Vector] Find, has") {

9
tests/scene/test_sprite_frames.h
View file

@ -144,7 +144,7 @@ TEST_CASE("[SpriteFrames] Animation Speed getter and setter") {
frames.get_animation_speed(test_animation_name) == 5.0, frames.get_animation_speed(test_animation_name) == 5.0,
"Sets new animation to default speed"); "Sets new animation to default speed");
frames.set_animation_speed("GodotTest", 123.0004); frames.set_animation_speed(test_animation_name, 123.0004);
CHECK_MESSAGE( CHECK_MESSAGE(
frames.get_animation_speed(test_animation_name) == 123.0004, frames.get_animation_speed(test_animation_name) == 123.0004,
@ -197,7 +197,7 @@ TEST_CASE("[SpriteFrames] Animation Loop getter and setter") {
} }
// TODO // TODO
TEST_CASE("[SpriteFrames] Frame addition, removal, and retrival") { TEST_CASE("[SpriteFrames] Frame addition, removal, and retrieval") {
Ref<Texture2D> dummy_frame1; Ref<Texture2D> dummy_frame1;
dummy_frame1.instantiate(); dummy_frame1.instantiate();
@ -212,13 +212,14 @@ TEST_CASE("[SpriteFrames] Frame addition, removal, and retrival") {
frames.add_frame(test_animation_name, dummy_frame1, 0); frames.add_frame(test_animation_name, dummy_frame1, 0);
frames.add_frame(test_animation_name, dummy_frame1, 1); frames.add_frame(test_animation_name, dummy_frame1, 1);
frames.add_frame(test_animation_name, dummy_frame1, 2);
CHECK_MESSAGE( CHECK_MESSAGE(
frames.get_frame_count(test_animation_name) == 2, frames.get_frame_count(test_animation_name) == 3,
"Adds multiple frames"); "Adds multiple frames");
frames.remove_frame(test_animation_name, 0);
frames.remove_frame(test_animation_name, 1); frames.remove_frame(test_animation_name, 1);
frames.remove_frame(test_animation_name, 0);
CHECK_MESSAGE( CHECK_MESSAGE(
frames.get_frame_count(test_animation_name) == 1, frames.get_frame_count(test_animation_name) == 1,

18
tests/scene/test_theme.h
View file

@ -101,18 +101,24 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Good theme type names") {
SUBCASE("set_type_variation") { SUBCASE("set_type_variation") {
for (const StringName &name : names) { for (const StringName &name : names) {
if (name == StringName()) { // Skip empty here, not allowed.
continue;
}
Ref<Theme> theme = memnew(Theme); Ref<Theme> theme = memnew(Theme);
ErrorDetector ed; ErrorDetector ed;
theme->set_type_variation(valid_type_name, name); theme->set_type_variation(valid_type_name, name);
CHECK(ed.has_error == (name == StringName())); CHECK_FALSE(ed.has_error);
} }
for (const StringName &name : names) { for (const StringName &name : names) {
if (name == StringName()) { // Skip empty here, not allowed.
continue;
}
Ref<Theme> theme = memnew(Theme); Ref<Theme> theme = memnew(Theme);
ErrorDetector ed; ErrorDetector ed;
theme->set_type_variation(name, valid_type_name); theme->set_type_variation(name, valid_type_name);
CHECK(ed.has_error == (name == StringName())); CHECK_FALSE(ed.has_error);
} }
} }
} }
@ -125,6 +131,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme type names") {
String::utf8("contains_汉字"), String::utf8("contains_汉字"),
}; };
ERR_PRINT_OFF; // All these rightfully print errors.
SUBCASE("add_type") { SUBCASE("add_type") {
for (const StringName &name : names) { for (const StringName &name : names) {
Ref<Theme> theme = memnew(Theme); Ref<Theme> theme = memnew(Theme);
@ -175,6 +183,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme type names") {
CHECK(ed.has_error); CHECK(ed.has_error);
} }
} }
ERR_PRINT_ON;
} }
TEST_CASE_FIXTURE(Fixture, "[Theme] Good theme item names") { TEST_CASE_FIXTURE(Fixture, "[Theme] Good theme item names") {
@ -223,6 +233,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme item names") {
String::utf8("contains_汉字"), String::utf8("contains_汉字"),
}; };
ERR_PRINT_OFF; // All these rightfully print errors.
SUBCASE("set_theme_item") { SUBCASE("set_theme_item") {
for (const StringName &name : names) { for (const StringName &name : names) {
for (const DataEntry &entry : valid_data) { for (const DataEntry &entry : valid_data) {
@ -250,6 +262,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme item names") {
} }
} }
} }
ERR_PRINT_ON;
} }
} // namespace TestTheme } // namespace TestTheme