Update itest so that duplicate() copies Rust properties

Additionally test `#[var(usage_flags = [STORAGE])]`, as well as basic `#[var]` which is ignored.

Remove Area2D from codegen again.

Author: Bromeon

godot-codegen/src/special_cases/codegen_special_cases.rs

@@ -190,8 +190,4 @@ const SELECTED_CLASSES: &[&str] = &[
     "Time", // usage: enum_test.enum_hash()
     "HTTPRequest",
     "ResourceFormatLoader", // TODO: replace?
-    //
-    // Collision
-    "CollisionObject2D",
-    "Area2D",
 ];

itest/rust/src/object_tests/property_template_test.rs

@@ -107,6 +107,11 @@ fn property_template_test(ctx: &TestContext) {
                 "mismatch in property {name}:\n  GDScript: {gdscript_prop:?}\n  Rust:     {rust_prop:?}"
             ));
         }
+        /*else { // Keep around for debugging.
+            println!(
+                "good property {name}:\n  GDScript: {gdscript_prop:?}\n  Rust:     {rust_prop:?}"
+            );
+        }*/
     }
 
     rust_properties.free();

itest/rust/src/object_tests/property_test.rs

@@ -5,8 +5,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use godot::builtin::{dict, Color, Dictionary, GString, StringName, Variant, VariantType};
-use godot::classes::{Area2D, INode, IRefCounted, Node, Object, RefCounted, Resource, Texture};
+use godot::builtin::{dict, Color, Dictionary, GString, Variant, VariantType};
+use godot::classes::{INode, IRefCounted, Node, Object, RefCounted, Resource, Texture};
 use godot::global::{PropertyHint, PropertyUsageFlags};
 use godot::meta::{GodotConvert, PropertyHintInfo, ToGodot};
 use godot::obj::{Base, EngineBitfield, EngineEnum, Gd, NewAlloc, NewGd, OnEditor};
@@ -538,66 +538,60 @@ fn test_var_with_renamed_funcs() {
     obj.free();
 }
 
+// ----------------------------------------------------------------------------------------------------------------------------------------------
+
 #[derive(GodotClass)]
 #[class(init, base=Node)]
-struct SomeDuplicator {
-    #[var]
-    int_val: i32,
+struct Duplicator {
+    // #[export] would also make tests pass, but #[export(storage)] additionally hides the properties from the editor.
+    // See https://docs.godotengine.org/en/stable/tutorials/scripting/gdscript/gdscript_exports.html#export-storage.
+    #[export(storage)]
+    int_export: i32,
 
+    // Low-level #[var] should also work.
+    #[var(usage_flags = [STORAGE])]
+    int_var: i32,
+
+    // Not copied because not marked as serialize ("storage").
     #[var]
+    int_ignored: i32,
+
+    #[export(storage)]
     optional_node: Option<Gd<Node>>,
 
-    #[export]
+    #[export(storage)]
     oneditor_node: OnEditor<Gd<Node>>,
-
-    #[export]
-    oneditor_area: OnEditor<Gd<Area2D>>,
 }
 
 #[itest]
-fn test_some_duplicator() {
-    let mut obj = SomeDuplicator::new_alloc();
-    obj.bind_mut().int_val = 5;
-
-    let some_node = Node::new_alloc();
-    obj.bind_mut().optional_node = Some(some_node.clone());
-
-    let mut editor_node = Node::new_alloc();
-    editor_node.set_name("test");
-    obj.bind_mut().oneditor_node.init(editor_node);
-
-    let mut some_area = Area2D::new_alloc();
-    some_area.set_collision_layer(1);
-    some_area.set_collision_mask(1);
-    obj.bind_mut().oneditor_area.init(some_area);
-    assert_eq!(obj.bind().oneditor_area.get_collision_layer(), 1);
-    assert_eq!(obj.bind().oneditor_area.get_collision_mask(), 1);
+fn test_duplicate_retains_properties() {
+    let optional_node = Node::new_alloc();
+    let oneditor_node = Node::new_alloc();
 
-    let duplicated_obj = obj.duplicate();
-    let duplicated_obj: Gd<SomeDuplicator> = duplicated_obj.unwrap().cast();
+    // Set up original node.
+    let mut original = Duplicator::new_alloc();
+    {
+        let mut original = original.bind_mut();
+        original.int_export = 5;
+        original.int_var = 7;
+        original.int_ignored = 9; // Will not be copied.
+        original.optional_node = Some(optional_node.clone());
+        original.oneditor_node.init(oneditor_node.clone());
+    }
 
+    // Create duplicate and verify all properties are copied correctly.
+    let duplicated: Gd<Duplicator> = original.duplicate().unwrap().cast();
     {
-        let duplicated = duplicated_obj.bind();
-        assert_eq!(duplicated.int_val, 5);
-        assert_eq!(
-            duplicated.optional_node.as_ref().unwrap().instance_id(),
-            some_node.instance_id()
-        );
-        assert_eq!(
-            duplicated.optional_node.as_ref().unwrap().get_name(),
-            StringName::from("renamed")
-        );
-
-        assert_eq!(
-            duplicated.oneditor_node.get_name(),
-            StringName::from("test")
-        );
-
-        assert_eq!(duplicated.oneditor_area.get_collision_layer(), 1);
-        assert_eq!(duplicated.oneditor_area.get_collision_mask(), 1);
+        let duplicated = duplicated.bind();
+        assert_eq!(duplicated.int_export, 5);
+        assert_eq!(duplicated.int_var, 7);
+        assert_eq!(duplicated.int_ignored, 0); // Not copied.
+        assert_eq!(duplicated.optional_node.as_ref().unwrap(), &optional_node);
+        assert_eq!(&*duplicated.oneditor_node, &oneditor_node);
     }
 
-    some_node.free();
-    duplicated_obj.free();
-    obj.free();
+    optional_node.free();
+    oneditor_node.free();
+    duplicated.free();
+    original.free();
 }