# HG changeset patch
# User alfadur
# Date 1553630130 -10800
# Node ID 766ce87dfdfcc705bea8e3e6cf1c5279c7e229d3
# Parent  c97faf0aef7877422819438bba7920a57d33f73b
finetune atlas proptest

diff -r c97faf0aef78 -r 766ce87dfdfc rust/lib-hedgewars-engine/src/render/atlas.rs
--- a/rust/lib-hedgewars-engine/src/render/atlas.rs	Tue Mar 26 22:29:48 2019 +0300
+++ b/rust/lib-hedgewars-engine/src/render/atlas.rs	Tue Mar 26 22:55:30 2019 +0300
@@ -224,7 +224,7 @@
 
         let rect_size = Size::new(11, 3);
         let rect = atlas.insert(rect_size).unwrap();
-        
+
         assert_eq!(rect, Rect::at_origin(rect_size));
         assert_eq!(2, atlas.free_rects.len());
     }
@@ -274,11 +274,14 @@
     proptest! {
         #[test]
         fn prop_insert(rects in Vec::<TestRect>::arbitrary()) {
-            let mut atlas = Atlas::new(Size::square(2048));
-            let inserted: Vec<_> = rects.iter().take_while(|TestRect(size)| atlas.insert(*size).is_some()).cloned().collect();
+            let container = Rect::at_origin(Size::square(2048));
+            let mut atlas = Atlas::new(container.size());
+            let inserted: Vec<_> = rects.iter().filter_map(|TestRect(size)| atlas.insert(*size)).collect();
 
-            assert_eq!(inserted.len(), atlas.used_rects.len());
-            assert_eq!(sum_area(&inserted), sum_area(&atlas.used_rects));
+            assert!(inserted.iter().all(|r| container.contains_rect(r)));
+
+            assert_eq!(inserted.len(), rects.len());
+            assert_eq!(sum_area(&inserted), sum_area(&rects));
         }
     }
 }