Skip to content

Commit 895bc4e

Browse files
committed
Upgrade commented-out tests to #[test(skip)]
1 parent 186ccc4 commit 895bc4e

File tree

5 files changed

+40
-36
lines changed

5 files changed

+40
-36
lines changed

itest/rust/src/base_test.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
use crate::itest;
88
use godot::prelude::*;
99

10-
/*
11-
#[itest]
10+
#[itest(skip)]
1211
fn base_test_is_weak() {
13-
let obj = RefCounted::new();
12+
// TODO check that Base is a weak pointer (doesn't keep the object alive)
13+
// This might not be needed, as we have leak detection, but it could highlight regressions faster
1414
}
15-
*/
1615

1716
#[itest]
1817
fn base_instance_id() {

itest/rust/src/node_test.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use crate::itest;
88
use godot::builtin::NodePath;
9-
use godot::engine::{node, Node, Node3D, NodeExt};
9+
use godot::engine::{global, node, Node, Node3D, NodeExt, PackedScene, SceneTree};
1010
use godot::obj::Share;
1111

1212
#[itest]
@@ -54,8 +54,7 @@ fn node_get_node_fail() {
5454
child.free();
5555
}
5656

57-
/*
58-
#[itest]
57+
#[itest(skip)]
5958
fn node_scene_tree() {
6059
let mut child = Node::new_alloc();
6160
child.set_name("kid".into());
@@ -82,4 +81,3 @@ fn node_scene_tree() {
8281
parent.free();
8382
child.free();
8483
}
85-
*/

itest/rust/src/packed_array_test.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ fn packed_array_to_vec() {
4141
assert_eq!(array.to_vec(), vec![1, 2]);
4242
}
4343

44-
// #[itest]
45-
// fn packed_array_into_iterator() {
46-
// let array = Array::from(&[1, 2]);
47-
// let mut iter = array.into_iter();
48-
// assert_eq!(iter.next(), Some(1));
49-
// assert_eq!(iter.next(), Some(2));
50-
// assert_eq!(iter.next(), None);
51-
// }
44+
/*
45+
#[itest(skip)]
46+
fn packed_array_into_iterator() {
47+
let array = PackedByteArray::from(&[1, 2]);
48+
let mut iter = array.into_iter();
49+
assert_eq!(iter.next(), Some(1));
50+
assert_eq!(iter.next(), Some(2));
51+
assert_eq!(iter.next(), None);
52+
}
53+
*/
5254

5355
#[itest]
5456
fn packed_array_eq() {

itest/rust/src/string_test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ fn string_name_default_construct() {
7474
assert_eq!(back, GodotString::new());
7575
}
7676

77-
#[itest]
77+
#[itest(skip)]
7878
fn string_name_eq_hash() {
7979
// TODO
8080
}
8181

82-
#[itest]
82+
#[itest(skip)]
8383
fn string_name_ord() {
8484
// TODO
8585
}
8686

87-
#[itest]
87+
#[itest(skip)]
8888
fn string_name_clone() {
8989
// TODO
9090
}

itest/rust/src/variant_test.rs

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,28 @@ fn variant_sys_conversion() {
245245
assert_eq!(v2, v);
246246
}
247247

248+
#[itest(skip)]
249+
fn variant_sys_conversion2() {
250+
use godot::sys;
251+
252+
// FIXME alignment, maybe use alloc()
253+
let mut buffer = [0u8; 50];
254+
255+
let v = Variant::from(7);
256+
unsafe { v.write_sys(buffer.as_mut_ptr() as sys::GDExtensionTypePtr) };
257+
258+
let v2 = unsafe {
259+
Variant::from_sys_init(|ptr| {
260+
std::ptr::copy(
261+
buffer.as_ptr(),
262+
ptr as *mut u8,
263+
std::mem::size_of_val(&*ptr),
264+
)
265+
})
266+
};
267+
assert_eq!(v2, v);
268+
}
269+
248270
#[itest]
249271
fn variant_null_object_is_nil() {
250272
use godot::sys;
@@ -265,23 +287,6 @@ fn variant_null_object_is_nil() {
265287
node.free();
266288
}
267289

268-
#[itest]
269-
fn variant_sys_conversion2() {
270-
/*
271-
let buffer = [0u8; 50];
272-
273-
let v = Variant::from(7);
274-
unsafe { v.write_sys(buffer.as_mut_ptr()) };
275-
276-
let v2 = unsafe {
277-
Variant::from_sys_init(|ptr| {
278-
std::ptr::copy(buffer.as_ptr(), ptr as *mut u8, std::mem::size_of_val(*ptr))
279-
})
280-
};
281-
assert_eq!(v2, v);
282-
*/
283-
}
284-
285290
#[itest]
286291
fn variant_conversion_fails() {
287292
assert_eq!(

0 commit comments

Comments
 (0)