entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

it: track whether objects have been deleted

Browse source
This commit is contained in:
Julian Orth 2022-05-03 15:54:32 +02:00
parent cdab4d4cad
commit 6af9d909b8
22 changed files with 167 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/it/test_ifs/test_xdg_base.rs
View file

@ -1,8 +1,11 @@
use {
crate::{
it::{
test_error::TestError, test_ifs::test_xdg_surface::TestXdgSurface,
test_object::TestObject, test_transport::TestTransport, testrun::ParseFull,
test_error::TestError,
test_ifs::test_xdg_surface::TestXdgSurface,
test_object::{Deleted, TestObject},
test_transport::TestTransport,
testrun::ParseFull,
},
utils::buffd::MsgParser,
wire::{xdg_wm_base::*, WlSurfaceId, XdgWmBaseId},
@ -14,13 +17,16 @@ pub struct TestXdgWmBase {
pub id: XdgWmBaseId,
pub tran: Rc<TestTransport>,
pub destroyed: Cell<bool>,
pub deleted: Deleted,
}
impl TestXdgWmBase {
pub fn destroy(&self) {
pub fn destroy(&self) -> Result<(), TestError> {
if !self.destroyed.replace(true) {
self.deleted.check()?;
self.tran.send(Destroy { self_id: self.id });
}
Ok(())
}
pub async fn create_xdg_surface(
@ -28,6 +34,7 @@ impl TestXdgWmBase {
surface: WlSurfaceId,
) -> Result<Rc<TestXdgSurface>, TestError> {
let id = self.tran.id();
self.deleted.check()?;
self.tran.send(GetXdgSurface {
self_id: self.id,
id,
@ -42,6 +49,7 @@ impl TestXdgWmBase {
server,
destroyed: Cell::new(false),
last_serial: Cell::new(0),
deleted: Default::default(),
});
self.tran.add_obj(xdg.clone())?;
Ok(xdg)
@ -63,6 +71,6 @@ impl TestObject for TestXdgWmBase {}
impl Drop for TestXdgWmBase {
fn drop(&mut self) {
self.destroy();
let _ = self.destroy();
}
}