Skip to content

Commit 91091ff

Browse files
Oyami-Srkfffonion
authored andcommitted
fix(ffi): fix test failure due to deprecated value
1 parent 8eee509 commit 91091ff

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/ffi/expression.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,16 @@ pub unsafe extern "C" fn expression_validate(
218218
mod tests {
219219
use super::*;
220220
use crate::ast::Type;
221-
use crate::ffi::ERR_BUF_MAX_LEN;
221+
const ERR_BUF_LEN_FOR_TEST: usize = 4096;
222222

223223
fn expr_validate_on(
224224
schema: &Schema,
225225
atc: &str,
226226
fields_buf_size: usize,
227227
) -> Result<(Vec<String>, usize, u64), (i64, String)> {
228228
let atc = ffi::CString::new(atc).unwrap();
229-
let mut errbuf = vec![b'X'; ERR_BUF_MAX_LEN];
230-
let mut errbuf_len = ERR_BUF_MAX_LEN;
229+
let mut errbuf = vec![b'X'; ERR_BUF_LEN_FOR_TEST];
230+
let mut errbuf_len = ERR_BUF_LEN_FOR_TEST;
231231

232232
let mut fields_buf = vec![0u8; fields_buf_size];
233233
let mut fields_buf_len = fields_buf.len();

src/ffi/router.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,16 +241,16 @@ pub unsafe extern "C" fn router_get_fields(
241241
#[cfg(test)]
242242
mod tests {
243243
use super::*;
244-
use crate::ffi::ERR_BUF_MAX_LEN;
244+
const ERR_BUF_LEN_FOR_TEST: usize = 4096;
245245

246246
#[test]
247247
fn test_short_error_buf() {
248248
unsafe {
249249
let schema = Schema::default();
250250
let mut router = Router::new(&schema);
251251
let uuid = ffi::CString::new("a921a9aa-ec0e-4cf3-a6cc-1aa5583d150c").unwrap();
252-
let junk = ffi::CString::new(vec![b'a'; ERR_BUF_MAX_LEN * 2]).unwrap();
253-
let mut errbuf = vec![b'X'; ERR_BUF_MAX_LEN];
252+
let junk = ffi::CString::new(vec![b'a'; ERR_BUF_LEN_FOR_TEST * 2]).unwrap();
253+
let mut errbuf = vec![b'X'; ERR_BUF_LEN_FOR_TEST];
254254
let mut errbuf_len = 10;
255255

256256
let result = router_add_matcher(
@@ -273,9 +273,9 @@ mod tests {
273273
let schema = Schema::default();
274274
let mut router = Router::new(&schema);
275275
let uuid = ffi::CString::new("a921a9aa-ec0e-4cf3-a6cc-1aa5583d150c").unwrap();
276-
let junk = ffi::CString::new(vec![b'a'; ERR_BUF_MAX_LEN * 2]).unwrap();
277-
let mut errbuf = vec![b'X'; ERR_BUF_MAX_LEN];
278-
let mut errbuf_len = ERR_BUF_MAX_LEN;
276+
let junk = ffi::CString::new(vec![b'a'; ERR_BUF_LEN_FOR_TEST * 2]).unwrap();
277+
let mut errbuf = vec![b'X'; ERR_BUF_LEN_FOR_TEST];
278+
let mut errbuf_len = ERR_BUF_LEN_FOR_TEST;
279279

280280
let result = router_add_matcher(
281281
&mut router,
@@ -286,7 +286,7 @@ mod tests {
286286
&mut errbuf_len,
287287
);
288288
assert!(!result);
289-
assert_eq!(errbuf_len, ERR_BUF_MAX_LEN);
289+
assert_eq!(errbuf_len, ERR_BUF_LEN_FOR_TEST);
290290
}
291291
}
292292

@@ -297,8 +297,8 @@ mod tests {
297297
let mut router = Router::new(&schema);
298298
let uuid = ffi::CString::new("a921a9aa-ec0e-4cf3-a6cc-1aa5583d150c").unwrap();
299299
let junk = ffi::CString::new("aaaa").unwrap();
300-
let mut errbuf = vec![b'X'; ERR_BUF_MAX_LEN];
301-
let mut errbuf_len = ERR_BUF_MAX_LEN;
300+
let mut errbuf = vec![b'X'; ERR_BUF_LEN_FOR_TEST];
301+
let mut errbuf_len = ERR_BUF_LEN_FOR_TEST;
302302

303303
let result = router_add_matcher(
304304
&mut router,
@@ -309,7 +309,7 @@ mod tests {
309309
&mut errbuf_len,
310310
);
311311
assert!(!result);
312-
assert!(errbuf_len < ERR_BUF_MAX_LEN);
312+
assert!(errbuf_len < ERR_BUF_LEN_FOR_TEST);
313313
}
314314
}
315315
}

0 commit comments

Comments
 (0)