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

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

@ -1,11 +1,7 @@
use {
crate::{
ifs::wl_region::WlRegion,
it::{
test_error::TestError,
test_object::{Deleted, TestObject},
test_transport::TestTransport,
},
it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
rect::{Rect, RegionBuilder},
wire::{wl_region::*, WlRegionId},
},
@ -19,22 +15,19 @@ pub struct TestRegion {
pub id: WlRegionId,
pub tran: Rc<TestTransport>,
pub destroyed: Cell<bool>,
pub deleted: Deleted,
pub server: Rc<WlRegion>,
pub expected: RefCell<RegionBuilder>,
}
impl TestRegion {
pub fn destroy(&self) -> Result<(), TestError> {
self.deleted.check()?;
if !self.destroyed.replace(true) {
self.tran.send(Destroy { self_id: self.id });
self.tran.send(Destroy { self_id: self.id })?;
}
Ok(())
}
pub fn add(&self, rect: Rect) -> Result<(), TestError> {
self.deleted.check()?;
self.expected.borrow_mut().add(rect);
self.tran.send(Add {
self_id: self.id,
@ -42,12 +35,11 @@ impl TestRegion {
y: rect.y1(),
width: rect.width(),
height: rect.height(),
});
})?;
Ok(())
}
pub fn subtract(&self, rect: Rect) -> Result<(), TestError> {
self.deleted.check()?;
self.expected.borrow_mut().sub(rect);
self.tran.send(Subtract {
self_id: self.id,
@ -55,7 +47,7 @@ impl TestRegion {
y: rect.y1(),
width: rect.width(),
height: rect.height(),
});
})?;
Ok(())
}