mirror of
https://github.com/chatmail/core.git
synced 2026-04-17 21:46:35 +03:00
Fix FIXMEs in stress.rs (#35)
* Start by comparing strings instead of result of strcmp() * Add failing tests for dc_trim, dc_ltrim and dc_rtrim * Fix failing tests (use libc:isspace() which counts \r, \n etc) * Remove FIXME for first dc_simplify_simplify() * Fix formatting * Fix tests for dc_param_set() * Fix remaining FIXMEs in stress.rs * Don't wrap libc::isspace() * Wrap unit tests with mod tests * Fix format
This commit is contained in:
Lars-Magnus Skog
GitHub
183
tests/stress.rs
183
tests/stress.rs
@@ -63,14 +63,14 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
let mut plain: *mut libc::c_char =
|
||||
dc_simplify_simplify(simplify, html, strlen(html) as libc::c_int, 1i32, 0i32);
|
||||
|
||||
// FIXME
|
||||
// assert_eq!(
|
||||
// strcmp(plain, b"line1\nline2\x00" as *const u8 as *const libc::c_char),
|
||||
// 0,
|
||||
// "{:?}",
|
||||
// std::ffi::CStr::from_ptr(plain),
|
||||
// );
|
||||
// free(plain as *mut libc::c_void);
|
||||
assert_eq!(
|
||||
CStr::from_ptr(plain as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"line1\nline2",
|
||||
);
|
||||
free(plain as *mut libc::c_void);
|
||||
|
||||
html = b"<a href=url>text</a\x00" as *const u8 as *const libc::c_char;
|
||||
plain = dc_simplify_simplify(simplify, html, strlen(html) as libc::c_int, 1i32, 0i32);
|
||||
if 0 != !(strcmp(
|
||||
@@ -2711,40 +2711,28 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
);
|
||||
} else {
|
||||
};
|
||||
|
||||
dc_param_set(p1, 'b' as i32, 0 as *const libc::c_char);
|
||||
// FIXME
|
||||
// if 0 != !(strcmp(
|
||||
// (*p1).packed,
|
||||
// b"a=foo\nd=4\x00" as *const u8 as *const libc::c_char,
|
||||
// ) == 0i32) as libc::c_int as libc::c_long
|
||||
// {
|
||||
// println!("{:?}", std::ffi::CStr::from_ptr((*p1).packed));
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 706i32,
|
||||
// b"strcmp(p1->packed, \"a=foo\\nd=4\")==0\x00" as *const u8 as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
|
||||
assert_eq!(
|
||||
CStr::from_ptr((*p1).packed as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"a=foo\nd=4",
|
||||
);
|
||||
|
||||
dc_param_set(p1, 'a' as i32, 0 as *const libc::c_char);
|
||||
dc_param_set(p1, 'd' as i32, 0 as *const libc::c_char);
|
||||
|
||||
// FIXME
|
||||
// if 0 != !(strcmp((*p1).packed, b"\x00" as *const u8 as *const libc::c_char) == 0i32)
|
||||
// as libc::c_int as libc::c_long
|
||||
// {
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 710i32,
|
||||
// b"strcmp(p1->packed, \"\")==0\x00" as *const u8 as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
assert_eq!(
|
||||
CStr::from_ptr((*p1).packed as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"",
|
||||
);
|
||||
|
||||
dc_param_unref(p1);
|
||||
|
||||
let mut keys: *mut libc::c_char = dc_get_config(
|
||||
context,
|
||||
b"sys.config_keys\x00" as *const u8 as *const libc::c_char,
|
||||
@@ -3457,21 +3445,17 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
);
|
||||
} else {
|
||||
};
|
||||
// FIXME
|
||||
// if 0 != !(!base64.is_null()
|
||||
// && strcmp(base64, b"data\x00" as *const u8 as *const libc::c_char) == 0i32)
|
||||
// as libc::c_int as libc::c_long
|
||||
// {
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 823i32,
|
||||
// b"base64 && strcmp(base64, \"data\") == 0\x00" as *const u8 as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
|
||||
assert!(!base64.is_null());
|
||||
assert_eq!(
|
||||
CStr::from_ptr(base64 as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"data",
|
||||
);
|
||||
|
||||
free(buf_0 as *mut libc::c_void);
|
||||
|
||||
buf_0 =
|
||||
strdup(b"-----BEGIN PGP MESSAGE-----\n\ndat1\n-----END PGP MESSAGE-----\n-----BEGIN PGP MESSAGE-----\n\ndat2\n-----END PGP MESSAGE-----\x00"
|
||||
as *const u8 as *const libc::c_char);
|
||||
@@ -3509,21 +3493,16 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
} else {
|
||||
};
|
||||
|
||||
// FIXME
|
||||
// if 0 != !(!base64.is_null()
|
||||
// && strcmp(base64, b"dat1\x00" as *const u8 as *const libc::c_char) == 0i32)
|
||||
// as libc::c_int as libc::c_long
|
||||
// {
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 830i32,
|
||||
// b"base64 && strcmp(base64, \"dat1\") == 0\x00" as *const u8 as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
assert!(!base64.is_null());
|
||||
assert_eq!(
|
||||
CStr::from_ptr(base64 as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"dat1",
|
||||
);
|
||||
|
||||
free(buf_0 as *mut libc::c_void);
|
||||
|
||||
buf_0 = strdup(
|
||||
b"foo \n -----BEGIN PGP MESSAGE----- \n base64-123 \n -----END PGP MESSAGE-----\x00"
|
||||
as *const u8 as *const libc::c_char,
|
||||
@@ -3572,23 +3551,16 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
} else {
|
||||
};
|
||||
|
||||
// FIXME
|
||||
// if 0 != !(!base64.is_null()
|
||||
// && strcmp(
|
||||
// base64,
|
||||
// b"base64-123\x00" as *const u8 as *const libc::c_char,
|
||||
// ) == 0i32) as libc::c_int as libc::c_long
|
||||
// {
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 838i32,
|
||||
// b"base64 && strcmp(base64, \"base64-123\")==0\x00" as *const u8 as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
assert!(!base64.is_null());
|
||||
assert_eq!(
|
||||
CStr::from_ptr(base64 as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"base64-123",
|
||||
);
|
||||
|
||||
free(buf_0 as *mut libc::c_void);
|
||||
|
||||
buf_0 = strdup(b"foo-----BEGIN PGP MESSAGE-----\x00" as *const u8 as *const libc::c_char);
|
||||
ok = dc_split_armored_data(
|
||||
buf_0,
|
||||
@@ -3661,24 +3633,16 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
} else {
|
||||
};
|
||||
|
||||
// FIXME
|
||||
// if 0 != !(!base64.is_null()
|
||||
// && strcmp(
|
||||
// base64,
|
||||
// b"base64-567 \n abc\x00" as *const u8 as *const libc::c_char,
|
||||
// ) == 0i32) as libc::c_int as libc::c_long
|
||||
// {
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 851i32,
|
||||
// b"base64 && strcmp(base64, \"base64-567 \\n abc\")==0\x00" as *const u8
|
||||
// as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
assert!(!base64.is_null());
|
||||
assert_eq!(
|
||||
CStr::from_ptr(base64 as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"base64-567 \n abc",
|
||||
);
|
||||
|
||||
free(buf_0 as *mut libc::c_void);
|
||||
|
||||
buf_0 =
|
||||
strdup(b"-----BEGIN PGP PRIVATE KEY BLOCK-----\n Autocrypt-Prefer-Encrypt : mutual \n\nbase64\n-----END PGP PRIVATE KEY BLOCK-----\x00"
|
||||
as *const u8 as *const libc::c_char);
|
||||
@@ -3732,21 +3696,16 @@ unsafe extern "C" fn stress_functions(context: &dc_context_t) {
|
||||
} else {
|
||||
};
|
||||
|
||||
// FIXME
|
||||
// if 0 != !(!base64.is_null()
|
||||
// && strcmp(base64, b"base64\x00" as *const u8 as *const libc::c_char) == 0i32)
|
||||
// as libc::c_int as libc::c_long
|
||||
// {
|
||||
// __assert_rtn(
|
||||
// (*::std::mem::transmute::<&[u8; 17], &[libc::c_char; 17]>(b"stress_functions\x00"))
|
||||
// .as_ptr(),
|
||||
// b"../cmdline/stress.c\x00" as *const u8 as *const libc::c_char,
|
||||
// 859i32,
|
||||
// b"base64 && strcmp(base64, \"base64\")==0\x00" as *const u8 as *const libc::c_char,
|
||||
// );
|
||||
// } else {
|
||||
// };
|
||||
assert!(!base64.is_null());
|
||||
assert_eq!(
|
||||
CStr::from_ptr(base64 as *const libc::c_char)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
"base64",
|
||||
);
|
||||
|
||||
free(buf_0 as *mut libc::c_void);
|
||||
|
||||
let mut norm: *mut libc::c_char = dc_normalize_setup_code(
|
||||
context,
|
||||
b"123422343234423452346234723482349234\x00" as *const u8 as *const libc::c_char,
|
||||
|
||||
Reference in New Issue
Block a user