Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-20 03:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor test module

Browse Source 
- new function for creating the notcurses options for tests
- hide the initial statistics for cleaner test output
- reformat file with rustfmt
This commit is contained in:
joseLuís 2020-08-07 12:00:30 +02:00 committed by Nick Black
parent 4c822f80a9
commit 1caba6ac29
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rust/notcurses/src/lib.rs
View File

@ -12,7 +12,10 @@ pub fn render(_n: *mut ffi::notcurses) -> std::result::Result<(), std::io::Error
unsafe { unsafe {
let r = ffi::notcurses_render(_n); let r = ffi::notcurses_render(_n);
if r != 0 { if r != 0 {
return Err(std::io::Error::new(std::io::ErrorKind::Other, "error rendering")); return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"error rendering",
));
} }
Ok(()) Ok(())
} }
@ -38,26 +41,29 @@ mod tests {
use all_asserts; use all_asserts;
use serial_test::serial; // serialize tests w/ ffi::notcurses_init() use serial_test::serial; // serialize tests w/ ffi::notcurses_init()
extern { extern "C" {
static stdout: *mut ffi::_IO_FILE; static stdout: *mut ffi::_IO_FILE;
} }
fn opts() -> ffi::notcurses_options {
ffi::notcurses_options {
loglevel: 0,
termtype: std::ptr::null(),
renderfp: std::ptr::null_mut(),
margin_t: 0,
margin_r: 0,
margin_b: 0,
margin_l: 0,
flags: ffi::NCOPTION_NO_ALTERNATE_SCREEN as u64 | ffi::NCOPTION_SUPPRESS_BANNERS as u64,
}
}
#[test] #[test]
#[serial] #[serial]
fn create_context() { fn create_context() {
unsafe { unsafe {
let _ = libc::setlocale(libc::LC_ALL, std::ffi::CString::new("").unwrap().as_ptr()); let _ = libc::setlocale(libc::LC_ALL, std::ffi::CString::new("").unwrap().as_ptr());
let opts: ffi::notcurses_options = ffi::notcurses_options { let nc = ffi::notcurses_init(&opts(), stdout);
loglevel: 0,
termtype: std::ptr::null(),
renderfp: std::ptr::null_mut(),
margin_t: 0,
margin_r: 0,
margin_b: 0,
margin_l: 0,
flags: ffi::NCOPTION_NO_ALTERNATE_SCREEN as u64,
};
let nc = ffi::notcurses_init(&opts, stdout);
assert_ne!(std::ptr::null(), nc); assert_ne!(std::ptr::null(), nc);
let mut dimy = 0; let mut dimy = 0;
let mut dimx = 0; let mut dimx = 0;
@ -73,7 +79,7 @@ mod tests {
fn stdplane_dims() { fn stdplane_dims() {
unsafe { unsafe {
let _ = libc::setlocale(libc::LC_ALL, std::ffi::CString::new("").unwrap().as_ptr()); let _ = libc::setlocale(libc::LC_ALL, std::ffi::CString::new("").unwrap().as_ptr());
let nc = ffi::notcurses_init(std::ptr::null(), stdout); let nc = ffi::notcurses_init(&opts(), stdout);
assert_ne!(std::ptr::null(), nc); assert_ne!(std::ptr::null(), nc);
let mut dimsy = 0; let mut dimsy = 0;
let mut dimsx = 0; let mut dimsx = 0;