Remove explicit calls to tests, now handled by #[itest] auto-registration

Author: Bromeon

itest/rust/src/array_test.rs

@@ -7,46 +7,6 @@
 use crate::{expect_panic, itest};
 use godot::prelude::*;
 
-pub fn run() -> bool {
-    let mut ok = true;
-    ok &= array_default();
-    ok &= array_new();
-    ok &= array_eq();
-    ok &= typed_array_from_to_variant();
-    ok &= untyped_array_from_to_variant();
-    ok &= array_from_packed_array();
-    ok &= array_from_iterator();
-    ok &= array_from_slice();
-    ok &= array_try_into_vec();
-    ok &= array_iter_shared();
-    ok &= array_hash();
-    ok &= array_share();
-    ok &= array_duplicate_shallow();
-    ok &= array_duplicate_deep();
-    ok &= array_slice_shallow();
-    ok &= array_slice_deep();
-    ok &= array_get();
-    ok &= array_first_last();
-    ok &= array_binary_search();
-    ok &= array_find();
-    ok &= array_rfind();
-    ok &= array_min_max();
-    ok &= array_pick_random();
-    ok &= array_set();
-    ok &= array_push_pop();
-    ok &= array_insert();
-    ok &= array_extend();
-    ok &= array_reverse();
-    ok &= array_sort();
-    ok &= array_shuffle();
-    ok &= array_mixed_values();
-    ok &= untyped_array_pass_to_godot_func();
-    ok &= untyped_array_return_from_godot_func();
-    ok &= typed_array_pass_to_godot_func();
-    ok &= typed_array_return_from_godot_func();
-    ok
-}
-
 #[itest]
 fn array_default() {
     assert_eq!(Array::default().len(), 0);

itest/rust/src/base_test.rs

@@ -7,17 +7,6 @@
 use crate::itest;
 use godot::prelude::*;
 
-pub(crate) fn run() -> bool {
-    let mut ok = true;
-    ok &= base_instance_id();
-    ok &= base_deref();
-    ok &= base_display();
-    ok &= base_debug();
-    ok &= base_with_init();
-
-    ok
-}
-
 /*
 #[itest]
 fn base_test_is_weak() {

itest/rust/src/builtin_test.rs

@@ -8,14 +8,6 @@ use crate::itest;
 use godot::builtin::inner::*;
 use godot::prelude::*;
 
-pub(crate) fn run() -> bool {
-    let mut ok = true;
-    ok &= test_builtins_vector2();
-    ok &= test_builtins_array();
-    ok &= test_builtins_callable();
-    ok
-}
-
 #[itest]
 fn test_builtins_vector2() {
     let vec = Vector2::new(3.0, -4.0);

itest/rust/src/codegen_test.rs

@@ -12,15 +12,6 @@ use godot::builtin::inner::{InnerColor, InnerString};
 use godot::engine::{FileAccess, HttpRequest};
 use godot::prelude::*;
 
-pub fn run() -> bool {
-    let mut ok = true;
-    ok &= codegen_class_renamed();
-    ok &= codegen_base_renamed();
-    ok &= codegen_static_builtin_method();
-    ok &= codegen_static_class_method();
-    ok
-}
-
 #[itest]
 fn codegen_class_renamed() {
     // Known as `HTTPRequest` in Godot

itest/rust/src/color_test.rs

@@ -7,20 +7,6 @@
 use crate::itest;
 use godot::builtin::{Color, ColorChannelOrder};
 
-pub fn run() -> bool {
-    let mut ok = true;
-    ok &= color_from_rgba8();
-    ok &= color_from_u32();
-    ok &= color_from_u64();
-    ok &= color_from_html();
-    ok &= color_from_string();
-    ok &= color_get_set_u8();
-    ok &= color_blend();
-    ok &= color_to_u32();
-    ok &= color_to_u64();
-    ok
-}
-
 #[itest]
 fn color_from_rgba8() {
     assert_eq!(

itest/rust/src/dictionary_test.rs

@@ -7,43 +7,8 @@
 use std::collections::{HashMap, HashSet};
 
 use crate::{expect_panic, itest};
-use godot::{
-    builtin::{dict, varray, Dictionary, FromVariant, ToVariant},
-    prelude::{Share, Variant},
-};
-
-pub fn run() -> bool {
-    let mut ok = true;
-    ok &= dictionary_default();
-    ok &= dictionary_new();
-    ok &= dictionary_from_iterator();
-    ok &= dictionary_from();
-    ok &= dictionary_macro();
-    ok &= dictionary_clone();
-    ok &= dictionary_duplicate_deep();
-    ok &= dictionary_hash();
-    ok &= dictionary_get();
-    ok &= dictionary_insert();
-    ok &= dictionary_insert_multiple();
-    ok &= dictionary_insert_long();
-    ok &= dictionary_extend();
-    ok &= dictionary_remove();
-    ok &= dictionary_clear();
-    ok &= dictionary_find_key();
-    ok &= dictionary_contains_keys();
-    ok &= dictionary_keys_values();
-    ok &= dictionary_equal();
-    ok &= dictionary_iter();
-    ok &= dictionary_iter_equals_big();
-    ok &= dictionary_iter_insert();
-    ok &= dictionary_iter_insert_after_completion();
-    ok &= dictionary_iter_big();
-    ok &= dictionary_iter_simultaneous();
-    ok &= dictionary_iter_panics();
-    ok &= dictionary_iter_clear();
-    ok &= dictionary_iter_erase();
-    ok
-}
+use godot::builtin::{dict, varray, Dictionary, FromVariant, ToVariant, Variant};
+use godot::obj::Share;
 
 #[itest]
 fn dictionary_default() {

itest/rust/src/enum_test.rs

@@ -9,14 +9,6 @@ use godot::engine::input::CursorShape;
 use godot::engine::time;
 use std::collections::HashSet;
 
-pub fn run() -> bool {
-    let mut ok = true;
-    ok &= enum_ords_correct();
-    ok &= enum_equality();
-    ok &= enum_hash();
-    ok
-}
-
 #[itest]
 fn enum_ords_correct() {
     use godot::obj::EngineEnum;

itest/rust/src/export_test.rs

@@ -6,11 +6,7 @@
 
 use godot::prelude::*;
 
-pub(crate) fn run() -> bool {
-    // No tests currently, tests using HasProperty are in Godot scripts.
-
-    true
-}
+// No tests currently, tests using HasProperty are in Godot scripts.
 
 #[derive(GodotClass)]
 #[class(base=Node)]

itest/rust/src/gdscript_ffi_test.rs

@@ -9,7 +9,3 @@
 #[rustfmt::skip]
 #[path = "gen/gen_ffi.rs"]
 mod gen_ffi;
-
-pub(crate) fn run() -> bool {
-    true
-}

itest/rust/src/lib.rs

@@ -56,8 +56,6 @@ sys::plugin_registry!(__GODOT_ITEST: TestCase);
 // }
 
 fn run_tests() -> bool {
-    let mut ok = true;
-
     let mut tests: Vec<TestCase> = vec![];
 
     sys::plugin_foreach!(__GODOT_ITEST; |test: &TestCase| {
@@ -68,7 +66,6 @@ fn run_tests() -> bool {
 
 
     let mut stats = TestStats::default();
-
     for test in tests {
         stats.tests_run += 1;
         if run_test(&test) {
@@ -82,6 +79,9 @@ fn run_tests() -> bool {
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Implementation
 
+#[gdextension(entry_point=itest_init)]
+unsafe impl ExtensionLibrary for IntegrationTests {}
+
 #[derive(GodotClass, Debug)]
 #[class(base=Node, init)]
 struct IntegrationTests {}
@@ -95,13 +95,17 @@ impl IntegrationTests {
     }
 }
 
-#[gdextension(entry_point=itest_init)]
-unsafe impl ExtensionLibrary for IntegrationTests {}
-
 pub(crate) fn expect_panic(context: &str, code: impl FnOnce() + UnwindSafe) {
     let panic = std::panic::catch_unwind(code);
     assert!(
         panic.is_err(),
         "code should have panicked but did not: {context}",
     );
 }
+
+#[derive(Default)]
+struct TestStats {
+    tests_run: usize,
+    tests_passed: usize,
+    tests_skipped: usize,
+}