aboutsummaryrefslogtreecommitdiff
path: root/lib/std/atomic/queue.zig
diff options
context:
space:
mode:
authorVeikka Tuominen <git@vexu.eu>2021-05-04 20:47:26 +0300
committerVeikka Tuominen <git@vexu.eu>2021-05-08 15:15:30 +0300
commitfd77f2cfed81f3414c079909e079a812e23071c3 (patch)
treef9facf463ab13791faa0820c347371067ed27a79 /lib/std/atomic/queue.zig
parent59f9253d94331cedd4d0518250c8094a064f6cd2 (diff)
downloadzig-fd77f2cfed81f3414c079909e079a812e23071c3.tar.gz
zig-fd77f2cfed81f3414c079909e079a812e23071c3.zip
std: update usage of std.testing
Diffstat (limited to 'lib/std/atomic/queue.zig')
-rw-r--r--lib/std/atomic/queue.zig56
1 files changed, 28 insertions, 28 deletions
diff --git a/lib/std/atomic/queue.zig b/lib/std/atomic/queue.zig
index 4e427a1669..24723c90f9 100644
--- a/lib/std/atomic/queue.zig
+++ b/lib/std/atomic/queue.zig
@@ -195,24 +195,24 @@ test "std.atomic.Queue" {
};
if (builtin.single_threaded) {
- expect(context.queue.isEmpty());
+ try expect(context.queue.isEmpty());
{
var i: usize = 0;
while (i < put_thread_count) : (i += 1) {
- expect(startPuts(&context) == 0);
+ try expect(startPuts(&context) == 0);
}
}
- expect(!context.queue.isEmpty());
+ try expect(!context.queue.isEmpty());
context.puts_done = true;
{
var i: usize = 0;
while (i < put_thread_count) : (i += 1) {
- expect(startGets(&context) == 0);
+ try expect(startGets(&context) == 0);
}
}
- expect(context.queue.isEmpty());
+ try expect(context.queue.isEmpty());
} else {
- expect(context.queue.isEmpty());
+ try expect(context.queue.isEmpty());
var putters: [put_thread_count]*std.Thread = undefined;
for (putters) |*t| {
@@ -229,7 +229,7 @@ test "std.atomic.Queue" {
for (getters) |t|
t.wait();
- expect(context.queue.isEmpty());
+ try expect(context.queue.isEmpty());
}
if (context.put_sum != context.get_sum) {
@@ -279,7 +279,7 @@ fn startGets(ctx: *Context) u8 {
test "std.atomic.Queue single-threaded" {
var queue = Queue(i32).init();
- expect(queue.isEmpty());
+ try expect(queue.isEmpty());
var node_0 = Queue(i32).Node{
.data = 0,
@@ -287,7 +287,7 @@ test "std.atomic.Queue single-threaded" {
.prev = undefined,
};
queue.put(&node_0);
- expect(!queue.isEmpty());
+ try expect(!queue.isEmpty());
var node_1 = Queue(i32).Node{
.data = 1,
@@ -295,10 +295,10 @@ test "std.atomic.Queue single-threaded" {
.prev = undefined,
};
queue.put(&node_1);
- expect(!queue.isEmpty());
+ try expect(!queue.isEmpty());
- expect(queue.get().?.data == 0);
- expect(!queue.isEmpty());
+ try expect(queue.get().?.data == 0);
+ try expect(!queue.isEmpty());
var node_2 = Queue(i32).Node{
.data = 2,
@@ -306,7 +306,7 @@ test "std.atomic.Queue single-threaded" {
.prev = undefined,
};
queue.put(&node_2);
- expect(!queue.isEmpty());
+ try expect(!queue.isEmpty());
var node_3 = Queue(i32).Node{
.data = 3,
@@ -314,13 +314,13 @@ test "std.atomic.Queue single-threaded" {
.prev = undefined,
};
queue.put(&node_3);
- expect(!queue.isEmpty());
+ try expect(!queue.isEmpty());
- expect(queue.get().?.data == 1);
- expect(!queue.isEmpty());
+ try expect(queue.get().?.data == 1);
+ try expect(!queue.isEmpty());
- expect(queue.get().?.data == 2);
- expect(!queue.isEmpty());
+ try expect(queue.get().?.data == 2);
+ try expect(!queue.isEmpty());
var node_4 = Queue(i32).Node{
.data = 4,
@@ -328,17 +328,17 @@ test "std.atomic.Queue single-threaded" {
.prev = undefined,
};
queue.put(&node_4);
- expect(!queue.isEmpty());
+ try expect(!queue.isEmpty());
- expect(queue.get().?.data == 3);
+ try expect(queue.get().?.data == 3);
node_3.next = null;
- expect(!queue.isEmpty());
+ try expect(!queue.isEmpty());
- expect(queue.get().?.data == 4);
- expect(queue.isEmpty());
+ try expect(queue.get().?.data == 4);
+ try expect(queue.isEmpty());
- expect(queue.get() == null);
- expect(queue.isEmpty());
+ try expect(queue.get() == null);
+ try expect(queue.isEmpty());
}
test "std.atomic.Queue dump" {
@@ -352,7 +352,7 @@ test "std.atomic.Queue dump" {
// Test empty stream
fbs.reset();
try queue.dumpToStream(fbs.writer());
- expect(mem.eql(u8, buffer[0..fbs.pos],
+ try expect(mem.eql(u8, buffer[0..fbs.pos],
\\head: (null)
\\tail: (null)
\\
@@ -376,7 +376,7 @@ test "std.atomic.Queue dump" {
\\ (null)
\\
, .{ @ptrToInt(queue.head), @ptrToInt(queue.tail) });
- expect(mem.eql(u8, buffer[0..fbs.pos], expected));
+ try expect(mem.eql(u8, buffer[0..fbs.pos], expected));
// Test a stream with two elements
var node_1 = Queue(i32).Node{
@@ -397,5 +397,5 @@ test "std.atomic.Queue dump" {
\\ (null)
\\
, .{ @ptrToInt(queue.head), @ptrToInt(queue.head.?.next), @ptrToInt(queue.tail) });
- expect(mem.eql(u8, buffer[0..fbs.pos], expected));
+ try expect(mem.eql(u8, buffer[0..fbs.pos], expected));
}