fix tests

Author: NailxSharipov

iOverlay/src/vector/extract.rs

@@ -405,7 +405,7 @@ mod tests {
         #[rustfmt::skip]
         let subj = int_shape![
             [[2, 3], [3, 3], [3, 4], [2, 4]],
-            [[1, 3], [1, 4], [2, 4], [1, 3]]
+            [[1, 3], [1, 4], [2, 4], [2, 3]]
         ];
         let mut buffer = Default::default();
         let mut overlay = Overlay::with_contours(&subj, &[]);

iOverlay/tests/vector_tests.rs

@@ -33,25 +33,25 @@ mod tests {
 
         let vectors = &shapes[0][0];
         let template = [
-            VectorEdge {
-                a: IntPoint::new(-10240,-10240),
-                b: IntPoint::new(-10240,10240),
-                fill: 2
-            },
             VectorEdge {
                 a: IntPoint::new(-10240,10240),
-                b: IntPoint::new(10240,10240),
-                fill: 2
+                b: IntPoint::new(-10240,-10240),
+                fill: 1
             },
             VectorEdge {
-                a: IntPoint::new(10240,10240),
+                a: IntPoint::new(-10240,-10240),
                 b: IntPoint::new(10240,-10240),
-                fill: 2
+                fill: 1
             },
             VectorEdge {
                 a: IntPoint::new(10240,-10240),
-                b: IntPoint::new(-10240,-10240),
-                fill: 2
+                b: IntPoint::new(10240,10240),
+                fill: 1
+            },
+            VectorEdge {
+                a: IntPoint::new(10240,10240),
+                b: IntPoint::new(-10240,10240),
+                fill: 1
             }
         ];
 
@@ -78,42 +78,42 @@ mod tests {
         overlay.add_contour(&subj, ShapeType::Subject);
         overlay.add_contour(&clip, ShapeType::Clip);
 
-        let shapes = overlay.build_shape_vectors(FillRule::NonZero, OverlayRule::Subject);
+        let shapes = overlay.build_shape_vectors(FillRule::NonZero, OverlayRule::Difference);
 
         assert_eq!(shapes.len(), 1);
         assert_eq!(shapes[0].len(), 1);
 
         let vectors = &shapes[0][0];
         let template = [
-            VectorEdge {
-                a: IntPoint::new(-10240,-10240),
-                b: IntPoint::new(-10240,10240),
-                fill: 2
-            },
             VectorEdge {
                 a: IntPoint::new(-10240,10240),
-                b: IntPoint::new(-5120,10240),
-                fill: 2
+                b: IntPoint::new(-10240,-10240),
+                fill: 1
             },
             VectorEdge {
-                a: IntPoint::new(-5120,10240),
-                b: IntPoint::new(10240,10240),
-                fill: 14
+                a: IntPoint::new(-10240,-10240),
+                b: IntPoint::new(10240,-10240),
+                fill: 1
             },
             VectorEdge {
-                a: IntPoint::new(10240,10240),
+                a: IntPoint::new(10240,-10240),
                 b: IntPoint::new(10240,-5120),
-                fill: 14
+                fill: 1
             },
             VectorEdge {
                 a: IntPoint::new(10240,-5120),
-                b: IntPoint::new(10240,-10240),
-                fill: 2
+                b: IntPoint::new(-5120,-5120),
+                fill: 11
             },
             VectorEdge {
-                a: IntPoint::new(10240,-10240),
-                b: IntPoint::new(-10240,-10240),
-                fill: 2
+                a: IntPoint::new(-5120,-5120),
+                b: IntPoint::new(-5120,10240),
+                fill: 11
+            },
+            VectorEdge {
+                a: IntPoint::new(-5120,10240),
+                b: IntPoint::new(-10240,10240),
+                fill: 1
             }
         ];