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

20
src/it/test_ifs/test_xdg_surface.rs
View file

@ -2,8 +2,11 @@ use {
crate::{
ifs::wl_surface::xdg_surface::XdgSurface,
it::{
test_error::TestError, test_ifs::test_xdg_toplevel::TestXdgToplevel,
test_object::TestObject, test_transport::TestTransport, testrun::ParseFull,
test_error::TestError,
test_ifs::test_xdg_toplevel::TestXdgToplevel,
test_object::{Deleted, TestObject},
test_transport::TestTransport,
testrun::ParseFull,
},
utils::buffd::MsgParser,
wire::{xdg_surface::*, XdgSurfaceId},
@ -17,17 +20,21 @@ pub struct TestXdgSurface {
pub server: Rc<XdgSurface>,
pub destroyed: Cell<bool>,
pub last_serial: Cell<u32>,
pub deleted: Deleted,
}
impl TestXdgSurface {
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_toplevel(&self) -> Result<Rc<TestXdgToplevel>, TestError> {
let id = self.tran.id();
self.deleted.check()?;
self.tran.send(GetToplevel {
self_id: self.id,
id,
@ -40,6 +47,7 @@ impl TestXdgSurface {
tran: self.tran.clone(),
destroyed: Cell::new(false),
server,
deleted: Default::default(),
width: Cell::new(0),
height: Cell::new(0),
states: Default::default(),
@ -49,11 +57,13 @@ impl TestXdgSurface {
Ok(tl)
}
pub fn ack_configure(&self, serial: u32) {
pub fn ack_configure(&self, serial: u32) -> Result<(), TestError> {
self.deleted.check()?;
self.tran.send(AckConfigure {
self_id: self.id,
serial,
});
Ok(())
}
fn handle_configure(&self, parser: MsgParser<'_, '_>) -> Result<(), TestError> {
@ -65,7 +75,7 @@ impl TestXdgSurface {
impl Drop for TestXdgSurface {
fn drop(&mut self) {
self.destroy();
let _ = self.destroy();
}
}