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

it: simplify tracking of deleted objects

Browse source
This commit is contained in:
Julian Orth 2022-05-03 17:31:44 +02:00
parent ae34a65efe
commit fd027d9a5a
17 changed files with 57 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/it/test_ifs/test_compositor.rs
View file

@ -3,7 +3,7 @@ use {
it::{
test_error::TestError,
test_ifs::{test_region::TestRegion, test_surface::TestSurface},
test_object::{Deleted, TestObject},
test_object::TestObject,
test_transport::TestTransport,
},
wire::{
@ -17,17 +17,15 @@ use {
pub struct TestCompositor {
pub id: WlCompositorId,
pub tran: Rc<TestTransport>,
pub deleted: Deleted,
}
impl TestCompositor {
pub async fn create_surface(&self) -> Result<Rc<TestSurface>, TestError> {
let id = self.tran.id();
self.deleted.check()?;
self.tran.send(CreateSurface {
self_id: self.id,
id,
});
})?;
self.tran.sync().await;
let client = self.tran.get_client()?;
let server = client.lookup(id)?;
@ -36,7 +34,6 @@ impl TestCompositor {
tran: self.tran.clone(),
server,
destroyed: Cell::new(false),
deleted: Default::default(),
});
self.tran.add_obj(surface.clone())?;
Ok(surface)
@ -44,11 +41,10 @@ impl TestCompositor {
pub async fn create_region(&self) -> Result<Rc<TestRegion>, TestError> {
let id = self.tran.id();
self.deleted.check()?;
self.tran.send(CreateRegion {
self_id: self.id,
id,
});
})?;
self.tran.sync().await;
let client = self.tran.get_client()?;
let server = client.lookup(id)?;
@ -57,7 +53,6 @@ impl TestCompositor {
tran: self.tran.clone(),
server,
destroyed: Cell::new(false),
deleted: Default::default(),
expected: Default::default(),
});
self.tran.add_obj(region.clone())?;