summaryrefslogtreecommitdiff
path: root/test/sys/test_aio.rs
diff options
context:
space:
mode:
authorXavier L'Heureux <xavier.lheureux@icloud.com>2019-09-14 11:29:44 -0400
committerXavier L'Heureux <xavier.lheureux@icloud.com>2019-09-19 22:20:25 -0400
commitbbc42e7845d73362ce94662882e8c20289337612 (patch)
tree1a9b19c6f6b49ef4bd6c5002accedd11662ac9cc /test/sys/test_aio.rs
parente201dfdccac5f862ea1ef5a5e264115cd473a9bc (diff)
downloadnix-bbc42e7845d73362ce94662882e8c20289337612.zip
Where relevant, replace equality checks in assert! with assert_eq!
`assert_eq!` gives more debug info when the test fails by default than `assert!`. This should help make debugging easier.
Diffstat (limited to 'test/sys/test_aio.rs')
-rw-r--r--test/sys/test_aio.rs82
1 files changed, 41 insertions, 41 deletions
diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs
index 66a73fdc..b5c579ed 100644
--- a/test/sys/test_aio.rs
+++ b/test/sys/test_aio.rs
@@ -172,8 +172,8 @@ fn test_aio_suspend() {
}
}
- assert!(wcb.aio_return().unwrap() as usize == WBUF.len());
- assert!(rcb.aio_return().unwrap() as usize == rlen);
+ assert_eq!(wcb.aio_return().unwrap() as usize, WBUF.len());
+ assert_eq!(rcb.aio_return().unwrap() as usize, rlen);
}
// Test a simple aio operation with no completion notification. We must poll
@@ -196,11 +196,11 @@ fn test_read() {
aiocb.read().unwrap();
let err = poll_aio(&mut aiocb);
- assert!(err == Ok(()));
- assert!(aiocb.aio_return().unwrap() as usize == EXPECT.len());
+ assert_eq!(err, Ok(()));
+ assert_eq!(aiocb.aio_return().unwrap() as usize, EXPECT.len());
}
- assert!(EXPECT == rbuf.deref().deref());
+ assert_eq!(EXPECT, rbuf.deref().deref());
}
/// `AioCb::read` should not modify the `AioCb` object if `libc::aio_read`
@@ -242,11 +242,11 @@ fn test_read_into_mut_slice() {
aiocb.read().unwrap();
let err = poll_aio(&mut aiocb);
- assert!(err == Ok(()));
- assert!(aiocb.aio_return().unwrap() as usize == EXPECT.len());
+ assert_eq!(err, Ok(()));
+ assert_eq!(aiocb.aio_return().unwrap() as usize, EXPECT.len());
}
- assert!(rbuf == EXPECT);
+ assert_eq!(rbuf, EXPECT);
}
// Tests from_ptr
@@ -272,11 +272,11 @@ fn test_read_into_pointer() {
aiocb.read().unwrap();
let err = poll_aio(&mut aiocb);
- assert!(err == Ok(()));
- assert!(aiocb.aio_return().unwrap() as usize == EXPECT.len());
+ assert_eq!(err, Ok(()));
+ assert_eq!(aiocb.aio_return().unwrap() as usize, EXPECT.len());
}
- assert!(rbuf == EXPECT);
+ assert_eq!(rbuf, EXPECT);
}
// Test reading into an immutable buffer. It should fail
@@ -318,13 +318,13 @@ fn test_write() {
aiocb.write().unwrap();
let err = poll_aio(&mut aiocb);
- assert!(err == Ok(()));
- assert!(aiocb.aio_return().unwrap() as usize == wbuf.len());
+ assert_eq!(err, Ok(()));
+ assert_eq!(aiocb.aio_return().unwrap() as usize, wbuf.len());
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf, EXPECT);
}
// Tests `AioCb::from_boxed_slice` with `Bytes`
@@ -348,13 +348,13 @@ fn test_write_bytes() {
aiocb.write().unwrap();
let err = poll_aio(&mut aiocb);
- assert!(err == Ok(()));
- assert!(aiocb.aio_return().unwrap() as usize == expected_len);
+ assert_eq!(err, Ok(()));
+ assert_eq!(aiocb.aio_return().unwrap() as usize, expected_len);
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf, EXPECT);
}
// Tests `AioCb::from_boxed_mut_slice` with `BytesMut`
@@ -406,13 +406,13 @@ fn test_write_from_pointer() {
aiocb.write().unwrap();
let err = poll_aio(&mut aiocb);
- assert!(err == Ok(()));
- assert!(aiocb.aio_return().unwrap() as usize == wbuf.len());
+ assert_eq!(err, Ok(()));
+ assert_eq!(aiocb.aio_return().unwrap() as usize, wbuf.len());
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf, EXPECT);
}
/// `AioCb::write` should not modify the `AioCb` object if `libc::aio_write`
@@ -473,11 +473,11 @@ fn test_write_sigev_signal() {
thread::sleep(time::Duration::from_millis(10));
}
- assert!(aiocb.aio_return().unwrap() as usize == WBUF.len());
+ assert_eq!(aiocb.aio_return().unwrap() as usize, WBUF.len());
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf, EXPECT);
}
// Test LioCb::listio with LIO_WAIT, so all AIO ops should be complete by the
@@ -516,15 +516,15 @@ fn test_liocb_listio_wait() {
let err = liocb.listio(LioMode::LIO_WAIT, SigevNotify::SigevNone);
err.expect("lio_listio");
- assert!(liocb.aio_return(0).unwrap() as usize == WBUF.len());
- assert!(liocb.aio_return(1).unwrap() as usize == rlen);
+ assert_eq!(liocb.aio_return(0).unwrap() as usize, WBUF.len());
+ assert_eq!(liocb.aio_return(1).unwrap() as usize, rlen);
}
- assert!(rbuf.deref().deref() == b"3456");
+ assert_eq!(rbuf.deref().deref(), b"3456");
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf2).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf2 == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf2, EXPECT);
}
// Test LioCb::listio with LIO_NOWAIT and no SigEvent, so we must use some other
@@ -565,15 +565,15 @@ fn test_liocb_listio_nowait() {
poll_aio(&mut liocb.aiocbs[0]).unwrap();
poll_aio(&mut liocb.aiocbs[1]).unwrap();
- assert!(liocb.aiocbs[0].aio_return().unwrap() as usize == WBUF.len());
- assert!(liocb.aiocbs[1].aio_return().unwrap() as usize == rlen);
+ assert_eq!(liocb.aiocbs[0].aio_return().unwrap() as usize, WBUF.len());
+ assert_eq!(liocb.aiocbs[1].aio_return().unwrap() as usize, rlen);
}
- assert!(rbuf.deref().deref() == b"3456");
+ assert_eq!(rbuf.deref().deref(), b"3456");
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf2).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf2 == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf2, EXPECT);
}
// Test LioCb::listio with LIO_NOWAIT and a SigEvent to indicate when all
@@ -624,15 +624,15 @@ fn test_liocb_listio_signal() {
thread::sleep(time::Duration::from_millis(10));
}
- assert!(liocb.aiocbs[0].aio_return().unwrap() as usize == WBUF.len());
- assert!(liocb.aiocbs[1].aio_return().unwrap() as usize == rlen);
+ assert_eq!(liocb.aiocbs[0].aio_return().unwrap() as usize, WBUF.len());
+ assert_eq!(liocb.aiocbs[1].aio_return().unwrap() as usize, rlen);
}
- assert!(rbuf.deref().deref() == b"3456");
+ assert_eq!(rbuf.deref().deref(), b"3456");
f.seek(SeekFrom::Start(0)).unwrap();
let len = f.read_to_end(&mut rbuf2).unwrap();
- assert!(len == EXPECT.len());
- assert!(rbuf2 == EXPECT);
+ assert_eq!(len, EXPECT.len());
+ assert_eq!(rbuf2, EXPECT);
}
// Try to use LioCb::listio to read into an immutable buffer. It should fail