add a test for _input, rename some stuff in TestContext

Author: lilizoey

godot-codegen/src/lib.rs

@@ -278,6 +278,8 @@ const SELECTED_CLASSES: &[&str] = &[
     "Image",
     "ImageTextureLayered",
     "Input",
+    "InputEvent",
+    "InputEventAction",
     "Label",
     "MainLoop",
     "Marker2D",
@@ -303,4 +305,6 @@ const SELECTED_CLASSES: &[&str] = &[
     "TextureLayered",
     "Time",
     "Timer",
+    "Window",
+    "Viewport",
 ];

itest/godot/TestRunner.gd

@@ -38,7 +38,9 @@ func _ready():
 		gdscript_tests,
 		gdscript_suites.size(),
 		allow_focus,
+		get_tree().root,
 		self,
+		get_tree()
 	)
 
 	var exit_code: int = 0 if success else 1

itest/rust/src/lib.rs

@@ -4,9 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use godot::engine::{Engine, Node};
+use godot::engine::{Engine, Node, Window};
 use godot::init::{gdextension, ExtensionLibrary};
 use godot::obj::Gd;
+use godot::prelude::SceneTree;
 use godot::sys;
 
 mod array_test;
@@ -103,7 +104,9 @@ fn collect_rust_tests() -> (Vec<RustTestCase>, usize, bool) {
 }
 
 pub struct TestContext {
-    scene_tree: Gd<Node>,
+    _scene_tree: Gd<SceneTree>,
+    root_node: Gd<Window>,
+    test_node: Gd<Node>,
 }
 
 #[derive(Copy, Clone)]

itest/rust/src/node_test.rs

@@ -85,7 +85,7 @@ fn node_scene_tree() {
 // FIXME: call_group() crashes
 #[itest(skip)]
 fn node_call_group(ctx: &TestContext) {
-    let mut node = ctx.scene_tree.share();
+    let mut node = ctx.test_node.share();
     let mut tree = node.get_tree().unwrap();
 
     node.add_to_group("group".into(), true);

itest/rust/src/object_test.rs

@@ -614,7 +614,7 @@ fn object_call_with_args() {
 fn object_get_scene_tree(ctx: &TestContext) {
     let node = Node3D::new_alloc();
 
-    let mut tree = ctx.scene_tree.share();
+    let mut tree = ctx.test_node.share();
     tree.add_child(node.upcast(), false, InternalMode::INTERNAL_MODE_DISABLED);
 
     let count = tree.get_child_count(false);

itest/rust/src/runner.rs

@@ -8,8 +8,9 @@ use std::time::{Duration, Instant};
 
 use godot::bind::{godot_api, GodotClass};
 use godot::builtin::{ToVariant, Variant, VariantArray};
-use godot::engine::Node;
+use godot::engine::{Node, Window};
 use godot::obj::Gd;
+use godot::prelude::SceneTree;
 
 use crate::{RustTestCase, TestContext};
 
@@ -31,7 +32,9 @@ impl IntegrationTests {
         gdscript_tests: VariantArray,
         gdscript_file_count: i64,
         allow_focus: bool,
-        scene_tree: Gd<Node>,
+        root_node: Gd<Window>,
+        test_node: Gd<Node>,
+        scene_tree: Gd<SceneTree>,
     ) -> bool {
         println!("{}Run{} Godot integration tests...", FMT_CYAN_BOLD, FMT_END);
 
@@ -54,7 +57,7 @@ impl IntegrationTests {
         }
 
         let clock = Instant::now();
-        self.run_rust_tests(rust_tests, scene_tree);
+        self.run_rust_tests(rust_tests, root_node, test_node, scene_tree);
         let rust_time = clock.elapsed();
         let gdscript_time = if !focus_run {
             self.run_gdscript_tests(gdscript_tests);
@@ -66,8 +69,18 @@ impl IntegrationTests {
         self.conclude(rust_time, gdscript_time, allow_focus)
     }
 
-    fn run_rust_tests(&mut self, tests: Vec<RustTestCase>, scene_tree: Gd<Node>) {
-        let ctx = TestContext { scene_tree };
+    fn run_rust_tests(
+        &mut self,
+        tests: Vec<RustTestCase>,
+        root_node: Gd<Window>,
+        test_node: Gd<Node>,
+        scene_tree: Gd<SceneTree>,
+    ) {
+        let ctx = TestContext {
+            _scene_tree: scene_tree,
+            root_node,
+            test_node,
+        };
 
         let mut last_file = None;
         for test in tests {

itest/rust/src/virtual_methods_test.rs

@@ -10,7 +10,9 @@ use crate::TestContext;
 use godot::bind::{godot_api, GodotClass};
 use godot::builtin::GodotString;
 use godot::engine::node::InternalMode;
-use godot::engine::{Node, Node2D, Node2DVirtual, RefCounted, RefCountedVirtual};
+use godot::engine::{
+    InputEvent, InputEventAction, Node, Node2D, Node2DVirtual, RefCounted, RefCountedVirtual,
+};
 use godot::obj::{Base, Gd, Share};
 use godot::test::itest;
 
@@ -91,6 +93,30 @@ impl Node2DVirtual for TreeVirtualTest {
     }
 }
 
+#[derive(GodotClass, Debug)]
+#[class(base=Node2D)]
+struct InputVirtualTest {
+    #[base]
+    base: Base<Node2D>,
+    event: Option<Gd<InputEvent>>,
+}
+
+#[godot_api]
+impl Node2DVirtual for InputVirtualTest {
+    fn init(base: Base<Node2D>) -> Self {
+        InputVirtualTest { base, event: None }
+    }
+
+    fn input(&mut self, event: Gd<InputEvent>) {
+        println!("nya");
+        self.event = Some(event);
+    }
+
+    fn process(&mut self, delta: f64) {
+        println!("proc! {delta}");
+    }
+}
+
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 
 #[itest]
@@ -104,7 +130,7 @@ fn test_ready(test_context: &TestContext) {
     assert_eq!(obj.bind().implementation_value, 0);
 
     // Add to scene tree
-    let mut test_node = test_context.scene_tree.share();
+    let mut test_node = test_context.test_node.share();
     test_node.add_child(
         obj.share().upcast(),
         false,
@@ -120,7 +146,7 @@ fn test_ready_multiple_fires(test_context: &TestContext) {
     let obj = Gd::<ReadyVirtualTest>::new_default();
     assert_eq!(obj.bind().implementation_value, 0);
 
-    let mut test_node = test_context.scene_tree.share();
+    let mut test_node = test_context.test_node.share();
 
     // Add to scene tree
     test_node.add_child(
@@ -149,7 +175,7 @@ fn test_ready_request_ready(test_context: &TestContext) {
     let obj = Gd::<ReadyVirtualTest>::new_default();
     assert_eq!(obj.bind().implementation_value, 0);
 
-    let mut test_node = test_context.scene_tree.share();
+    let mut test_node = test_context.test_node.share();
 
     // Add to scene tree
     test_node.add_child(
@@ -192,7 +218,7 @@ fn test_tree_enters_exits(test_context: &TestContext) {
     let obj = Gd::<TreeVirtualTest>::new_default();
     assert_eq!(obj.bind().tree_enters, 0);
     assert_eq!(obj.bind().tree_exits, 0);
-    let mut test_node = test_context.scene_tree.share();
+    let mut test_node = test_context.test_node.share();
 
     // Add to scene tree
     test_node.add_child(
@@ -215,3 +241,27 @@ fn test_tree_enters_exits(test_context: &TestContext) {
     assert_eq!(obj.bind().tree_enters, 2);
     assert_eq!(obj.bind().tree_exits, 1);
 }
+
+#[itest]
+fn test_input_event(test_context: &TestContext) {
+    let obj = Gd::<InputVirtualTest>::new_default();
+    assert_eq!(obj.bind().event, None);
+
+    // Add to scene tree
+    test_context.test_node.share().add_child(
+        obj.share().upcast(),
+        false,
+        InternalMode::INTERNAL_MODE_DISABLED,
+    );
+
+    let mut event = InputEventAction::new();
+    event.set_action("debug".into());
+    event.set_pressed(true);
+
+    test_context
+        .root_node
+        .share()
+        .push_input(event.share().upcast(), false);
+
+    assert_eq!(obj.bind().event, Some(event.upcast()));
+}