tests 2

Author: vatsalkeshav

src/rust/lib_ccxr/src/isdbs/isdbd.rs

@@ -954,19 +954,19 @@ pub const DEFAULT_CLUT: [Rgba; 128] = [
     zata,
 ];
 
-#[repr(C)]
-pub struct disp_area {
-    pub x: c_int,
-    pub y: c_int,
-    pub w: c_int,
-    pub h: c_int,
-}
-
-#[repr(C)]
-pub struct fscale {
-    pub fscx: c_int,
-    pub fscy: c_int,
-}
+// #[repr(C)]
+// pub struct disp_area {
+//     pub x: c_int,
+//     pub y: c_int,
+//     pub w: c_int,
+//     pub h: c_int,
+// }
+
+// #[repr(C)]
+// pub struct fscale {
+//     pub fscx: c_int,
+//     pub fscy: c_int,
+// }
 
 #[repr(C)]
 pub struct spacing {
@@ -993,9 +993,9 @@ pub enum CcxStreamMode {
     Program = 2,
     Asf = 3,
     McPoodlesRaw = 4,
-    Rcwt = 5,     // Raw Captions With Time, not used yet.
-    Myth = 6,     // Use the myth loop
-    Mp4 = 7,      // MP4, ISO-
+    Rcwt = 5, // Raw Captions With Time, not used yet.
+    Myth = 6, // Use the myth loop
+    Mp4 = 7,  // MP4, ISO-
     Wtv = 9,
     Gxf = 11,
     Mkv = 12,
@@ -1013,14 +1013,14 @@ pub enum CcxOutputDateFormat {
 }
 
 pub struct CcxEncodersTranscriptFormat {
-    show_start_time: i32, // Show start and/or end time.
-    show_end_time: i32,   // Show start and/or end time.
-    show_mode: i32,       // Show which mode if available (E.G.: POP, RU1, ...)
-    show_cc: i32,         // Show which CC channel has been captured.
+    show_start_time: i32,    // Show start and/or end time.
+    show_end_time: i32,      // Show start and/or end time.
+    show_mode: i32,          // Show which mode if available (E.G.: POP, RU1, ...)
+    show_cc: i32,            // Show which CC channel has been captured.
     relative_timestamp: i32, // Timestamps relative to start of sample or in UTC?
-    xds: i32,             // Show XDS or not
-    use_colors: i32,      // Add colors or no colors
-    is_final: i32,        // Used to determine if these parameters should be changed afterwards.
+    xds: i32,                // Show XDS or not
+    use_colors: i32,         // Add colors or no colors
+    is_final: i32,           // Used to determine if these parameters should be changed afterwards.
 }
 
 #[repr(i32)]
@@ -1267,4 +1267,4 @@ pub enum CcxStreamModeEnum {
 
 pub struct CcxOptions {
     pub messages_target: i32,
-}
+}

src/rust/lib_ccxr/src/isdbs/tests.rs

@@ -1,4 +1,7 @@
 extern crate libc;
+
+use std::os::raw::{c_char, c_int, c_long, c_uchar, c_uint, c_ulonglong, c_void};
+
 use crate::isdbs::isdbd::*;
 use crate::isdbs::isdbs::*;
 
@@ -111,11 +114,21 @@ mod tests {
                 raster_color: 0,
                 layout_state: ISDBSubLayout {
                     format: WritingFormat::None,
-                    display_area: DisplayArea { x: 0, y: 0 },
+                    display_area: DispArea {
+                        x: 0,
+                        y: 0,
+                        w: 0,
+                        h: 0,
+                    },
                     font_size: 0,
-                    font_scale: FontScale { fscx: 0, fscy: 0 },
+                    font_scale: FScale { fscx: 0, fscy: 0 },
                     cell_spacing: 0,
-                    cursor_pos: DisplayArea { x: 0, y: 0 },
+                    cursor_pos: DispArea {
+                        x: 0,
+                        y: 0,
+                        w: 0,
+                        h: 0,
+                    },
                     ccc: 0,
                     acps: 0,
                 },
@@ -140,11 +153,21 @@ mod tests {
     fn test_init_layout() {
         let mut layout = ISDBSubLayout {
             font_size: 0,
-            display_area: DisplayArea { x: 0, y: 0 },
-            font_scale: FontScale { fscx: 0, fscy: 0 },
+            display_area: DispArea {
+                x: 0,
+                y: 0,
+                w: 0,
+                h: 0,
+            },
+            font_scale: FScale { fscx: 0, fscy: 0 },
             format: WritingFormat::None,
             cell_spacing: 0,
-            cursor_pos: DisplayArea { x: 0, y: 0 },
+            cursor_pos: DispArea {
+                x: 0,
+                y: 0,
+                w: 0,
+                h: 0,
+            },
             ccc: 0,
             acps: 0,
         };
@@ -185,14 +208,24 @@ mod tests {
     fn test_init_layout_custom_values() {
         let mut layout = ISDBSubLayout {
             font_size: 50,
-            display_area: DisplayArea { x: 10, y: 20 },
-            font_scale: FontScale {
+            display_area: DispArea {
+                x: 10,
+                y: 20,
+                w: 0,
+                h: 0,
+            },
+            font_scale: FScale {
                 fscx: 150,
                 fscy: 150,
             },
             format: WritingFormat::None,
             cell_spacing: 0,
-            cursor_pos: DisplayArea { x: 0, y: 0 },
+            cursor_pos: DispArea {
+                x: 0,
+                y: 0,
+                w: 0,
+                h: 0,
+            },
             ccc: 0,
             acps: 0,
         };
@@ -549,7 +582,7 @@ mod tests {
     }
 
     #[test]
-    unsafe fn test_delete_isdb_decoder_with_entries() {
+    fn test_delete_isdb_decoder_with_entries() {
         let mut ctx = ISDBSubContext {
             text_list_head: ListHead {
                 next: ptr::null_mut(),
@@ -582,7 +615,7 @@ mod tests {
                 next: ptr::null_mut(),
                 prev: ptr::null_mut(),
             },
-            buf: alloc(Layout::from_size_align(128, 1).unwrap()) as *mut i8,
+            buf: unsafe { alloc(Layout::from_size_align(128, 1).unwrap()) as *mut i8 },
             used: 0,
             len: 128,
             pos: ISDBPos { x: 0, y: 0 },
@@ -596,7 +629,7 @@ mod tests {
                 next: ptr::null_mut(),
                 prev: ptr::null_mut(),
             },
-            buf: alloc(Layout::from_size_align(128, 1).unwrap()) as *mut i8,
+            buf: unsafe { alloc(Layout::from_size_align(128, 1).unwrap()) as *mut i8 },
             used: 0,
             len: 128,
             pos: ISDBPos { x: 0, y: 0 },
@@ -640,14 +673,24 @@ mod tests {
     fn test_allocate_text_node() {
         let layout = ISDBSubLayout {
             font_size: 36,
-            display_area: DisplayArea { x: 0, y: 0 },
-            font_scale: FontScale {
+            display_area: DispArea {
+                x: 0,
+                y: 0,
+                w: 0,
+                h: 0,
+            },
+            font_scale: FScale {
                 fscx: 100,
                 fscy: 100,
             },
             format: WritingFormat::None,
             cell_spacing: 0,
-            cursor_pos: DisplayArea { x: 0, y: 0 },
+            cursor_pos: DispArea {
+                x: 0,
+                y: 0,
+                w: 0,
+                h: 0,
+            },
             ccc: 0,
             acps: 0,
         };
@@ -785,7 +828,7 @@ mod tests {
     }
 
     #[test]
-    fn test_append_char() {
+    fn test_append_char_1() {
         let mut ctx = ISDBSubContext {
             nb_char: 0,
             nb_line: 0,
@@ -858,7 +901,7 @@ mod tests {
     }
 
     #[test]
-    fn test_list_empty() {
+    fn test_list_empty_1() {
         let mut head = ListHead {
             next: ptr::null_mut(),
             prev: ptr::null_mut(),
@@ -872,7 +915,7 @@ mod tests {
     }
 
     #[test]
-    fn test_append_char() {
+    fn test_append_char_2() {
         let mut ctx = ISDBSubContext {
             nb_char: 0,
             nb_line: 0,
@@ -945,7 +988,7 @@ mod tests {
     }
 
     #[test]
-    fn test_list_empty() {
+    fn test_list_empty_2() {
         let mut head = ListHead {
             next: ptr::null_mut(),
             prev: ptr::null_mut(),