diff options
Diffstat (limited to 'src/test')
148 files changed, 696 insertions, 696 deletions
diff --git a/src/test/run-fail/fail.rs b/src/test/run-fail/fail.rs index e8c9cf71..c688a404 100644 --- a/src/test/run-fail/fail.rs +++ b/src/test/run-fail/fail.rs @@ -2,5 +2,5 @@ // error-pattern:1 == 2 fn main() { - check (1 == 2); + assert (1 == 2); } diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs index 7def7c11..60e82200 100644 --- a/src/test/run-fail/linked-failure.rs +++ b/src/test/run-fail/linked-failure.rs @@ -4,7 +4,7 @@ // error-pattern:1 == 2 fn child() { - check (1 == 2); + assert (1 == 2); } fn main() { diff --git a/src/test/run-fail/str-overrun.rs b/src/test/run-fail/str-overrun.rs index 4388cb3a..68b1e263 100644 --- a/src/test/run-fail/str-overrun.rs +++ b/src/test/run-fail/str-overrun.rs @@ -6,12 +6,12 @@ fn main() { let str s = "hello"; let int x = 0; - check (s.(x) == (0x68 as u8)); + assert (s.(x) == (0x68 as u8)); // NB: at the moment a string always has a trailing NULL, // so the largest index value on the string above is 5, not // 4. Possibly change this. // Bounds-check failure. - check (s.(x + 6) == (0x0 as u8)); + assert (s.(x + 6) == (0x0 as u8)); } diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/run-fail/vec-overrun.rs index 961da730..810feb39 100644 --- a/src/test/run-fail/vec-overrun.rs +++ b/src/test/run-fail/vec-overrun.rs @@ -6,7 +6,7 @@ fn main() { let vec[int] v = vec(10); let int x = 0; - check (v.(x) == 10); + assert (v.(x) == 10); // Bounds-check failure. - check (v.(x + 2) == 20); + assert (v.(x + 2) == 20); } diff --git a/src/test/run-fail/vec-underrun.rs b/src/test/run-fail/vec-underrun.rs index a230d1be..f1998da5 100644 --- a/src/test/run-fail/vec-underrun.rs +++ b/src/test/run-fail/vec-underrun.rs @@ -6,7 +6,7 @@ fn main() { let vec[int] v = vec(10, 20); let int x = 0; - check (v.(x) == 10); + assert (v.(x) == 10); // Bounds-check failure. - check (v.(x-1) == 20); + assert (v.(x-1) == 20); } diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/alt-pattern-drop.rs index 4ee2c12b..b92ffd74 100644 --- a/src/test/run-pass/alt-pattern-drop.rs +++ b/src/test/run-pass/alt-pattern-drop.rs @@ -21,12 +21,12 @@ fn foo(str s) { } log _str.refcount(s); - check (_str.refcount(s) == const_refcount); + assert (_str.refcount(s) == const_refcount); } fn main() { let str s = "hi"; // ref up foo(s); // ref up then down log _str.refcount(s); - check (_str.refcount(s) == const_refcount); + assert (_str.refcount(s) == const_refcount); } diff --git a/src/test/run-pass/alt-pattern-lit.rs b/src/test/run-pass/alt-pattern-lit.rs index 91190260..bad74a2a 100644 --- a/src/test/run-pass/alt-pattern-lit.rs +++ b/src/test/run-pass/alt-pattern-lit.rs @@ -12,6 +12,6 @@ fn altlit(int f) -> int { } fn main() { - check (altlit(10) == 20); - check (altlit(11) == 22); + assert (altlit(10) == 20); + assert (altlit(11) == 22); } diff --git a/src/test/run-pass/alt-tag.rs b/src/test/run-pass/alt-tag.rs index 68013dfe..bc0afcb5 100644 --- a/src/test/run-pass/alt-tag.rs +++ b/src/test/run-pass/alt-tag.rs @@ -32,8 +32,8 @@ fn main() { let color gray = rgb(127, 127, 127); let color clear = rgba(50, 150, 250, 0); let color red = hsl(0, 255, 255); - check (process(gray) == 127); - check (process(clear) == 0); - check (process(red) == 255); + assert (process(gray) == 127); + assert (process(clear) == 0); + assert (process(red) == 255); } diff --git a/src/test/run-pass/arith-0.rs b/src/test/run-pass/arith-0.rs index 7587b005..857eaa8e 100644 --- a/src/test/run-pass/arith-0.rs +++ b/src/test/run-pass/arith-0.rs @@ -1,5 +1,5 @@ fn main() -> () { let int a = 10; log a; - check (a * (a - 1) == 90); + assert (a * (a - 1) == 90); }
\ No newline at end of file diff --git a/src/test/run-pass/arith-1.rs b/src/test/run-pass/arith-1.rs index bac6a055..55230e9e 100644 --- a/src/test/run-pass/arith-1.rs +++ b/src/test/run-pass/arith-1.rs @@ -1,22 +1,22 @@ fn main() -> () { let int i32_a = 10; - check(i32_a == 10); - check(i32_a - 10 == 0); - check(i32_a / 10 == 1); - check(i32_a - 20 == -10); - check(i32_a << 10 == 10240); - check(i32_a << 16 == 655360); - check(i32_a * 16 == 160); - check(i32_a * i32_a * i32_a == 1000); - check(i32_a * i32_a * i32_a * i32_a == 10000); - check(((i32_a * i32_a) / i32_a) * i32_a == 100); - check(i32_a * (i32_a - 1) << 2 + i32_a == 368640); + assert (i32_a == 10); + assert (i32_a - 10 == 0); + assert (i32_a / 10 == 1); + assert (i32_a - 20 == -10); + assert (i32_a << 10 == 10240); + assert (i32_a << 16 == 655360); + assert (i32_a * 16 == 160); + assert (i32_a * i32_a * i32_a == 1000); + assert (i32_a * i32_a * i32_a * i32_a == 10000); + assert (((i32_a * i32_a) / i32_a) * i32_a == 100); + assert (i32_a * (i32_a - 1) << 2 + i32_a == 368640); let int i32_b = 0x10101010; - check(i32_b + 1 - 1 == i32_b); - check(i32_b << 1 == i32_b << 1); - check(i32_b >> 1 == i32_b >> 1); - check((i32_b & (i32_b << 1)) == 0); + assert (i32_b + 1 - 1 == i32_b); + assert (i32_b << 1 == i32_b << 1); + assert (i32_b >> 1 == i32_b >> 1); + assert ((i32_b & (i32_b << 1)) == 0); log ((i32_b | (i32_b << 1))); - check((i32_b | (i32_b << 1)) == 0x30303030); + assert ((i32_b | (i32_b << 1)) == 0x30303030); }
\ No newline at end of file diff --git a/src/test/run-pass/arith-2.rs b/src/test/run-pass/arith-2.rs index 33a740c8..70892682 100644 --- a/src/test/run-pass/arith-2.rs +++ b/src/test/run-pass/arith-2.rs @@ -1,5 +1,5 @@ fn main() -> () { let int i32_c = 0x10101010; - check (i32_c + i32_c * 2 / 3 * 2 + (i32_c - 7 % 3) == + assert (i32_c + i32_c * 2 / 3 * 2 + (i32_c - 7 % 3) == i32_c + (((i32_c * 2) / 3) * 2) + (i32_c - (7 % 3))); }
\ No newline at end of file diff --git a/src/test/run-pass/arith-unsigned.rs b/src/test/run-pass/arith-unsigned.rs index 748ff6b7..0e2818a3 100644 --- a/src/test/run-pass/arith-unsigned.rs +++ b/src/test/run-pass/arith-unsigned.rs @@ -2,24 +2,24 @@ // Unsigned integer operations fn main() { - check (0u8 < 255u8); - check (0u8 <= 255u8); - check (255u8 > 0u8); - check (255u8 >= 0u8); - check (250u8 / 10u8 == 25u8); - check (255u8 % 10u8 == 5u8); - check (0u16 < 60000u16); - check (0u16 <= 60000u16); - check (60000u16 > 0u16); - check (60000u16 >= 0u16); - check (60000u16 / 10u16 == 6000u16); - check (60005u16 % 10u16 == 5u16); - check (0u32 < 4000000000u32); - check (0u32 <= 4000000000u32); - check (4000000000u32 > 0u32); - check (4000000000u32 >= 0u32); - check (4000000000u32 / 10u32 == 400000000u32); - check (4000000005u32 % 10u32 == 5u32); + assert (0u8 < 255u8); + assert (0u8 <= 255u8); + assert (255u8 > 0u8); + assert (255u8 >= 0u8); + assert (250u8 / 10u8 == 25u8); + assert (255u8 % 10u8 == 5u8); + assert (0u16 < 60000u16); + assert (0u16 <= 60000u16); + assert (60000u16 > 0u16); + assert (60000u16 >= 0u16); + assert (60000u16 / 10u16 == 6000u16); + assert (60005u16 % 10u16 == 5u16); + assert (0u32 < 4000000000u32); + assert (0u32 <= 4000000000u32); + assert (4000000000u32 > 0u32); + assert (4000000000u32 >= 0u32); + assert (4000000000u32 / 10u32 == 400000000u32); + assert (4000000005u32 % 10u32 == 5u32); // 64-bit numbers have some flakiness yet. Not tested } diff --git a/src/test/run-pass/autoderef-full-lval.rs b/src/test/run-pass/autoderef-full-lval.rs index 956a7eb4..5df5456b 100644 --- a/src/test/run-pass/autoderef-full-lval.rs +++ b/src/test/run-pass/autoderef-full-lval.rs @@ -8,11 +8,11 @@ fn main() { let clam b = rec(x=@10, y=@20); let int z = a.x + b.y; log z; - check (z == 21); + assert (z == 21); let fish forty = tup(@40); let fish two = tup(@2); let int answer = forty._0 + two._0; log answer; - check (answer == 42); + assert (answer == 42); } diff --git a/src/test/run-pass/bind-exterior.rs b/src/test/run-pass/bind-exterior.rs index c3fc2e7c..f6f36918 100644 --- a/src/test/run-pass/bind-exterior.rs +++ b/src/test/run-pass/bind-exterior.rs @@ -4,5 +4,5 @@ fn foo(@int a, @int b) -> int { fn main() { auto f1 = bind foo(@10, @12); - check(f1() == 22); + assert (f1() == 22); } diff --git a/src/test/run-pass/bind-interior.rs b/src/test/run-pass/bind-interior.rs index 2d164e07..ae994d1c 100644 --- a/src/test/run-pass/bind-interior.rs +++ b/src/test/run-pass/bind-interior.rs @@ -7,5 +7,5 @@ fn f(int n) -> int { fn main() { let fn() -> int g = bind f(10); let int i = g(); - check(i == 10); + assert (i == 10); } diff --git a/src/test/run-pass/bind-obj-ctor.rs b/src/test/run-pass/bind-obj-ctor.rs index 8780b22a..b5215f9a 100644 --- a/src/test/run-pass/bind-obj-ctor.rs +++ b/src/test/run-pass/bind-obj-ctor.rs @@ -11,7 +11,7 @@ fn main() { auto ctor1 = bind simple(_, 2); auto obj1 = ctor0(2); auto obj2 = ctor1(1); - check (obj0.sum() == 3); - check (obj1.sum() == 3); - check (obj2.sum() == 3); + assert (obj0.sum() == 3); + assert (obj1.sum() == 3); + assert (obj2.sum() == 3); } diff --git a/src/test/run-pass/bind-thunk.rs b/src/test/run-pass/bind-thunk.rs index be6e1b24..7cafc501 100644 --- a/src/test/run-pass/bind-thunk.rs +++ b/src/test/run-pass/bind-thunk.rs @@ -7,5 +7,5 @@ fn f() -> int { fn main() { let fn() -> int g = bind f(); let int i = g(); - check(i == 42); + assert (i == 42); } diff --git a/src/test/run-pass/bind-trivial.rs b/src/test/run-pass/bind-trivial.rs index fbd6e78d..e73f2b7c 100644 --- a/src/test/run-pass/bind-trivial.rs +++ b/src/test/run-pass/bind-trivial.rs @@ -7,5 +7,5 @@ fn f(int n) -> int { fn main() { let fn(int) -> int g = bind f(_); let int i = g(42); - check(i == 42); + assert (i == 42); } diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs index 36b58a91..99324489 100644 --- a/src/test/run-pass/bitwise.rs +++ b/src/test/run-pass/bitwise.rs @@ -8,14 +8,14 @@ fn main() { a = a ^ b; log a; log b; - check (b == 1); - check (a == 2); + assert (b == 1); + assert (a == 2); - check (~(0xf0) & 0xff == 0xf); - check (0xf0 | 0xf == 0xff); - check (0xf << 4 == 0xf0); - check (0xf0 >> 4 == 0xf); - check (-16 >>> 2 == -4); - check (0b1010_1010 | 0b0101_0101 == 0xff); + assert (~(0xf0) & 0xff == 0xf); + assert (0xf0 | 0xf == 0xff); + assert (0xf << 4 == 0xf0); + assert (0xf0 >> 4 == 0xf); + assert (-16 >>> 2 == -4); + assert (0b1010_1010 | 0b0101_0101 == 0xff); } diff --git a/src/test/run-pass/bool-not.rs b/src/test/run-pass/bool-not.rs index ba70bdb1..337efc6f 100644 --- a/src/test/run-pass/bool-not.rs +++ b/src/test/run-pass/bool-not.rs @@ -2,14 +2,14 @@ fn main() { if (!false) { - check (true); + assert (true); } else { - check (false); + assert (false); } if (!true) { - check (false); + assert (false); } else { - check (true); + assert (true); } } diff --git a/src/test/run-pass/box-compare.rs b/src/test/run-pass/box-compare.rs index 619790d7..8f23035d 100644 --- a/src/test/run-pass/box-compare.rs +++ b/src/test/run-pass/box-compare.rs @@ -1,6 +1,6 @@ // xfail-boot fn main() { - check (@1 < @3); - check (@@"hello " > @@"hello"); - check (@@@"hello" != @@@"there"); + assert (@1 < @3); + assert (@@"hello " > @@"hello"); + assert (@@@"hello" != @@@"there"); }
\ No newline at end of file diff --git a/src/test/run-pass/box-unbox.rs b/src/test/run-pass/box-unbox.rs index d0ad615b..b1d50533 100644 --- a/src/test/run-pass/box-unbox.rs +++ b/src/test/run-pass/box-unbox.rs @@ -6,5 +6,5 @@ fn main() { let int foo = 17; let box[int] bfoo = tup(@foo); log "see what's in our box"; - check (unbox[int](bfoo) == foo); + assert (unbox[int](bfoo) == foo); } diff --git a/src/test/run-pass/box.rs b/src/test/run-pass/box.rs index ffcd9ec5..c105e801 100644 --- a/src/test/run-pass/box.rs +++ b/src/test/run-pass/box.rs @@ -1,4 +1,4 @@ fn main() { let @int x = @10; - check ((*x) == 10); + assert ((*x) == 10); } diff --git a/src/test/run-pass/break.rs b/src/test/run-pass/break.rs index 48c3b091..5a63d9ac 100644 --- a/src/test/run-pass/break.rs +++ b/src/test/run-pass/break.rs @@ -6,35 +6,35 @@ fn main() { i += 1; if (i == 10) { break; } } - check(i == 10); + assert (i == 10); do { i += 1; if (i == 20) { break; } } while (i < 30); - check(i == 20); + assert (i == 20); for (int x in vec(1, 2, 3, 4, 5, 6)) { if (x == 3) { break; } - check(x <= 3); + assert (x <= 3); } i = 0; while (i < 10) { i += 1; if (i % 2 == 0) { cont; } - check(i % 2 != 0); + assert (i % 2 != 0); } i = 0; do { i += 1; if (i % 2 == 0) { cont; } - check(i % 2 != 0); + assert (i % 2 != 0); } while (i < 10); for (int x in vec(1, 2, 3, 4, 5, 6)) { if (x % 2 == 0) { cont; } - check(x % 2 != 0); + assert (x % 2 != 0); } } diff --git a/src/test/run-pass/cast.rs b/src/test/run-pass/cast.rs index e04ad629..ecc7ac12 100644 --- a/src/test/run-pass/cast.rs +++ b/src/test/run-pass/cast.rs @@ -3,14 +3,14 @@ fn main() { let int i = 'Q' as int; - check (i == 0x51); + assert (i == 0x51); let u32 u = i as u32; - check (u == (0x51 as u32)); - check (u == ('Q' as u32)); - check ((i as u8) == ('Q' as u8)); - check (((i as u8) as i8) == (('Q' as u8) as i8)); - check ((0x51 as char) == 'Q'); + assert (u == (0x51 as u32)); + assert (u == ('Q' as u32)); + assert ((i as u8) == ('Q' as u8)); + assert (((i as u8) as i8) == (('Q' as u8) as i8)); + assert ((0x51 as char) == 'Q'); - check (true == (1 as bool)); - check ((0 as u32) == (false as u32)); + assert (true == (1 as bool)); + assert ((0 as u32) == (false as u32)); } diff --git a/src/test/run-pass/char.rs b/src/test/run-pass/char.rs index 123f2eb2..a3ddae6c 100644 --- a/src/test/run-pass/char.rs +++ b/src/test/run-pass/char.rs @@ -1,12 +1,12 @@ fn main() { let char c = 'x'; let char d = 'x'; - check(c == 'x'); - check('x' == c); - check(c == c); - check(c == d); - check(d == c); - check (d == 'x'); - check('x' == d); + assert (c == 'x'); + assert ('x' == c); + assert (c == c); + assert (c == d); + assert (d == c); + assert (d == 'x'); + assert ('x' == d); } diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs index e97c409d..99c319c2 100644 --- a/src/test/run-pass/clone-with-exterior.rs +++ b/src/test/run-pass/clone-with-exterior.rs @@ -1,8 +1,8 @@ // xfail-boot // xfail-stage0 fn f(@rec(int a, int b) x) { - check (x.a == 10); - check (x.b == 12); + assert (x.a == 10); + assert (x.b == 12); } fn main() { diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs index 2bca6248..ef93eee6 100644 --- a/src/test/run-pass/comm.rs +++ b/src/test/run-pass/comm.rs @@ -8,7 +8,7 @@ fn main() { y <- p; log "received"; log y; - check (y == 10); + assert (y == 10); } fn child(chan[int] c) { diff --git a/src/test/run-pass/decl-with-recv.rs b/src/test/run-pass/decl-with-recv.rs index 5630d2e2..36487aa8 100644 --- a/src/test/run-pass/decl-with-recv.rs +++ b/src/test/run-pass/decl-with-recv.rs @@ -6,9 +6,9 @@ fn main() { ch <| 10; let int i <- po; - check (i == 10); + assert (i == 10); ch <| 11; auto j <- po; - check (j == 11); + assert (j == 11); } diff --git a/src/test/run-pass/deep.rs b/src/test/run-pass/deep.rs index 5131c42b..32d4dae1 100644 --- a/src/test/run-pass/deep.rs +++ b/src/test/run-pass/deep.rs @@ -10,5 +10,5 @@ fn f(int x) -> int { } fn main() { - check (f(5000) == 5000); + assert (f(5000) == 5000); } diff --git a/src/test/run-pass/div-mod.rs b/src/test/run-pass/div-mod.rs index cfa0fbe9..00835d41 100644 --- a/src/test/run-pass/div-mod.rs +++ b/src/test/run-pass/div-mod.rs @@ -3,15 +3,15 @@ fn main() { let int x = 15; let int y = 5; - check(x / 5 == 3); - check(x / 4 == 3); - check(x / 3 == 5); - check(x / y == 3); - check(15 / y == 3); + assert (x / 5 == 3); + assert (x / 4 == 3); + assert (x / 3 == 5); + assert (x / y == 3); + assert (15 / y == 3); - check(x % 5 == 0); - check(x % 4 == 3); - check(x % 3 == 0); - check(x % y == 0); - check(15 % y == 0); + assert (x % 5 == 0); + assert (x % 4 == 3); + assert (x % 3 == 0); + assert (x % y == 0); + assert (15 % y == 0); } diff --git a/src/test/run-pass/else-if.rs b/src/test/run-pass/else-if.rs index d9e5b869..edb25e16 100644 --- a/src/test/run-pass/else-if.rs +++ b/src/test/run-pass/else-if.rs @@ -1,42 +1,42 @@ fn main() { if (1 == 2) { - check(false); + assert (false); } else if (2 == 3) { - check(false); + assert (false); } else if (3 == 4) { - check(false); + assert (false); } else { - check(true); + assert (true); } if (1 == 2) { - check(false); + assert (false); } else if (2 == 2) { - check(true); + assert (true); } if (1 == 2) { - check(false); + assert (false); } else if (2 == 2) { if (1 == 1) { - check(true); + assert (true); } else { if (2 == 1) { - check(false); + assert (false); } else { - check(false); + assert (false); } } } if (1 == 2) { - check(false); + assert (false); } else { if (1 == 2) { - check(false); + assert (false); } else { - check(true); + assert (true); } } } diff --git a/src/test/run-pass/expr-alt-box.rs b/src/test/run-pass/expr-alt-box.rs index 2e7846f3..e18611fa 100644 --- a/src/test/run-pass/expr-alt-box.rs +++ b/src/test/run-pass/expr-alt-box.rs @@ -9,7 +9,7 @@ fn test_box() { @100 } }; - check (*res == 100); + assert (*res == 100); } fn test_str() { @@ -18,7 +18,7 @@ fn test_str() { "happy" } }; - check (res == "happy"); + assert (res == "happy"); } fn main() { diff --git a/src/test/run-pass/expr-alt-generic-box1.rs b/src/test/run-pass/expr-alt-generic-box1.rs index 8ff67f0f..a1367e81 100644 --- a/src/test/run-pass/expr-alt-generic-box1.rs +++ b/src/test/run-pass/expr-alt-generic-box1.rs @@ -9,7 +9,7 @@ fn test_generic[T](@T expected, &compare[T] eq) { expected } }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_box() { diff --git a/src/test/run-pass/expr-alt-generic-box2.rs b/src/test/run-pass/expr-alt-generic-box2.rs index 7928ffed..469b8e7c 100644 --- a/src/test/run-pass/expr-alt-generic-box2.rs +++ b/src/test/run-pass/expr-alt-generic-box2.rs @@ -9,7 +9,7 @@ fn test_generic[T](&T expected, &compare[T] eq) { expected } }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_vec() { diff --git a/src/test/run-pass/expr-alt-generic.rs b/src/test/run-pass/expr-alt-generic.rs index 66681059..0cd0177a 100644 --- a/src/test/run-pass/expr-alt-generic.rs +++ b/src/test/run-pass/expr-alt-generic.rs @@ -9,7 +9,7 @@ fn test_generic[T](&T expected, &compare[T] eq) { expected } }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_bool() { diff --git a/src/test/run-pass/expr-alt-struct.rs b/src/test/run-pass/expr-alt-struct.rs index 31406969..762303d5 100644 --- a/src/test/run-pass/expr-alt-struct.rs +++ b/src/test/run-pass/expr-alt-struct.rs @@ -9,7 +9,7 @@ fn test_rec() { rec(i = 100) } }; - check (res == rec(i = 100)); + assert (res == rec(i = 100)); } fn test_tag() { @@ -26,7 +26,7 @@ fn test_tag() { sad } }; - check (res == happy); + assert (res == happy); } fn main() { diff --git a/src/test/run-pass/expr-alt.rs b/src/test/run-pass/expr-alt.rs index 4c10a7d9..52a01078 100644 --- a/src/test/run-pass/expr-alt.rs +++ b/src/test/run-pass/expr-alt.rs @@ -12,7 +12,7 @@ fn test_basic() { false } }; - check (res); + assert (res); res = alt(false) { case (true) { @@ -22,7 +22,7 @@ fn test_basic() { true } }; - check (res); + assert (res); } fn test_inferrence() { @@ -34,7 +34,7 @@ fn test_inferrence() { false } }; - check (res); + assert (res); } fn test_alt_as_alt_head() { @@ -47,7 +47,7 @@ fn test_alt_as_alt_head() { true } }; - check (res); + assert (res); } fn test_alt_as_block_result() { @@ -66,7 +66,7 @@ fn test_alt_as_block_result() { } } }; - check (res); + assert (res); } fn main() { diff --git a/src/test/run-pass/expr-block-box.rs b/src/test/run-pass/expr-block-box.rs index e8ab6209..206c44af 100644 --- a/src/test/run-pass/expr-block-box.rs +++ b/src/test/run-pass/expr-block-box.rs @@ -6,5 +6,5 @@ fn main() { @100 }; - check (*x == 100); + assert (*x == 100); } diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/run-pass/expr-block-fn.rs index eb0357d9..a37d1cb0 100644 --- a/src/test/run-pass/expr-block-fn.rs +++ b/src/test/run-pass/expr-block-fn.rs @@ -6,7 +6,7 @@ fn test_fn() { ret 10; } let t res = { ten }; - check (res() == 10); + assert (res() == 10); } fn main() { diff --git a/src/test/run-pass/expr-block-generic-box1.rs b/src/test/run-pass/expr-block-generic-box1.rs index 57487fd6..82d54c17 100644 --- a/src/test/run-pass/expr-block-generic-box1.rs +++ b/src/test/run-pass/expr-block-generic-box1.rs @@ -5,7 +5,7 @@ type compare[T] = fn(@T t1, @T t2) -> bool; fn test_generic[T](@T expected, &compare[T] eq) { let @T actual = { expected }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_box() { diff --git a/src/test/run-pass/expr-block-generic-box2.rs b/src/test/run-pass/expr-block-generic-box2.rs index 3b1e4479..c1c8260c 100644 --- a/src/test/run-pass/expr-block-generic-box2.rs +++ b/src/test/run-pass/expr-block-generic-box2.rs @@ -5,7 +5,7 @@ type compare[T] = fn(&T t1, &T t2) -> bool; fn test_generic[T](&T expected, &compare[T] eq) { let T actual = { expected }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_vec() { diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs index ded3b620..d6061a6c 100644 --- a/src/test/run-pass/expr-block-generic.rs +++ b/src/test/run-pass/expr-block-generic.rs @@ -7,7 +7,7 @@ type compare[T] = fn(&T t1, &T t2) -> bool; fn test_generic[T](&T expected, &compare[T] eq) { let T actual = { expected }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_bool() { diff --git a/src/test/run-pass/expr-block.rs b/src/test/run-pass/expr-block.rs index ecc6f04a..1c03a6b0 100644 --- a/src/test/run-pass/expr-block.rs +++ b/src/test/run-pass/expr-block.rs @@ -5,12 +5,12 @@ fn test_basic() { let bool res = { true }; - check (res); + assert (res); } fn test_rec() { auto res = { rec(v1 = 10, v2 = 20) }; - check (res.v2 == 20); + assert (res.v2 == 20); } fn test_filled_with_stuff() { @@ -21,7 +21,7 @@ fn test_filled_with_stuff() { } a }; - check (res == 10); + assert (res == 10); } fn main() { diff --git a/src/test/run-pass/expr-if-box.rs b/src/test/run-pass/expr-if-box.rs index a629c9c9..d242d744 100644 --- a/src/test/run-pass/expr-if-box.rs +++ b/src/test/run-pass/expr-if-box.rs @@ -5,12 +5,12 @@ fn test_box() { auto res = if (true) { @100 } else { @101 }; - check (*res == 100); + assert (*res == 100); } fn test_str() { auto res = if (true) { "happy" } else { "sad" }; - check (res == "happy"); + assert (res == "happy"); } fn main() { diff --git a/src/test/run-pass/expr-if-generic-box1.rs b/src/test/run-pass/expr-if-generic-box1.rs index 32aea8bb..d1d4c05d 100644 --- a/src/test/run-pass/expr-if-generic-box1.rs +++ b/src/test/run-pass/expr-if-generic-box1.rs @@ -5,7 +5,7 @@ type compare[T] = fn(@T t1, @T t2) -> bool; fn test_generic[T](@T expected, @T not_expected, &compare[T] eq) { let @T actual = if (true) { expected } else { not_expected }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_box() { diff --git a/src/test/run-pass/expr-if-generic-box2.rs b/src/test/run-pass/expr-if-generic-box2.rs index d414d6d1..a126b1c4 100644 --- a/src/test/run-pass/expr-if-generic-box2.rs +++ b/src/test/run-pass/expr-if-generic-box2.rs @@ -5,7 +5,7 @@ type compare[T] = fn(&T t1, &T t2) -> bool; fn test_generic[T](&T expected, &T not_expected, &compare[T] eq) { let T actual = if (true) { expected } else { not_expected }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_vec() { diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs index 0a0db2dd..b86a7553 100644 --- a/src/test/run-pass/expr-if-generic.rs +++ b/src/test/run-pass/expr-if-generic.rs @@ -7,7 +7,7 @@ type compare[T] = fn(&T t1, &T t2) -> bool; fn test_generic[T](&T expected, &T not_expected, &compare[T] eq) { let T actual = if (true) { expected } else { not_expected }; - check (eq(expected, actual)); + assert (eq(expected, actual)); } fn test_bool() { diff --git a/src/test/run-pass/expr-if-struct.rs b/src/test/run-pass/expr-if-struct.rs index df20a3ba..6d42c224 100644 --- a/src/test/run-pass/expr-if-struct.rs +++ b/src/test/run-pass/expr-if-struct.rs @@ -5,7 +5,7 @@ fn test_rec() { auto res = if (true) { rec(i = 100) } else { rec(i = 101) }; - check (res == rec(i = 100)); + assert (res == rec(i = 100)); } fn test_tag() { @@ -15,7 +15,7 @@ fn test_tag() { } auto res = if (true) { happy } else { sad }; - check (res == happy); + assert (res == happy); } fn main() { diff --git a/src/test/run-pass/expr-if.rs b/src/test/run-pass/expr-if.rs index 7c99f2ea..67f56746 100644 --- a/src/test/run-pass/expr-if.rs +++ b/src/test/run-pass/expr-if.rs @@ -5,12 +5,12 @@ fn test_if() { let bool res = if (true) { true } else { false }; - check (res); + assert (res); } fn test_else() { let bool res = if (false) { false } else { true }; - check (res); + assert (res); } fn test_elseif1() { @@ -21,7 +21,7 @@ fn test_elseif1() { } else { false }; - check (res); + assert (res); } fn test_elseif2() { @@ -32,7 +32,7 @@ fn test_elseif2() { } else { false }; - check (res); + assert (res); } fn test_elseif3() { @@ -43,12 +43,12 @@ fn test_elseif3() { } else { true }; - check (res); + assert (res); } fn test_inferrence() { auto res = if (true) { true } else { false }; - check (res); + assert (res); } fn test_if_as_if_condition() { @@ -57,14 +57,14 @@ fn test_if_as_if_condition() { } else { false }; - check (res1); + assert (res1); auto res2 = if (if (true) { false } else { true }) { false } else { true }; - check (res2); + assert (res2); } fn test_if_as_block_result() { @@ -77,7 +77,7 @@ fn test_if_as_block_result() { } else { false }; - check (res); + assert (res); } fn main() { diff --git a/src/test/run-pass/exterior.rs b/src/test/run-pass/exterior.rs index f09ee823..661effda 100644 --- a/src/test/run-pass/exterior.rs +++ b/src/test/run-pass/exterior.rs @@ -3,16 +3,16 @@ type point = rec(int x, int y, mutable int z); fn f(@point p) { - check (p.z == 12); + assert (p.z == 12); p.z = 13; - check (p.z == 13); + assert (p.z == 13); } fn main() { let point a = rec(x=10, y=11, mutable z=12); let @point b = @a; - check (b.z == 12); + assert (b.z == 12); f(b); - check (a.z == 12); - check (b.z == 13); + assert (a.z == 12); + assert (b.z == 13); } diff --git a/src/test/run-pass/fact.rs b/src/test/run-pass/fact.rs index 91cf099c..577ee6a2 100644 --- a/src/test/run-pass/fact.rs +++ b/src/test/run-pass/fact.rs @@ -15,7 +15,7 @@ fn f(int x) -> int { } } fn main () { - check (f(5) == 120); + assert (f(5) == 120); // log "all done"; } diff --git a/src/test/run-pass/float2.rs b/src/test/run-pass/float2.rs index 9cc3a8ca..e6136d2c 100644 --- a/src/test/run-pass/float2.rs +++ b/src/test/run-pass/float2.rs @@ -12,13 +12,13 @@ fn main() { auto j = 3.1e+9; auto k = 3.2e-10; - check(a == b); - check(c < b); - check(c == d); - check(e < g); - check(f < h); - check(g == 1000000.0f32); - check(h == i); - check(j > k); - check(k < a); + assert (a == b); + assert (c < b); + assert (c == d); + assert (e < g); + assert (f < h); + assert (g == 1000000.0f32); + assert (h == i); + assert (j > k); + assert (k < a); }
\ No newline at end of file diff --git a/src/test/run-pass/floatlits.rs b/src/test/run-pass/floatlits.rs index 10b0fb77..37f21c8f 100644 --- a/src/test/run-pass/floatlits.rs +++ b/src/test/run-pass/floatlits.rs @@ -1,9 +1,9 @@ // xfail-boot fn main() { auto f = 4.999999999999; - check (f > 4.90); - check (f < 5.0); + assert (f > 4.90); + assert (f < 5.0); auto g = 4.90000000001e-10; - check(g > 5e-11); - check(g < 5e-9); + assert (g > 5e-11); + assert (g < 5e-9); }
\ No newline at end of file diff --git a/src/test/run-pass/foreach-nested-2.rs b/src/test/run-pass/foreach-nested-2.rs index d25405d8..33a376d5 100644 --- a/src/test/run-pass/foreach-nested-2.rs +++ b/src/test/run-pass/foreach-nested-2.rs @@ -28,12 +28,12 @@ fn main() { } } - check (a.(0) == 0); - check (a.(1) == 1); - check (a.(2) == 10); - check (a.(3) == 11); - check (a.(4) == 100); - check (a.(5) == 101); - check (a.(6) == 110); - check (a.(7) == 111); + assert (a.(0) == 0); + assert (a.(1) == 1); + assert (a.(2) == 10); + assert (a.(3) == 11); + assert (a.(4) == 100); + assert (a.(5) == 101); + assert (a.(6) == 110); + assert (a.(7) == 111); } diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/run-pass/foreach-nested.rs index a655f591..9ba304c1 100644 --- a/src/test/run-pass/foreach-nested.rs +++ b/src/test/run-pass/foreach-nested.rs @@ -16,8 +16,8 @@ fn main() { } } - check (a.(0) == 0); - check (a.(1) == 1); - check (a.(2) == 10); - check (a.(3) == 11); + assert (a.(0) == 0); + assert (a.(1) == 1); + assert (a.(2) == 10); + assert (a.(3) == 11); } diff --git a/src/test/run-pass/foreach-put-structured.rs b/src/test/run-pass/foreach-put-structured.rs index 43d8b5c3..02dbef5d 100644 --- a/src/test/run-pass/foreach-put-structured.rs +++ b/src/test/run-pass/foreach-put-structured.rs @@ -14,9 +14,9 @@ fn main() { for each (tup(int,int) p in pairs()) { log p._0; log p._1; - check (p._0 + 10 == i); + assert (p._0 + 10 == i); i += 1; j = p._1; } - check(j == 45); + assert (j == 45); }
\ No newline at end of file diff --git a/src/test/run-pass/foreach-simple-outer-slot.rs b/src/test/run-pass/foreach-simple-outer-slot.rs index efc6e8ca..8f23d61d 100644 --- a/src/test/run-pass/foreach-simple-outer-slot.rs +++ b/src/test/run-pass/foreach-simple-outer-slot.rs @@ -9,7 +9,7 @@ fn main() { } log "sum"; log sum; - check (sum == 45); + assert (sum == 45); } iter first_ten() -> int { diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/run-pass/fun-call-variants.rs index 59446b4a..5fa3837e 100644 --- a/src/test/run-pass/fun-call-variants.rs +++ b/src/test/run-pass/fun-call-variants.rs @@ -13,7 +13,7 @@ fn main() { let int a = direct(3); // direct //let int b = ho(direct); // indirect unbound let int c = ho(bind direct(_)); // indirect bound - //check(a == b); - //check(b == c); + //assert (a == b); + //assert (b == c); } diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/run-pass/fun-indirect-call.rs index 10c2cf40..1d506dca 100644 --- a/src/test/run-pass/fun-indirect-call.rs +++ b/src/test/run-pass/fun-indirect-call.rs @@ -7,5 +7,5 @@ fn f() -> int { fn main() { let fn() -> int g = f; let int i = g(); - check(i == 42); + assert (i == 42); } diff --git a/src/test/run-pass/generic-alias-box.rs b/src/test/run-pass/generic-alias-box.rs index 377e0fb2..ce3889fb 100644 --- a/src/test/run-pass/generic-alias-box.rs +++ b/src/test/run-pass/generic-alias-box.rs @@ -8,5 +8,5 @@ fn main() { auto expected = @100; auto actual = id[@int](expected); log *actual; - check (*expected == *actual); + assert (*expected == *actual); }
\ No newline at end of file diff --git a/src/test/run-pass/generic-bind-2.rs b/src/test/run-pass/generic-bind-2.rs index 3975867a..f3a65edd 100644 --- a/src/test/run-pass/generic-bind-2.rs +++ b/src/test/run-pass/generic-bind-2.rs @@ -5,7 +5,7 @@ fn id[T](&T t) -> T { fn main() { auto t = tup(1,2,3,4,5,6,7); - check (t._5 == 6); + assert (t._5 == 6); auto f0 = bind id[tup(int,int,int,int,int,int,int)](t); - check (f0()._5 == 6); + assert (f0()._5 == 6); } diff --git a/src/test/run-pass/generic-bind.rs b/src/test/run-pass/generic-bind.rs index ef1275e3..c65e061a 100644 --- a/src/test/run-pass/generic-bind.rs +++ b/src/test/run-pass/generic-bind.rs @@ -4,7 +4,7 @@ fn id[T](&T t) -> T { fn main() { auto t = tup(1,2,3,4,5,6,7); - check (t._5 == 6); + assert (t._5 == 6); auto f1 = bind id[tup(int,int,int,int,int,int,int)](_); - check (f1(t)._5 == 6); + assert (f1(t)._5 == 6); } diff --git a/src/test/run-pass/generic-box.rs b/src/test/run-pass/generic-box.rs index 856f3aff..76d5e3ab 100644 --- a/src/test/run-pass/generic-box.rs +++ b/src/test/run-pass/generic-box.rs @@ -4,5 +4,5 @@ fn box[T](&tup(T,T,T) x) -> @tup(T,T,T) { fn main() { let @tup(int,int,int) x = box[int](tup(1,2,3)); - check (x._1 == 2); + assert (x._1 == 2); }
\ No newline at end of file diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/run-pass/generic-derived-type.rs index 54c3f956..507d1c5f 100644 --- a/src/test/run-pass/generic-derived-type.rs +++ b/src/test/run-pass/generic-derived-type.rs @@ -12,6 +12,6 @@ fn main() { auto b = f[int](10); log b._0; log b._1; - check (b._0 == 10); - check (b._1 == 10); + assert (b._0 == 10); + assert (b._1 == 10); } diff --git a/src/test/run-pass/generic-exterior-box.rs b/src/test/run-pass/generic-exterior-box.rs index 0ec7020c..07eae9c1 100644 --- a/src/test/run-pass/generic-exterior-box.rs +++ b/src/test/run-pass/generic-exterior-box.rs @@ -8,6 +8,6 @@ fn main() { let int foo = 17; let tupbox[int] tbfoo = tuplift[int](foo); let recbox[int] rbfoo = reclift[int](foo); - check (tbfoo._0 == foo); - check (rbfoo.x == foo); + assert (tbfoo._0 == foo); + assert (rbfoo.x == foo); } diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/run-pass/generic-fn-infer.rs index 4398670f..9c795ec2 100644 --- a/src/test/run-pass/generic-fn-infer.rs +++ b/src/test/run-pass/generic-fn-infer.rs @@ -9,5 +9,5 @@ fn id[T](&T x) -> T { fn main() { let int x = 42; let int y = id(x); - check (x == y); + assert (x == y); } diff --git a/src/test/run-pass/generic-fn.rs b/src/test/run-pass/generic-fn.rs index 238ef2d1..4f93fef5 100644 --- a/src/test/run-pass/generic-fn.rs +++ b/src/test/run-pass/generic-fn.rs @@ -17,16 +17,16 @@ fn main() { y = id[int](x); log y; - check (x == y); + assert (x == y); b = id[char](a); log b; - check (a == b); + assert (a == b); q = id[triple](p); x = p._2; y = q._2; log y; - check (x == y); + assert (x == y); } diff --git a/src/test/run-pass/generic-obj-with-derived-type.rs b/src/test/run-pass/generic-obj-with-derived-type.rs index 2a50ccd2..cc549f6b 100644 --- a/src/test/run-pass/generic-obj-with-derived-type.rs +++ b/src/test/run-pass/generic-obj-with-derived-type.rs @@ -11,7 +11,7 @@ fn main() { log h.get()._0; log h.get()._1; log h.get()._2; - check (h.get()._0 == (1 as u8)); - check (h.get()._1 == (2 as u8)); - check (h.get()._2 == (3 as u8)); + assert (h.get()._0 == (1 as u8)); + assert (h.get()._1 == (2 as u8)); + assert (h.get()._2 == (3 as u8)); } diff --git a/src/test/run-pass/generic-obj.rs b/src/test/run-pass/generic-obj.rs index ced9140f..9879fa79 100644 --- a/src/test/run-pass/generic-obj.rs +++ b/src/test/run-pass/generic-obj.rs @@ -21,8 +21,8 @@ fn main() { log b.get(0); log b.get(1); log b.get(2); - check (b.get(0) == 1); - check (b.get(1) == 2); - check (b.get(2) == 3); + assert (b.get(0) == 1); + assert (b.get(1) == 2); + assert (b.get(2) == 3); b.take2(0); } diff --git a/src/test/run-pass/generic-tag-alt.rs b/src/test/run-pass/generic-tag-alt.rs index 9b19eec7..f29cfa00 100644 --- a/src/test/run-pass/generic-tag-alt.rs +++ b/src/test/run-pass/generic-tag-alt.rs @@ -10,7 +10,7 @@ fn altfoo[T](&foo[T] f) { hit = true; } } - check (hit); + assert (hit); } fn main() { diff --git a/src/test/run-pass/generic-tag-values.rs b/src/test/run-pass/generic-tag-values.rs index 090a0504..46421e0a 100644 --- a/src/test/run-pass/generic-tag-values.rs +++ b/src/test/run-pass/generic-tag-values.rs @@ -9,7 +9,7 @@ fn main() { alt (nop) { case (some[int](?n)) { log n; - check (n == 5); + assert (n == 5); } } @@ -18,8 +18,8 @@ fn main() { case (some[tup(int, int)](?t)) { log t._0; log t._1; - check (t._0 == 17); - check (t._1 == 42); + assert (t._0 == 17); + assert (t._1 == 42); } } } diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/run-pass/generic-temporary.rs index 98401ecc..2f697124 100644 --- a/src/test/run-pass/generic-temporary.rs +++ b/src/test/run-pass/generic-temporary.rs @@ -5,7 +5,7 @@ fn mk() -> int { fn chk(&int a) { log a; - check (a == 1); + assert (a == 1); } fn apply[T](fn() -> T produce, fn(&T) consume) { diff --git a/src/test/run-pass/generic-tup.rs b/src/test/run-pass/generic-tup.rs index c387ef19..d2edfd2e 100644 --- a/src/test/run-pass/generic-tup.rs +++ b/src/test/run-pass/generic-tup.rs @@ -6,6 +6,6 @@ fn get_third[T](&tup(T,T,T) t) -> T { fn main() { log get_third(tup(1,2,3)); - check (get_third(tup(1,2,3)) == 3); - check (get_third(tup(5u8,6u8,7u8)) == 7u8); + assert (get_third(tup(1,2,3)) == 3); + assert (get_third(tup(5u8,6u8,7u8)) == 7u8); }
\ No newline at end of file diff --git a/src/test/run-pass/generic-type.rs b/src/test/run-pass/generic-type.rs index 6638cebf..9b5b5297 100644 --- a/src/test/run-pass/generic-type.rs +++ b/src/test/run-pass/generic-type.rs @@ -1,6 +1,6 @@ type pair[T] = tup(T,T); fn main() { let pair[int] x = tup(10,12); - check (x._0 == 10); - check (x._1 == 12); + assert (x._0 == 10); + assert (x._1 == 12); } diff --git a/src/test/run-pass/i32-sub.rs b/src/test/run-pass/i32-sub.rs index 3f00acb1..eb5e76fb 100644 --- a/src/test/run-pass/i32-sub.rs +++ b/src/test/run-pass/i32-sub.rs @@ -3,6 +3,6 @@ fn main() { let i32 x = -400_i32; x = 0_i32 - x; - check(x == 400_i32); + assert (x == 400_i32); } diff --git a/src/test/run-pass/i8-incr.rs b/src/test/run-pass/i8-incr.rs index fb387d31..92ff04ea 100644 --- a/src/test/run-pass/i8-incr.rs +++ b/src/test/run-pass/i8-incr.rs @@ -5,5 +5,5 @@ fn main() { let i8 y = -12i8; x = x + 1i8; x = x - 1i8; - check(x == y); + assert (x == y); } diff --git a/src/test/run-pass/integral-indexing.rs b/src/test/run-pass/integral-indexing.rs index fe7d147c..ee80786c 100644 --- a/src/test/run-pass/integral-indexing.rs +++ b/src/test/run-pass/integral-indexing.rs @@ -4,19 +4,19 @@ fn main() { let vec[int] v = vec(0, 1, 2, 3, 4, 5); let str s = "abcdef"; - check (v.(3u) == 3); - check (v.(3u8) == 3); - check (v.(3i8) == 3); - check (v.(3u32) == 3); - check (v.(3i32) == 3); + assert (v.(3u) == 3); + assert (v.(3u8) == 3); + assert (v.(3i8) == 3); + assert (v.(3u32) == 3); + assert (v.(3i32) == 3); log v.(3u8); - check (s.(3u) == 'd' as u8); - check (s.(3u8) == 'd' as u8); - check (s.(3i8) == 'd' as u8); - check (s.(3u32) == 'd' as u8); - check (s.(3i32) == 'd' as u8); + assert (s.(3u) == 'd' as u8); + assert (s.(3u8) == 'd' as u8); + assert (s.(3i8) == 'd' as u8); + assert (s.(3u32) == 'd' as u8); + assert (s.(3i32) == 'd' as u8); log s.(3u8); }
\ No newline at end of file diff --git a/src/test/run-pass/iter-range.rs b/src/test/run-pass/iter-range.rs index ade7c51c..78bf94c3 100644 --- a/src/test/run-pass/iter-range.rs +++ b/src/test/run-pass/iter-range.rs @@ -1,5 +1,5 @@ iter range(int a, int b) -> int { - check (a < b); + assert (a < b); let int i = a; while (i < b) { diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/run-pass/lazy-and-or.rs index fe0ffe6b..7034efba 100644 --- a/src/test/run-pass/lazy-and-or.rs +++ b/src/test/run-pass/lazy-and-or.rs @@ -1,22 +1,22 @@ fn incr(& mutable int x) -> bool { x += 1; - check (false); + assert (false); ret false; } fn main() { auto x = (1 == 2) || (3 == 3); - check (x); + assert (x); let int y = 10; log x || incr(y); - check (y == 10); + assert (y == 10); if (true && x) { - check (true); + assert (true); } else { - check (false); + assert (false); } }
\ No newline at end of file diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs index 6face271..a91adaa1 100644 --- a/src/test/run-pass/lazychan.rs +++ b/src/test/run-pass/lazychan.rs @@ -10,13 +10,13 @@ fn main() { y <- p; log "received 1"; log y; - check (y == 10); + assert (y == 10); spawn child(c); y <- p; log "received 2"; log y; - check (y == 10); + assert (y == 10); } fn child(chan[int] c) { diff --git a/src/test/run-pass/lib-bitv.rs b/src/test/run-pass/lib-bitv.rs index 162e8b13..8f2d9390 100644 --- a/src/test/run-pass/lib-bitv.rs +++ b/src/test/run-pass/lib-bitv.rs @@ -9,17 +9,17 @@ fn test_0_elements() { act = bitv.create(0u, false); exp = _vec.init_elt[uint](0u, 0u); // FIXME: why can't I write vec[uint]()? - check (bitv.eq_vec(act, exp)); + assert (bitv.eq_vec(act, exp)); } fn test_1_element() { auto act; act = bitv.create(1u, false); - check (bitv.eq_vec(act, vec(0u))); + assert (bitv.eq_vec(act, vec(0u))); act = bitv.create(1u, true); - check (bitv.eq_vec(act, vec(1u))); + assert (bitv.eq_vec(act, vec(1u))); } fn test_10_elements() { @@ -27,11 +27,11 @@ fn test_10_elements() { // all 0 act = bitv.create(10u, false); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); // all 1 act = bitv.create(10u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u))); + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u))); // mixed act = bitv.create(10u, false); @@ -40,7 +40,7 @@ fn test_10_elements() { bitv.set(act, 2u, true); bitv.set(act, 3u, true); bitv.set(act, 4u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u))); + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u))); // mixed act = bitv.create(10u, false); @@ -49,7 +49,7 @@ fn test_10_elements() { bitv.set(act, 7u, true); bitv.set(act, 8u, true); bitv.set(act, 9u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u))); + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u))); // mixed act = bitv.create(10u, false); @@ -57,7 +57,7 @@ fn test_10_elements() { bitv.set(act, 3u, true); bitv.set(act, 6u, true); bitv.set(act, 9u, true); - check (bitv.eq_vec(act, vec(1u, 0u, 0u, 1u, 0u, 0u, 1u, 0u, 0u, 1u))); + assert (bitv.eq_vec(act, vec(1u, 0u, 0u, 1u, 0u, 0u, 1u, 0u, 0u, 1u))); } fn test_31_elements() { @@ -65,14 +65,14 @@ fn test_31_elements() { // all 0 act = bitv.create(31u, false); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); // all 1 act = bitv.create(31u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u))); @@ -87,7 +87,7 @@ fn test_31_elements() { bitv.set(act, 5u, true); bitv.set(act, 6u, true); bitv.set(act, 7u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); @@ -102,7 +102,7 @@ fn test_31_elements() { bitv.set(act, 21u, true); bitv.set(act, 22u, true); bitv.set(act, 23u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); @@ -116,7 +116,7 @@ fn test_31_elements() { bitv.set(act, 28u, true); bitv.set(act, 29u, true); bitv.set(act, 30u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u))); @@ -126,7 +126,7 @@ fn test_31_elements() { bitv.set(act, 3u, true); bitv.set(act, 17u, true); bitv.set(act, 30u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u))); @@ -137,14 +137,14 @@ fn test_32_elements() { // all 0 act = bitv.create(32u, false); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); // all 1 act = bitv.create(32u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u))); @@ -159,7 +159,7 @@ fn test_32_elements() { bitv.set(act, 5u, true); bitv.set(act, 6u, true); bitv.set(act, 7u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); @@ -174,7 +174,7 @@ fn test_32_elements() { bitv.set(act, 21u, true); bitv.set(act, 22u, true); bitv.set(act, 23u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u))); @@ -189,7 +189,7 @@ fn test_32_elements() { bitv.set(act, 29u, true); bitv.set(act, 30u, true); bitv.set(act, 31u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u))); @@ -200,7 +200,7 @@ fn test_32_elements() { bitv.set(act, 17u, true); bitv.set(act, 30u, true); bitv.set(act, 31u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u))); @@ -211,7 +211,7 @@ fn test_33_elements() { // all 0 act = bitv.create(33u, false); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, @@ -219,7 +219,7 @@ fn test_33_elements() { // all 1 act = bitv.create(33u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, @@ -235,7 +235,7 @@ fn test_33_elements() { bitv.set(act, 5u, true); bitv.set(act, 6u, true); bitv.set(act, 7u, true); - check (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, + assert (bitv.eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, @@ -251,7 +251,7 @@ fn test_33_elements() { bitv.set(act, 21u, true); bitv.set(act, 22u, true); bitv.set(act, 23u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, @@ -267,7 +267,7 @@ fn test_33_elements() { bitv.set(act, 29u, true); bitv.set(act, 30u, true); bitv.set(act, 31u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, @@ -280,7 +280,7 @@ fn test_33_elements() { bitv.set(act, 30u, true); bitv.set(act, 31u, true); bitv.set(act, 32u, true); - check (bitv.eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, + assert (bitv.eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, diff --git a/src/test/run-pass/lib-box.rs b/src/test/run-pass/lib-box.rs index 10f5e727..62807251 100644 --- a/src/test/run-pass/lib-box.rs +++ b/src/test/run-pass/lib-box.rs @@ -4,9 +4,9 @@ import std.Box; fn main() { auto x = @3; auto y = @3; - check (Box.ptr_eq[int](x, x)); - check (Box.ptr_eq[int](y, y)); - check (!Box.ptr_eq[int](x, y)); - check (!Box.ptr_eq[int](y, x)); + assert (Box.ptr_eq[int](x, x)); + assert (Box.ptr_eq[int](y, y)); + assert (!Box.ptr_eq[int](x, y)); + assert (!Box.ptr_eq[int](y, x)); } diff --git a/src/test/run-pass/lib-deque.rs b/src/test/run-pass/lib-deque.rs index 9fd177ea..405ab72b 100644 --- a/src/test/run-pass/lib-deque.rs +++ b/src/test/run-pass/lib-deque.rs @@ -5,125 +5,125 @@ import std.deque; fn test_simple() { let deque.t[int] d = deque.create[int](); - check (d.size() == 0u); + assert (d.size() == 0u); d.add_front(17); d.add_front(42); d.add_back(137); - check (d.size() == 3u); + assert (d.size() == 3u); d.add_back(137); - check (d.size() == 4u); + assert (d.size() == 4u); log d.peek_front(); - check (d.peek_front() == 42); + assert (d.peek_front() == 42); log d.peek_back(); - check (d.peek_back() == 137); + assert (d.peek_back() == 137); let int i = d.pop_front(); log i; - check (i == 42); + assert (i == 42); i = d.pop_back(); log i; - check (i == 137); + assert (i == 137); i = d.pop_back(); log i; - check (i == 137); + assert (i == 137); i = d.pop_back(); log i; - check (i == 17); + assert (i == 17); - check (d.size() == 0u); + assert (d.size() == 0u); d.add_back(3); - check (d.size() == 1u); + assert (d.size() == 1u); d.add_front(2); - check (d.size() == 2u); + assert (d.size() == 2u); d.add_back(4); - check (d.size() == 3u); + assert (d.size() == 3u); d.add_front(1); - check (d.size() == 4u); + assert (d.size() == 4u); log d.get(0); log d.get(1); log d.get(2); log d.get(3); - check (d.get(0) == 1); - check (d.get(1) == 2); - check (d.get(2) == 3); - check (d.get(3) == 4); + assert (d.get(0) == 1); + assert (d.get(1) == 2); + assert (d.get(2) == 3); + assert (d.get(3) == 4); } fn test_boxes(@int a, @int b, @int c, @int d) { let deque.t[@int] deq = deque.create[@int](); - check (deq.size() == 0u); + assert (deq.size() == 0u); deq.add_front(a); deq.add_front(b); deq.add_back(c); - check (deq.size() == 3u); + assert (deq.size() == 3u); deq.add_back(d); - check (deq.size() == 4u); + assert (deq.size() == 4u); - check (deq.peek_front() == b); - check (deq.peek_back() == d); + assert (deq.peek_front() == b); + assert (deq.peek_back() == d); - check (deq.pop_front() == b); - check (deq.pop_back() == d); - check (deq.pop_back() == c); - check (deq.pop_back() == a); + assert (deq.pop_front() == b); + assert (deq.pop_back() == d); + assert (deq.pop_back() == c); + assert (deq.pop_back() == a); - check (deq.size() == 0u); + assert (deq.size() == 0u); deq.add_back(c); - check (deq.size() == 1u); + assert (deq.size() == 1u); deq.add_front(b); - check (deq.size() == 2u); + assert (deq.size() == 2u); deq.add_back(d); - check (deq.size() == 3u); + assert (deq.size() == 3u); deq.add_front(a); - check (deq.size() == 4u); + assert (deq.size() == 4u); - check (deq.get(0) == a); - check (deq.get(1) == b); - check (deq.get(2) == c); - check (deq.get(3) == d); + assert (deq.get(0) == a); + assert (deq.get(1) == b); + assert (deq.get(2) == c); + assert (deq.get(3) == d); } type eqfn[T] = fn(&T a, &T b) -> bool; fn test_parameterized[T](eqfn[T] e, &T a, &T b, &T c, &T d) { let deque.t[T] deq = deque.create[T](); - check (deq.size() == 0u); + assert (deq.size() == 0u); deq.add_front(a); deq.add_front(b); deq.add_back(c); - check (deq.size() == 3u); + assert (deq.size() == 3u); deq.add_back(d); - check (deq.size() == 4u); + assert (deq.size() == 4u); - check (e(deq.peek_front(), b)); - check (e(deq.peek_back(), d)); + assert (e(deq.peek_front(), b)); + assert (e(deq.peek_back(), d)); - check (e(deq.pop_front(), b)); - check (e(deq.pop_back(), d)); - check (e(deq.pop_back(), c)); - check (e(deq.pop_back(), a)); + assert (e(deq.pop_front(), b)); + assert (e(deq.pop_back(), d)); + assert (e(deq.pop_back(), c)); + assert (e(deq.pop_back(), a)); - check (deq.size() == 0u); + assert (deq.size() == 0u); deq.add_back(c); - check (deq.size() == 1u); + assert (deq.size() == 1u); deq.add_front(b); - check (deq.size() == 2u); + assert (deq.size() == 2u); deq.add_back(d); - check (deq.size() == 3u); + assert (deq.size() == 3u); deq.add_front(a); - check (deq.size() == 4u); + assert (deq.size() == 4u); - check (e(deq.get(0), a)); - check (e(deq.get(1), b)); - check (e(deq.get(2), c)); - check (e(deq.get(3), d)); + assert (e(deq.get(0), a)); + assert (e(deq.get(1), b)); + assert (e(deq.get(2), c)); + assert (e(deq.get(3), d)); } tag taggy { diff --git a/src/test/run-pass/lib-int.rs b/src/test/run-pass/lib-int.rs index 2e85abf6..e4e68351 100644 --- a/src/test/run-pass/lib-int.rs +++ b/src/test/run-pass/lib-int.rs @@ -4,22 +4,22 @@ import std._int; import std._str.eq; fn test_to_str() { - check (eq(_int.to_str(0, 10u), "0")); - check (eq(_int.to_str(1, 10u), "1")); - check (eq(_int.to_str(-1, 10u), "-1")); - check (eq(_int.to_str(255, 16u), "ff")); - check (eq(_int.to_str(100, 10u), "100")); + assert (eq(_int.to_str(0, 10u), "0")); + assert (eq(_int.to_str(1, 10u), "1")); + assert (eq(_int.to_str(-1, 10u), "-1")); + assert (eq(_int.to_str(255, 16u), "ff")); + assert (eq(_int.to_str(100, 10u), "100")); } fn test_pow() { - check (_int.pow(0, 0u) == 1); - check (_int.pow(0, 1u) == 0); - check (_int.pow(0, 2u) == 0); - check (_int.pow(-1, 0u) == -1); - check (_int.pow(1, 0u) == 1); - check (_int.pow(-3, 2u) == 9); - check (_int.pow(-3, 3u) == -27); - check (_int.pow(4, 9u) == 262144); + assert (_int.pow(0, 0u) == 1); + assert (_int.pow(0, 1u) == 0); + assert (_int.pow(0, 2u) == 0); + assert (_int.pow(-1, 0u) == -1); + assert (_int.pow(1, 0u) == 1); + assert (_int.pow(-3, 2u) == 9); + assert (_int.pow(-3, 3u) == -27); + assert (_int.pow(4, 9u) == 262144); } fn main() { diff --git a/src/test/run-pass/lib-io.rs b/src/test/run-pass/lib-io.rs index 7102c91e..bcc2163c 100644 --- a/src/test/run-pass/lib-io.rs +++ b/src/test/run-pass/lib-io.rs @@ -20,7 +20,7 @@ fn test_simple(str tmpfilebase) { let io.reader inp = io.file_reader(tmpfile); let str frood2 = inp.read_c_str(); log frood2; - check (_str.eq(frood, frood2)); + assert (_str.eq(frood, frood2)); } fn main(vec[str] argv) { diff --git a/src/test/run-pass/lib-map.rs b/src/test/run-pass/lib-map.rs index 4c8afa7d..abd2041e 100644 --- a/src/test/run-pass/lib-map.rs +++ b/src/test/run-pass/lib-map.rs @@ -28,19 +28,19 @@ fn test_simple() { let map.hashmap[uint, uint] hm_uu = map.mk_hashmap[uint, uint](hasher_uint, eqer_uint); - check (hm_uu.insert(10u, 12u)); - check (hm_uu.insert(11u, 13u)); - check (hm_uu.insert(12u, 14u)); + assert (hm_uu.insert(10u, 12u)); + assert (hm_uu.insert(11u, 13u)); + assert (hm_uu.insert(12u, 14u)); - check (hm_uu.get(11u) == 13u); - check (hm_uu.get(12u) == 14u); - check (hm_uu.get(10u) == 12u); + assert (hm_uu.get(11u) == 13u); + assert (hm_uu.get(12u) == 14u); + assert (hm_uu.get(10u) == 12u); - check (!hm_uu.insert(12u, 14u)); - check (hm_uu.get(12u) == 14u); + assert (!hm_uu.insert(12u, 14u)); + assert (hm_uu.get(12u) == 14u); - check (!hm_uu.insert(12u, 12u)); - check (hm_uu.get(12u) == 12u); + assert (!hm_uu.insert(12u, 12u)); + assert (hm_uu.get(12u) == 12u); let str ten = "ten"; @@ -51,21 +51,21 @@ fn test_simple() { let map.hashmap[str, uint] hm_su = map.mk_hashmap[str, uint](hasher_str, eqer_str); - check (hm_su.insert("ten", 12u)); - check (hm_su.insert(eleven, 13u)); - check (hm_su.insert("twelve", 14u)); + assert (hm_su.insert("ten", 12u)); + assert (hm_su.insert(eleven, 13u)); + assert (hm_su.insert("twelve", 14u)); - check (hm_su.get(eleven) == 13u); + assert (hm_su.get(eleven) == 13u); - check (hm_su.get("eleven") == 13u); - check (hm_su.get("twelve") == 14u); - check (hm_su.get("ten") == 12u); + assert (hm_su.get("eleven") == 13u); + assert (hm_su.get("twelve") == 14u); + assert (hm_su.get("ten") == 12u); - check (!hm_su.insert("twelve", 14u)); - check (hm_su.get("twelve") == 14u); + assert (!hm_su.insert("twelve", 14u)); + assert (hm_su.get("twelve") == 14u); - check (!hm_su.insert("twelve", 12u)); - check (hm_su.get("twelve") == 12u); + assert (!hm_su.insert("twelve", 12u)); + assert (hm_su.get("twelve") == 12u); log "uint -> str"; @@ -73,19 +73,19 @@ fn test_simple() { let map.hashmap[uint, str] hm_us = map.mk_hashmap[uint, str](hasher_uint, eqer_uint); - check (hm_us.insert(10u, "twelve")); - check (hm_us.insert(11u, "thirteen")); - check (hm_us.insert(12u, "fourteen")); + assert (hm_us.insert(10u, "twelve")); + assert (hm_us.insert(11u, "thirteen")); + assert (hm_us.insert(12u, "fourteen")); - check (_str.eq(hm_us.get(11u), "thirteen")); - check (_str.eq(hm_us.get(12u), "fourteen")); - check (_str.eq(hm_us.get(10u), "twelve")); + assert (_str.eq(hm_us.get(11u), "thirteen")); + assert (_str.eq(hm_us.get(12u), "fourteen")); + assert (_str.eq(hm_us.get(10u), "twelve")); - check (!hm_us.insert(12u, "fourteen")); - check (_str.eq(hm_us.get(12u), "fourteen")); + assert (!hm_us.insert(12u, "fourteen")); + assert (_str.eq(hm_us.get(12u), "fourteen")); - check (!hm_us.insert(12u, "twelve")); - check (_str.eq(hm_us.get(12u), "twelve")); + assert (!hm_us.insert(12u, "twelve")); + assert (_str.eq(hm_us.get(12u), "twelve")); log "str -> str"; @@ -93,19 +93,19 @@ fn test_simple() { let map.hashmap[str, str] hm_ss = map.mk_hashmap[str, str](hasher_str, eqer_str); - check (hm_ss.insert(ten, "twelve")); - check (hm_ss.insert(eleven, "thirteen")); - check (hm_ss.insert(twelve, "fourteen")); + assert (hm_ss.insert(ten, "twelve")); + assert (hm_ss.insert(eleven, "thirteen")); + assert (hm_ss.insert(twelve, "fourteen")); - check (_str.eq(hm_ss.get("eleven"), "thirteen")); - check (_str.eq(hm_ss.get("twelve"), "fourteen")); - check (_str.eq(hm_ss.get("ten"), "twelve")); + assert (_str.eq(hm_ss.get("eleven"), "thirteen")); + assert (_str.eq(hm_ss.get("twelve"), "fourteen")); + assert (_str.eq(hm_ss.get("ten"), "twelve")); - check (!hm_ss.insert("twelve", "fourteen")); - check (_str.eq(hm_ss.get("twelve"), "fourteen")); + assert (!hm_ss.insert("twelve", "fourteen")); + assert (_str.eq(hm_ss.get("twelve"), "fourteen")); - check (!hm_ss.insert("twelve", "twelve")); - check (_str.eq(hm_ss.get("twelve"), "twelve")); + assert (!hm_ss.insert("twelve", "twelve")); + assert (_str.eq(hm_ss.get("twelve"), "twelve")); log "*** finished test_simple"; } @@ -135,7 +135,7 @@ fn test_growth() { let uint i = 0u; while (i < num_to_insert) { - check (hm_uu.insert(i, i * i)); + assert (hm_uu.insert(i, i * i)); log "inserting " + _uint.to_str(i, 10u) + " -> " + _uint.to_str(i * i, 10u); i += 1u; @@ -147,12 +147,12 @@ fn test_growth() { while (i < num_to_insert) { log "get(" + _uint.to_str(i, 10u) + ") = " + _uint.to_str(hm_uu.get(i), 10u); - check (hm_uu.get(i) == i * i); + assert (hm_uu.get(i) == i * i); i += 1u; } - check (hm_uu.insert(num_to_insert, 17u)); - check (hm_uu.get(num_to_insert) == 17u); + assert (hm_uu.insert(num_to_insert, 17u)); + assert (hm_uu.get(num_to_insert) == 17u); log "-----"; @@ -162,7 +162,7 @@ fn test_growth() { while (i < num_to_insert) { log "get(" + _uint.to_str(i, 10u) + ") = " + _uint.to_str(hm_uu.get(i), 10u); - check (hm_uu.get(i) == i * i); + assert (hm_uu.get(i) == i * i); i += 1u; } @@ -176,7 +176,7 @@ fn test_growth() { i = 0u; while (i < num_to_insert) { - check (hm_ss.insert(_uint.to_str(i, 2u), _uint.to_str(i * i, 2u))); + assert (hm_ss.insert(_uint.to_str(i, 2u), _uint.to_str(i * i, 2u))); log "inserting \"" + _uint.to_str(i, 2u) + "\" -> \"" + _uint.to_str(i * i, 2u) + "\""; i += 1u; @@ -191,15 +191,15 @@ fn test_growth() { + "\") = \"" + hm_ss.get(_uint.to_str(i, 2u)) + "\""; - check (_str.eq(hm_ss.get(_uint.to_str(i, 2u)), + assert (_str.eq(hm_ss.get(_uint.to_str(i, 2u)), _uint.to_str(i * i, 2u))); i += 1u; } - check (hm_ss.insert(_uint.to_str(num_to_insert, 2u), + assert (hm_ss.insert(_uint.to_str(num_to_insert, 2u), _uint.to_str(17u, 2u))); - check (_str.eq(hm_ss.get(_uint.to_str(num_to_insert, 2u)), + assert (_str.eq(hm_ss.get(_uint.to_str(num_to_insert, 2u)), _uint.to_str(17u, 2u))); log "-----"; @@ -210,7 +210,7 @@ fn test_growth() { while (i < num_to_insert) { log "get(\"" + _uint.to_str(i, 2u) + "\") = \"" + hm_ss.get(_uint.to_str(i, 2u)) + "\""; - check (_str.eq(hm_ss.get(_uint.to_str(i, 2u)), + assert (_str.eq(hm_ss.get(_uint.to_str(i, 2u)), _uint.to_str(i * i, 2u))); i += 1u; } @@ -230,9 +230,9 @@ fn test_removal() { ret (u / 2u) * 2u; } - check (hash(0u) == hash(1u)); - check (hash(2u) == hash(3u)); - check (hash(0u) != hash(2u)); + assert (hash(0u) == hash(1u)); + assert (hash(2u) == hash(3u)); + assert (hash(0u) != hash(2u)); let map.hashfn[uint] hasher = hash; let map.eqfn[uint] eqer = eq; @@ -240,13 +240,13 @@ fn test_removal() { let uint i = 0u; while (i < num_to_insert) { - check (hm.insert(i, i * i)); + assert (hm.insert(i, i * i)); log "inserting " + _uint.to_str(i, 10u) + " -> " + _uint.to_str(i * i, 10u); i += 1u; } - check (hm.size() == num_to_insert); + assert (hm.size() == num_to_insert); log "-----"; log "removing evens"; @@ -260,7 +260,7 @@ fn test_removal() { let util.option[uint] v = hm.remove(i); alt (v) { case (util.some[uint](u)) { - check (u == (i * i)); + assert (u == (i * i)); } case (util.none[uint]()) { fail; } } @@ -273,7 +273,7 @@ fn test_removal() { i += 2u; } - check (hm.size() == (num_to_insert / 2u)); + assert (hm.size() == (num_to_insert / 2u)); log "-----"; @@ -281,7 +281,7 @@ fn test_removal() { while (i < num_to_insert) { log "get(" + _uint.to_str(i, 10u) + ") = " + _uint.to_str(hm.get(i), 10u); - check (hm.get(i) == i * i); + assert (hm.get(i) == i * i); i += 2u; } @@ -296,7 +296,7 @@ fn test_removal() { while (i < num_to_insert) { log "get(" + _uint.to_str(i, 10u) + ") = " + _uint.to_str(hm.get(i), 10u); - check (hm.get(i) == i * i); + assert (hm.get(i) == i * i); i += 2u; } @@ -304,13 +304,13 @@ fn test_removal() { i = 0u; while (i < num_to_insert) { - check (hm.insert(i, i * i)); + assert (hm.insert(i, i * i)); log "inserting " + _uint.to_str(i, 10u) + " -> " + _uint.to_str(i * i, 10u); i += 2u; } - check (hm.size() == num_to_insert); + assert (hm.size() == num_to_insert); log "-----"; @@ -318,7 +318,7 @@ fn test_removal() { while (i < num_to_insert) { log "get(" + _uint.to_str(i, 10u) + ") = " + _uint.to_str(hm.get(i), 10u); - check (hm.get(i) == i * i); + assert (hm.get(i) == i * i); i += 1u; } @@ -329,13 +329,13 @@ fn test_removal() { log "-----"; - check (hm.size() == num_to_insert); + assert (hm.size() == num_to_insert); i = 0u; while (i < num_to_insert) { log "get(" + _uint.to_str(i, 10u) + ") = " + _uint.to_str(hm.get(i), 10u); - check (hm.get(i) == i * i); + assert (hm.get(i) == i * i); i += 1u; } diff --git a/src/test/run-pass/lib-sha1.rs b/src/test/run-pass/lib-sha1.rs index 57e3cdc8..7e8efb5e 100644 --- a/src/test/run-pass/lib-sha1.rs +++ b/src/test/run-pass/lib-sha1.rs @@ -69,13 +69,13 @@ fn main() { auto tests = fips_180_1_tests + wikipedia_tests; fn check_vec_eq(vec[u8] v0, vec[u8] v1) { - check (_vec.len[u8](v0) == _vec.len[u8](v1)); + assert (_vec.len[u8](v0) == _vec.len[u8](v1)); auto len = _vec.len[u8](v0); auto i = 0u; while (i < len) { auto a = v0.(i); auto b = v1.(i); - check (a == b); + assert (a == b); i += 1u; } } diff --git a/src/test/run-pass/lib-sort.rs b/src/test/run-pass/lib-sort.rs index e2c3465c..a342b24e 100644 --- a/src/test/run-pass/lib-sort.rs +++ b/src/test/run-pass/lib-sort.rs @@ -10,7 +10,7 @@ fn check_sort(vec[int] v1, vec[int] v2) { auto i = 0u; while (i < len) { log v3.(i); - check (v3.(i) == v2.(i)); + assert (v3.(i) == v2.(i)); i += 1u; } } diff --git a/src/test/run-pass/lib-str-buf.rs b/src/test/run-pass/lib-str-buf.rs index bd5cb036..9b8c56bb 100644 --- a/src/test/run-pass/lib-str-buf.rs +++ b/src/test/run-pass/lib-str-buf.rs @@ -8,8 +8,8 @@ fn main() { auto s = "hello"; auto sb = _str.rustrt.str_buf(s); auto s_cstr = _str.rustrt.str_from_cstr(sb); - check (_str.eq(s_cstr, s)); + assert (_str.eq(s_cstr, s)); auto s_buf = _str.rustrt.str_from_buf(sb, 5u); - check (_str.eq(s_buf, s)); + assert (_str.eq(s_buf, s)); } diff --git a/src/test/run-pass/lib-str.rs b/src/test/run-pass/lib-str.rs index 835c08a2..76717711 100644 --- a/src/test/run-pass/lib-str.rs +++ b/src/test/run-pass/lib-str.rs @@ -2,22 +2,22 @@ use std; import std._str; fn test_bytes_len() { - check (_str.byte_len("") == 0u); - check (_str.byte_len("hello world") == 11u); - check (_str.byte_len("\x63") == 1u); - check (_str.byte_len("\xa2") == 2u); - check (_str.byte_len("\u03c0") == 2u); - check (_str.byte_len("\u2620") == 3u); - check (_str.byte_len("\U0001d11e") == 4u); + assert (_str.byte_len("") == 0u); + assert (_str.byte_len("hello world") == 11u); + assert (_str.byte_len("\x63") == 1u); + assert (_str.byte_len("\xa2") == 2u); + assert (_str.byte_len("\u03c0") == 2u); + assert (_str.byte_len("\u2620") == 3u); + assert (_str.byte_len("\U0001d11e") == 4u); } fn test_index_and_rindex() { - check(_str.index("hello", 'e' as u8) == 1); - check(_str.index("hello", 'o' as u8) == 4); - check(_str.index("hello", 'z' as u8) == -1); - check(_str.rindex("hello", 'l' as u8) == 3); - check(_str.rindex("hello", 'h' as u8) == 0); - check(_str.rindex("hello", 'z' as u8) == -1); + assert (_str.index("hello", 'e' as u8) == 1); + assert (_str.index("hello", 'o' as u8) == 4); + assert (_str.index("hello", 'z' as u8) == -1); + assert (_str.rindex("hello", 'l' as u8) == 3); + assert (_str.rindex("hello", 'h' as u8) == 0); + assert (_str.rindex("hello", 'z' as u8) == -1); } fn test_split() { @@ -30,7 +30,7 @@ fn test_split() { log z; } log "comparing: " + v.(i) + " vs. " + k; - check(_str.eq(v.(i), k)); + assert (_str.eq(v.(i), k)); } t("abc.hello.there", '.', 0, "abc"); t("abc.hello.there", '.', 1, "hello"); @@ -46,7 +46,7 @@ fn test_find() { let int j = _str.find(haystack,needle); log "searched for " + needle; log j; - check (i == j); + assert (i == j); } t("this is a simple", "is a", 5); t("this is a simple", "is z", -1); @@ -57,7 +57,7 @@ fn test_find() { fn test_substr() { fn t(&str a, &str b, int start) { - check(_str.eq(_str.substr(a, start as uint, + assert (_str.eq(_str.substr(a, start as uint, _str.byte_len(b)), b)); } @@ -68,7 +68,7 @@ fn test_substr() { fn test_concat() { fn t(&vec[str] v, &str s) { - check(_str.eq(_str.concat(v), s)); + assert (_str.eq(_str.concat(v), s)); } t(vec("you", "know", "I'm", "no", "good"), "youknowI'mnogood"); @@ -79,7 +79,7 @@ fn test_concat() { fn test_connect() { fn t(&vec[str] v, &str sep, &str s) { - check(_str.eq(_str.connect(v, sep), s)); + assert (_str.eq(_str.connect(v, sep), s)); } t(vec("you", "know", "I'm", "no", "good"), " ", "you know I'm no good"); @@ -95,7 +95,7 @@ fn test_to_upper() { auto input = "abcDEF" + unicode + "xyz:.;"; auto expected = "ABCDEF" + unicode + "XYZ:.;"; auto actual = _str.to_upper(input); - check (_str.eq(expected, actual)); + assert (_str.eq(expected, actual)); } diff --git a/src/test/run-pass/lib-uint.rs b/src/test/run-pass/lib-uint.rs index 356ca374..64d39619 100644 --- a/src/test/run-pass/lib-uint.rs +++ b/src/test/run-pass/lib-uint.rs @@ -4,44 +4,44 @@ use std; import std._uint; fn main() { - check (_uint.next_power_of_two(0u) == 0u); - check (_uint.next_power_of_two(1u) == 1u); - check (_uint.next_power_of_two(2u) == 2u); - check (_uint.next_power_of_two(3u) == 4u); - check (_uint.next_power_of_two(4u) == 4u); - check (_uint.next_power_of_two(5u) == 8u); - check (_uint.next_power_of_two(6u) == 8u); - check (_uint.next_power_of_two(7u) == 8u); - check (_uint.next_power_of_two(8u) == 8u); - check (_uint.next_power_of_two(9u) == 16u); - check (_uint.next_power_of_two(10u) == 16u); - check (_uint.next_power_of_two(11u) == 16u); - check (_uint.next_power_of_two(12u) == 16u); - check (_uint.next_power_of_two(13u) == 16u); - check (_uint.next_power_of_two(14u) == 16u); - check (_uint.next_power_of_two(15u) == 16u); - check (_uint.next_power_of_two(16u) == 16u); - check (_uint.next_power_of_two(17u) == 32u); - check (_uint.next_power_of_two(18u) == 32u); - check (_uint.next_power_of_two(19u) == 32u); - check (_uint.next_power_of_two(20u) == 32u); - check (_uint.next_power_of_two(21u) == 32u); - check (_uint.next_power_of_two(22u) == 32u); - check (_uint.next_power_of_two(23u) == 32u); - check (_uint.next_power_of_two(24u) == 32u); - check (_uint.next_power_of_two(25u) == 32u); - check (_uint.next_power_of_two(26u) == 32u); - check (_uint.next_power_of_two(27u) == 32u); - check (_uint.next_power_of_two(28u) == 32u); - check (_uint.next_power_of_two(29u) == 32u); - check (_uint.next_power_of_two(30u) == 32u); - check (_uint.next_power_of_two(31u) == 32u); - check (_uint.next_power_of_two(32u) == 32u); - check (_uint.next_power_of_two(33u) == 64u); - check (_uint.next_power_of_two(34u) == 64u); - check (_uint.next_power_of_two(35u) == 64u); - check (_uint.next_power_of_two(36u) == 64u); - check (_uint.next_power_of_two(37u) == 64u); - check (_uint.next_power_of_two(38u) == 64u); - check (_uint.next_power_of_two(39u) == 64u); + assert (_uint.next_power_of_two(0u) == 0u); + assert (_uint.next_power_of_two(1u) == 1u); + assert (_uint.next_power_of_two(2u) == 2u); + assert (_uint.next_power_of_two(3u) == 4u); + assert (_uint.next_power_of_two(4u) == 4u); + assert (_uint.next_power_of_two(5u) == 8u); + assert (_uint.next_power_of_two(6u) == 8u); + assert (_uint.next_power_of_two(7u) == 8u); + assert (_uint.next_power_of_two(8u) == 8u); + assert (_uint.next_power_of_two(9u) == 16u); + assert (_uint.next_power_of_two(10u) == 16u); + assert (_uint.next_power_of_two(11u) == 16u); + assert (_uint.next_power_of_two(12u) == 16u); + assert (_uint.next_power_of_two(13u) == 16u); + assert (_uint.next_power_of_two(14u) == 16u); + assert (_uint.next_power_of_two(15u) == 16u); + assert (_uint.next_power_of_two(16u) == 16u); + assert (_uint.next_power_of_two(17u) == 32u); + assert (_uint.next_power_of_two(18u) == 32u); + assert (_uint.next_power_of_two(19u) == 32u); + assert (_uint.next_power_of_two(20u) == 32u); + assert (_uint.next_power_of_two(21u) == 32u); + assert (_uint.next_power_of_two(22u) == 32u); + assert (_uint.next_power_of_two(23u) == 32u); + assert (_uint.next_power_of_two(24u) == 32u); + assert (_uint.next_power_of_two(25u) == 32u); + assert (_uint.next_power_of_two(26u) == 32u); + assert (_uint.next_power_of_two(27u) == 32u); + assert (_uint.next_power_of_two(28u) == 32u); + assert (_uint.next_power_of_two(29u) == 32u); + assert (_uint.next_power_of_two(30u) == 32u); + assert (_uint.next_power_of_two(31u) == 32u); + assert (_uint.next_power_of_two(32u) == 32u); + assert (_uint.next_power_of_two(33u) == 64u); + assert (_uint.next_power_of_two(34u) == 64u); + assert (_uint.next_power_of_two(35u) == 64u); + assert (_uint.next_power_of_two(36u) == 64u); + assert (_uint.next_power_of_two(37u) == 64u); + assert (_uint.next_power_of_two(38u) == 64u); + assert (_uint.next_power_of_two(39u) == 64u); } diff --git a/src/test/run-pass/lib-vec-str-conversions.rs b/src/test/run-pass/lib-vec-str-conversions.rs index 1d6b61a1..3724d627 100644 --- a/src/test/run-pass/lib-vec-str-conversions.rs +++ b/src/test/run-pass/lib-vec-str-conversions.rs @@ -21,14 +21,14 @@ fn test_simple() { let uint n1 = _str.byte_len(s1); let uint n2 = _vec.len[u8](v); - check (n1 == n2); + assert (n1 == n2); while (i < n1) { let u8 a = s1.(i); let u8 b = s2.(i); log a; log b; - check (a == b); + assert (a == b); i += 1u; } diff --git a/src/test/run-pass/lib-vec.rs b/src/test/run-pass/lib-vec.rs index 4d616648..51341039 100644 --- a/src/test/run-pass/lib-vec.rs +++ b/src/test/run-pass/lib-vec.rs @@ -2,10 +2,10 @@ use std; fn test_init_elt() { let vec[uint] v = std._vec.init_elt[uint](5u, 3u); - check (std._vec.len[uint](v) == 3u); - check (v.(0) == 5u); - check (v.(1) == 5u); - check (v.(2) == 5u); + assert (std._vec.len[uint](v) == 3u); + assert (v.(0) == 5u); + assert (v.(1) == 5u); + assert (v.(2) == 5u); } fn id(uint x) -> uint { @@ -14,20 +14,20 @@ fn id(uint x) -> uint { fn test_init_fn() { let fn(uint)->uint op = id; let vec[uint] v = std._vec.init_fn[uint](op, 5u); - check (std._vec.len[uint](v) == 5u); - check (v.(0) == 0u); - check (v.(1) == 1u); - check (v.(2) == 2u); - check (v.(3) == 3u); - check (v.(4) == 4u); + assert (std._vec.len[uint](v) == 5u); + assert (v.(0) == 0u); + assert (v.(1) == 1u); + assert (v.(2) == 2u); + assert (v.(3) == 3u); + assert (v.(4) == 4u); } fn test_slice() { let vec[int] v = vec(1,2,3,4,5); auto v2 = std._vec.slice[int](v, 2u, 4u); - check (std._vec.len[int](v2) == 2u); - check (v2.(0) == 3); - check (v2.(1) == 4); + assert (std._vec.len[int](v2) == 2u); + assert (v2.(0) == 3); + assert (v2.(1) == 4); } fn test_map() { @@ -37,7 +37,7 @@ fn test_map() { let vec[int] s = std._vec.map[int, int](op, v); let int i = 0; while (i < 5) { - check (v.(i) * v.(i) == s.(i)); + assert (v.(i) * v.(i) == s.(i)); i += 1; } } @@ -51,7 +51,7 @@ fn test_map2() { auto i = 0; while (i < 5) { - check (v0.(i) * v1.(i) == u.(i)); + assert (v0.(i) * v1.(i) == u.(i)); i += 1; } } diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/run-pass/linear-for-loop.rs index 2b517f78..c816f817 100644 --- a/src/test/run-pass/linear-for-loop.rs +++ b/src/test/run-pass/linear-for-loop.rs @@ -6,30 +6,30 @@ fn main() { y += i; } log y; - check (y == 6); + assert (y == 6); auto s = "hello there"; let int i = 0; for (u8 c in s) { if (i == 0) { - check (c == ('h' as u8)); + assert (c == ('h' as u8)); } if (i == 1) { - check (c == ('e' as u8)); + assert (c == ('e' as u8)); } if (i == 2) { - check (c == ('l' as u8)); + assert (c == ('l' as u8)); } if (i == 3) { - check (c == ('l' as u8)); + assert (c == ('l' as u8)); } if (i == 4) { - check (c == ('o' as u8)); + assert (c == ('o' as u8)); } // ... i += 1; log i; log c; } - check(i == 11); + assert (i == 11); } diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs index f83ab4fb..5b67fdc6 100644 --- a/src/test/run-pass/many.rs +++ b/src/test/run-pass/many.rs @@ -19,5 +19,5 @@ fn main() { let int y <- p; log "transmission complete"; log y; - check (y == 500); + assert (y == 500); } diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs index 887fb391..71d4dfe9 100644 --- a/src/test/run-pass/mutable-alias-vec.rs +++ b/src/test/run-pass/mutable-alias-vec.rs @@ -13,5 +13,5 @@ fn main() { grow(v); auto len = std._vec.len[int](v); log len; - check (len == (3 as uint)); + assert (len == (3 as uint)); } diff --git a/src/test/run-pass/native-opaque-type.rs b/src/test/run-pass/native-opaque-type.rs index 19c2c074..e9b7a972 100644 --- a/src/test/run-pass/native-opaque-type.rs +++ b/src/test/run-pass/native-opaque-type.rs @@ -3,5 +3,5 @@ native mod libc { } fn main() { - check (true); + assert (true); } diff --git a/src/test/run-pass/obj-as.rs b/src/test/run-pass/obj-as.rs index 6e0dac37..28868548 100644 --- a/src/test/run-pass/obj-as.rs +++ b/src/test/run-pass/obj-as.rs @@ -15,10 +15,10 @@ type small = obj { fn main() { let big b = big(); - check (b.one() == 1); - check (b.two() == 2); - check (b.three() == 3); + assert (b.one() == 1); + assert (b.two() == 2); + assert (b.three() == 3); let small s = b as small; - check (s.one() == 1); + assert (s.one() == 1); }
\ No newline at end of file diff --git a/src/test/run-pass/obj-dtor-2.rs b/src/test/run-pass/obj-dtor-2.rs index 167b15fb..f512e6ee 100644 --- a/src/test/run-pass/obj-dtor-2.rs +++ b/src/test/run-pass/obj-dtor-2.rs @@ -14,5 +14,5 @@ fn main() { { auto x = foo(mbox); } - check ((*mbox) == 11); + assert ((*mbox) == 11); }
\ No newline at end of file diff --git a/src/test/run-pass/obj-dtor.rs b/src/test/run-pass/obj-dtor.rs index 3d633e72..62e0de87 100644 --- a/src/test/run-pass/obj-dtor.rs +++ b/src/test/run-pass/obj-dtor.rs @@ -29,6 +29,6 @@ fn main() { log "parent waiting for shutdown"; i <- p; log "received int"; - check (i == 10); + assert (i == 10); log "int is OK, child-dtor ran as expected"; }
\ No newline at end of file diff --git a/src/test/run-pass/obj-self-3.rs b/src/test/run-pass/obj-self-3.rs index f777b56c..208d0ded 100644 --- a/src/test/run-pass/obj-self-3.rs +++ b/src/test/run-pass/obj-self-3.rs @@ -19,11 +19,11 @@ fn main() { let int i = 0; i = a.m1(i); - check (i == 1); + assert (i == 1); i = a.m2(i); - check (i == 2); + assert (i == 2); i = a.m3(i); - check (i == 4); + assert (i == 4); } diff --git a/src/test/run-pass/obj-with-vec.rs b/src/test/run-pass/obj-with-vec.rs index 85143c79..b298f75f 100644 --- a/src/test/run-pass/obj-with-vec.rs +++ b/src/test/run-pass/obj-with-vec.rs @@ -7,5 +7,5 @@ fn main() { } auto b = buf(vec(1 as u8, 2 as u8, 3 as u8)); log b.get(1); - check (b.get(1) == (2 as u8)); + assert (b.get(1) == (2 as u8)); } diff --git a/src/test/run-pass/opeq.rs b/src/test/run-pass/opeq.rs index d99ebb04..0c905ab9 100644 --- a/src/test/run-pass/opeq.rs +++ b/src/test/run-pass/opeq.rs @@ -5,18 +5,18 @@ fn main() { x *= 2; log x; - check (x == 2); + assert (x == 2); x += 3; log x; - check (x == 5); + assert (x == 5); x *= x; log x; - check (x == 25); + assert (x == 25); x /= 5; log x; - check (x == 5); + assert (x == 5); } diff --git a/src/test/run-pass/operator-associativity.rs b/src/test/run-pass/operator-associativity.rs index 2c028eba..403d7c2e 100644 --- a/src/test/run-pass/operator-associativity.rs +++ b/src/test/run-pass/operator-associativity.rs @@ -1,4 +1,4 @@ // Testcase for issue #130, operator associativity. fn main() -> () { - check ((3 * 5 / 2) == 7); + assert ((3 * 5 / 2) == 7); } diff --git a/src/test/run-pass/readalias.rs b/src/test/run-pass/readalias.rs index 15fa142a..57dcb3b2 100644 --- a/src/test/run-pass/readalias.rs +++ b/src/test/run-pass/readalias.rs @@ -3,7 +3,7 @@ type point = rec(int x, int y, int z); fn f(&point p) { - check (p.z == 12); + assert (p.z == 12); } fn main() { diff --git a/src/test/run-pass/rec-extend.rs b/src/test/run-pass/rec-extend.rs index db81278b..ada02597 100644 --- a/src/test/run-pass/rec-extend.rs +++ b/src/test/run-pass/rec-extend.rs @@ -8,12 +8,12 @@ fn main() { let point right = rec(x=origin.x + 10 with origin); let point up = rec(y=origin.y + 10 with origin); - check(origin.x == 0); - check(origin.y == 0); + assert (origin.x == 0); + assert (origin.y == 0); - check(right.x == 10); - check(right.y == 0); + assert (right.x == 10); + assert (right.y == 0); - check(up.x == 0); - check(up.y == 10); + assert (up.x == 0); + assert (up.y == 10); } diff --git a/src/test/run-pass/rec-tup.rs b/src/test/run-pass/rec-tup.rs index e25439a9..30db0417 100644 --- a/src/test/run-pass/rec-tup.rs +++ b/src/test/run-pass/rec-tup.rs @@ -4,22 +4,22 @@ type point = rec(int x, int y); type rect = tup(point, point); fn f(rect r, int x1, int y1, int x2, int y2) { - check (r._0.x == x1); - check (r._0.y == y1); - check (r._1.x == x2); - check (r._1.y == y2); + assert (r._0.x == x1); + assert (r._0.y == y1); + assert (r._1.x == x2); + assert (r._1.y == y2); } fn main() { let rect r = tup( rec(x=10, y=20), rec(x=11, y=22) ); - check (r._0.x == 10); - check (r._0.y == 20); - check (r._1.x == 11); - check (r._1.y == 22); + assert (r._0.x == 10); + assert (r._0.y == 20); + assert (r._1.x == 11); + assert (r._1.y == 22); let rect r2 = r; let int x = r2._0.x; - check (x == 10); + assert (x == 10); f(r, 10, 20, 11, 22); f(r2, 10, 20, 11, 22); } diff --git a/src/test/run-pass/rec.rs b/src/test/run-pass/rec.rs index 0f6b7d79..7d295f6f 100644 --- a/src/test/run-pass/rec.rs +++ b/src/test/run-pass/rec.rs @@ -3,21 +3,21 @@ type rect = rec(int x, int y, int w, int h); fn f(rect r, int x, int y, int w, int h) { - check (r.x == x); - check (r.y == y); - check (r.w == w); - check (r.h == h); + assert (r.x == x); + assert (r.y == y); + assert (r.w == w); + assert (r.h == h); } fn main() { let rect r = rec(x=10, y=20, w=100, h=200); - check (r.x == 10); - check (r.y == 20); - check (r.w == 100); - check (r.h == 200); + assert (r.x == 10); + assert (r.y == 20); + assert (r.w == 100); + assert (r.h == 200); let rect r2 = r; let int x = r2.x; - check (x == 10); + assert (x == 10); f(r, 10, 20, 100, 200); f(r2, 10, 20, 100, 200); } diff --git a/src/test/run-pass/rt-circular-buffer.rs b/src/test/run-pass/rt-circular-buffer.rs index e5c3da1b..cd808ad7 100644 --- a/src/test/run-pass/rt-circular-buffer.rs +++ b/src/test/run-pass/rt-circular-buffer.rs @@ -74,9 +74,9 @@ fn test_rotate() { mychan <| val; auto x <- myport; - check (x.val1 == i as u32); - check (x.val2 == i as u32); - check (x.val3 == i as u32); + assert (x.val1 == i as u32); + assert (x.val2 == i as u32); + assert (x.val3 == i as u32); } } @@ -96,9 +96,9 @@ fn test_rotate_grow() { for each (uint i in _uint.range(0u, 10u)) { auto x <- myport; - check (x.val1 == i as u32); - check (x.val2 == i as u32); - check (x.val3 == i as u32); + assert (x.val1 == i as u32); + assert (x.val2 == i as u32); + assert (x.val3 == i as u32); } } } diff --git a/src/test/run-pass/seq-compare.rs b/src/test/run-pass/seq-compare.rs index e8bc4788..942e9e90 100644 --- a/src/test/run-pass/seq-compare.rs +++ b/src/test/run-pass/seq-compare.rs @@ -1,16 +1,16 @@ // xfail-boot fn main() { - check ("hello" < "hellr"); - check ("hello " > "hello"); - check ("hello" != "there"); + assert ("hello" < "hellr"); + assert ("hello " > "hello"); + assert ("hello" != "there"); - check (vec(1,2,3,4) > vec(1,2,3)); - check (vec(1,2,3) < vec(1,2,3,4)); - check (vec(1,2,4,4) > vec(1,2,3,4)); - check (vec(1,2,3,4) < vec(1,2,4,4)); - check (vec(1,2,3) <= vec(1,2,3)); - check (vec(1,2,3) <= vec(1,2,3,3)); - check (vec(1,2,3,4) > vec(1,2,3)); - check (vec(1,2,3) == vec(1,2,3)); - check (vec(1,2,3) != vec(1,1,3)); + assert (vec(1,2,3,4) > vec(1,2,3)); + assert (vec(1,2,3) < vec(1,2,3,4)); + assert (vec(1,2,4,4) > vec(1,2,3,4)); + assert (vec(1,2,3,4) < vec(1,2,4,4)); + assert (vec(1,2,3) <= vec(1,2,3)); + assert (vec(1,2,3) <= vec(1,2,3,3)); + assert (vec(1,2,3,4) > vec(1,2,3)); + assert (vec(1,2,3) == vec(1,2,3)); + assert (vec(1,2,3) != vec(1,1,3)); } diff --git a/src/test/run-pass/stateful-obj.rs b/src/test/run-pass/stateful-obj.rs index c1d96cc3..b0f0cf3b 100644 --- a/src/test/run-pass/stateful-obj.rs +++ b/src/test/run-pass/stateful-obj.rs @@ -14,10 +14,10 @@ obj counter(mutable int x) { fn main() { auto y = counter(0); - check (y.hello() == 12345); + assert (y.hello() == 12345); log y.get(); y.incr(); y.incr(); log y.get(); - check (y.get() == 2); + assert (y.get() == 2); } diff --git a/src/test/run-pass/str-append.rs b/src/test/run-pass/str-append.rs index da4ca07f..abfbe938 100644 --- a/src/test/run-pass/str-append.rs +++ b/src/test/run-pass/str-append.rs @@ -7,7 +7,7 @@ fn test1() { let str s = "hello"; s += "world"; log s; - check(s.(9) == ('d' as u8)); + assert (s.(9) == ('d' as u8)); } fn test2() { @@ -20,8 +20,8 @@ fn test2() { log a; log b; - check (_str.eq(a, "abcABCabc")); - check (_str.eq(b, "ABCabcABC")); + assert (_str.eq(a, "abcABCabc")); + assert (_str.eq(b, "ABCabcABC")); } fn main() { diff --git a/src/test/run-pass/str-concat.rs b/src/test/run-pass/str-concat.rs index c906a23e..a21fefbe 100644 --- a/src/test/run-pass/str-concat.rs +++ b/src/test/run-pass/str-concat.rs @@ -5,5 +5,5 @@ fn main() { let str b = "world"; let str s = a + b; log s; - check(s.(9) == ('d' as u8)); + assert (s.(9) == ('d' as u8)); } diff --git a/src/test/run-pass/str-growth.rs b/src/test/run-pass/str-growth.rs index 06bc8b74..55548da5 100644 --- a/src/test/run-pass/str-growth.rs +++ b/src/test/run-pass/str-growth.rs @@ -1,14 +1,14 @@ fn main() { auto s = "a"; s += "b"; - check (s.(0) == ('a' as u8)); - check (s.(1) == ('b' as u8)); + assert (s.(0) == ('a' as u8)); + assert (s.(1) == ('b' as u8)); s += "c"; s += "d"; - check (s.(0) == ('a' as u8)); - check (s.(1) == ('b' as u8)); - check (s.(2) == ('c' as u8)); - check (s.(3) == ('d' as u8)); + assert (s.(0) == ('a' as u8)); + assert (s.(1) == ('b' as u8)); + assert (s.(2) == ('c' as u8)); + assert (s.(3) == ('d' as u8)); } diff --git a/src/test/run-pass/str-idx.rs b/src/test/run-pass/str-idx.rs index 9793799a..e2f5abb2 100644 --- a/src/test/run-pass/str-idx.rs +++ b/src/test/run-pass/str-idx.rs @@ -3,5 +3,5 @@ fn main() { auto s = "hello"; let u8 c = s.(4); log c; - check (c == (0x6f as u8)); + assert (c == (0x6f as u8)); } diff --git a/src/test/run-pass/structured-compare-recursive.rs b/src/test/run-pass/structured-compare-recursive.rs index 3049faec..15ddba84 100644 --- a/src/test/run-pass/structured-compare-recursive.rs +++ b/src/test/run-pass/structured-compare-recursive.rs @@ -4,6 +4,6 @@ tag taggy { } fn main() { - check (bar <= bar); + assert (bar <= bar); } diff --git a/src/test/run-pass/structured-compare.rs b/src/test/run-pass/structured-compare.rs index fed4b183..e677c3cb 100644 --- a/src/test/run-pass/structured-compare.rs +++ b/src/test/run-pass/structured-compare.rs @@ -6,15 +6,15 @@ tag foo { fn main() { auto a = tup(1,2,3); auto b = tup(1,2,3); - check (a == b); - check (a != tup(1,2,4)); - check (a < tup(1,2,4)); - check (a <= tup(1,2,4)); - check (tup(1,2,4) > a); - check (tup(1,2,4) >= a); + assert (a == b); + assert (a != tup(1,2,4)); + assert (a < tup(1,2,4)); + assert (a <= tup(1,2,4)); + assert (tup(1,2,4) > a); + assert (tup(1,2,4) >= a); auto x = large; auto y = small; - check (x != y); - check (x == large); - check (x != small); + assert (x != y); + assert (x == large); + assert (x != small); }
\ No newline at end of file diff --git a/src/test/run-pass/syntax-extension-fmt.rs b/src/test/run-pass/syntax-extension-fmt.rs index 82b3e658..5248e782 100644 --- a/src/test/run-pass/syntax-extension-fmt.rs +++ b/src/test/run-pass/syntax-extension-fmt.rs @@ -6,7 +6,7 @@ import std._str; fn test(str actual, str expected) { log actual; log expected; - check (_str.eq(actual, expected)); + assert (_str.eq(actual, expected)); } fn main() { diff --git a/src/test/run-pass/tag.rs b/src/test/run-pass/tag.rs index e3f89a7f..695832b1 100644 --- a/src/test/run-pass/tag.rs +++ b/src/test/run-pass/tag.rs @@ -9,7 +9,7 @@ fn f() { auto x = red(1,2); auto y = green; // FIXME: needs structural equality test working. - // check (x != y); + // assert (x != y); } fn main() { diff --git a/src/test/run-pass/tail-cps.rs b/src/test/run-pass/tail-cps.rs index 795a105a..fec48a74 100644 --- a/src/test/run-pass/tail-cps.rs +++ b/src/test/run-pass/tail-cps.rs @@ -1,7 +1,7 @@ // -*- rust -*- fn checktrue(bool res) -> bool { - check(res); + assert (res); ret true; } diff --git a/src/test/run-pass/tail-direct.rs b/src/test/run-pass/tail-direct.rs index 345a322e..ac29bcad 100644 --- a/src/test/run-pass/tail-direct.rs +++ b/src/test/run-pass/tail-direct.rs @@ -1,8 +1,8 @@ // -*- rust -*- fn main() { - check(even(42)); - check(odd(45)); + assert (even(42)); + assert (odd(45)); } fn even(int n) -> bool { diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs index e1473548..54e37a34 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/run-pass/task-comm-0.rs @@ -16,5 +16,5 @@ fn test05() { let int value <- po; value <- po; value <- po; - check(value == 30); + assert (value == 30); } diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs index 16c4b93b..9438f50e 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/run-pass/task-comm-16.rs @@ -14,9 +14,9 @@ fn test_rec() { let r r1; r1 <- po; - check (r1.val0 == 0); - check (r1.val1 == 1u8); - check (r1.val2 == '2'); + assert (r1.val0 == 0); + assert (r1.val1 == 1u8); + assert (r1.val2 == '2'); } fn test_vec() { @@ -29,9 +29,9 @@ fn test_vec() { let vec[int] v1; v1 <- po; - check (v1.(0) == 0); - check (v1.(1) == 1); - check (v1.(2) == 2); + assert (v1.(0) == 0); + assert (v1.(1) == 1); + assert (v1.(2) == 2); } fn test_str() { @@ -44,10 +44,10 @@ fn test_str() { let str s1; s1 <- po; - check (s1.(0) as u8 == 't' as u8); - check (s1.(1) as u8 == 'e' as u8); - check (s1.(2) as u8 == 's' as u8); - check (s1.(3) as u8 == 't' as u8); + assert (s1.(0) as u8 == 't' as u8); + assert (s1.(1) as u8 == 'e' as u8); + assert (s1.(2) as u8 == 's' as u8); + assert (s1.(3) as u8 == 't' as u8); } fn test_tup() { @@ -62,9 +62,9 @@ fn test_tup() { let t t1; t1 <- po; - check (t0._0 == 0); - check (t0._1 == 1u8); - check (t0._2 == '2'); + assert (t0._0 == 0); + assert (t0._1 == 1u8); + assert (t0._2 == '2'); } fn test_tag() { @@ -84,11 +84,11 @@ fn test_tag() { let t t1; t1 <- po; - check (t1 == tag1); + assert (t1 == tag1); t1 <- po; - check (t1 == tag2(10)); + assert (t1 == tag2(10)); t1 <- po; - check (t1 == tag3(10, 11u8, 'A')); + assert (t1 == tag3(10, 11u8, 'A')); } fn test_chan() { @@ -109,7 +109,7 @@ fn test_chan() { let int i; i <- po0; - check (i == 10); + assert (i == 10); } fn main() { diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 71255721..59c46c4c 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -58,7 +58,7 @@ fn test00(bool is_multithreaded) { } log "Completed: Final number is: "; - // check (sum == (((number_of_tasks * (number_of_tasks - 1)) / 2) * + // assert (sum == (((number_of_tasks * (number_of_tasks - 1)) / 2) * // number_of_messages)); - check (sum == 480); + assert (sum == 480); } diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/run-pass/task-comm-4.rs index 121a9e6e..3c4f3ab6 100644 --- a/src/test/run-pass/task-comm-4.rs +++ b/src/test/run-pass/task-comm-4.rs @@ -28,5 +28,5 @@ fn test00() { r <- p; sum += r; log (r); r <- p; sum += r; log (r); - check (sum == 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8); + assert (sum == 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8); }
\ No newline at end of file diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs index d0f3994e..324ce0ed 100644 --- a/src/test/run-pass/task-comm-5.rs +++ b/src/test/run-pass/task-comm-5.rs @@ -21,5 +21,5 @@ fn test00() { i += 1; } - check (sum == ((number_of_messages * (number_of_messages - 1)) / 2)); + assert (sum == ((number_of_messages * (number_of_messages - 1)) / 2)); }
\ No newline at end of file diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs index 74b40a90..0f98ba5b 100644 --- a/src/test/run-pass/task-comm-6.rs +++ b/src/test/run-pass/task-comm-6.rs @@ -32,7 +32,7 @@ fn test00() { i += 1; } - check (sum == 1998000); - // check (sum == 4 * ((number_of_messages * + assert (sum == 1998000); + // assert (sum == 4 * ((number_of_messages * // (number_of_messages - 1)) / 2)); }
\ No newline at end of file diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs index b5b95db9..f9fbab88 100644 --- a/src/test/run-pass/task-comm-7.rs +++ b/src/test/run-pass/task-comm-7.rs @@ -40,6 +40,6 @@ fn test00() { join t2; join t3; - check (sum == (((number_of_messages * 4) * + assert (sum == (((number_of_messages * 4) * ((number_of_messages * 4) - 1)) / 2)); }
\ No newline at end of file diff --git a/src/test/run-pass/task-comm-8.rs b/src/test/run-pass/task-comm-8.rs index a3876bda..d115ac40 100644 --- a/src/test/run-pass/task-comm-8.rs +++ b/src/test/run-pass/task-comm-8.rs @@ -41,6 +41,6 @@ fn test00() { join t2; join t3; - check (sum == (((number_of_messages * 4) * + assert (sum == (((number_of_messages * 4) * ((number_of_messages * 4) - 1)) / 2)); }
\ No newline at end of file diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index a9ac1688..c1c8a3bd 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -29,5 +29,5 @@ fn test00() { join t0; - check (sum == (number_of_messages * (number_of_messages - 1)) / 2); + assert (sum == (number_of_messages * (number_of_messages - 1)) / 2); }
\ No newline at end of file diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs index aae788a5..de7de81a 100644 --- a/src/test/run-pass/task-comm-chan-nil.rs +++ b/src/test/run-pass/task-comm-chan-nil.rs @@ -14,5 +14,5 @@ fn main() { let () n; n <- po; - check (n == ()); + assert (n == ()); } diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs index 0a91b98a..d256ced9 100644 --- a/src/test/run-pass/task-comm.rs +++ b/src/test/run-pass/task-comm.rs @@ -58,7 +58,7 @@ fn test00(bool is_multithreaded) { } log "Completed: Final number is: "; - check (sum == number_of_messages * + assert (sum == number_of_messages * (number_of_tasks * number_of_tasks + number_of_tasks) / 2); } diff --git a/src/test/run-pass/tup.rs b/src/test/run-pass/tup.rs index 23406646..b7670776 100644 --- a/src/test/run-pass/tup.rs +++ b/src/test/run-pass/tup.rs @@ -3,17 +3,17 @@ type point = tup(int, int); fn f(point p, int x, int y) { - check (p._0 == x); - check (p._1 == y); + assert (p._0 == x); + assert (p._1 == y); } fn main() { let point p = tup(10, 20); - check (p._0 == 10); - check (p._1 == 20); + assert (p._0 == 10); + assert (p._1 == 20); let point p2 = p; let int x = p2._0; - check (x == 10); + assert (x == 10); f(p, 10, 20); f(p2, 10, 20); } diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs index 67b8b578..1903cb76 100644 --- a/src/test/run-pass/type-sizes.rs +++ b/src/test/run-pass/type-sizes.rs @@ -5,17 +5,17 @@ import size_of = std.sys.rustrt.size_of; use std; fn main() { - check (size_of[u8]() == (1 as uint)); - check (size_of[u32]() == (4 as uint)); - check (size_of[char]() == (4 as uint)); - check (size_of[i8]() == (1 as uint)); - check (size_of[i32]() == (4 as uint)); - check (size_of[tup(u8,i8)]() == (2 as uint)); - check (size_of[tup(u8,i8,u8)]() == (3 as uint)); + assert (size_of[u8]() == (1 as uint)); + assert (size_of[u32]() == (4 as uint)); + assert (size_of[char]() == (4 as uint)); + assert (size_of[i8]() == (1 as uint)); + assert (size_of[i32]() == (4 as uint)); + assert (size_of[tup(u8,i8)]() == (2 as uint)); + assert (size_of[tup(u8,i8,u8)]() == (3 as uint)); // Alignment causes padding before the char and the u32. - check (size_of[tup(u8,i8,tup(char,u8),u32)]() == (16 as uint)); - check (size_of[int]() == size_of[uint]()); - check (size_of[tup(int,())]() == size_of[int]()); - check (size_of[tup(int,(),())]() == size_of[int]()); - check (size_of[int]() == size_of[rec(int x)]()); + assert (size_of[tup(u8,i8,tup(char,u8),u32)]() == (16 as uint)); + assert (size_of[int]() == size_of[uint]()); + assert (size_of[tup(int,())]() == size_of[int]()); + assert (size_of[tup(int,(),())]() == size_of[int]()); + assert (size_of[int]() == size_of[rec(int x)]()); } diff --git a/src/test/run-pass/u32-decr.rs b/src/test/run-pass/u32-decr.rs index 1ff511aa..7e7b5026 100644 --- a/src/test/run-pass/u32-decr.rs +++ b/src/test/run-pass/u32-decr.rs @@ -3,6 +3,6 @@ fn main() { let u32 word = (200000u32); word = word - (1u32); - check(word == (199999u32)); + assert (word == (199999u32)); } diff --git a/src/test/run-pass/u8-incr-decr.rs b/src/test/run-pass/u8-incr-decr.rs index f89325fc..992c61d5 100644 --- a/src/test/run-pass/u8-incr-decr.rs +++ b/src/test/run-pass/u8-incr-decr.rs @@ -8,5 +8,5 @@ fn main() { let u8 y = 35u8; // 0x23 x = x + (7u8); // 0x7 y = y - (9u8); // 0x9 - check(x == y); + assert (x == y); } diff --git a/src/test/run-pass/u8-incr.rs b/src/test/run-pass/u8-incr.rs index 602d83c6..7cc94889 100644 --- a/src/test/run-pass/u8-incr.rs +++ b/src/test/run-pass/u8-incr.rs @@ -5,7 +5,7 @@ fn main() { let u8 y = 12u8; x = x + (1u8); x = x - (1u8); - check(x == y); + assert (x == y); // x = 14u8; // x = x + 1u8; } diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs index 68f5fa9f..bf758a49 100644 --- a/src/test/run-pass/utf8.rs +++ b/src/test/run-pass/utf8.rs @@ -6,14 +6,14 @@ fn main() { let char y_diaeresis = 'ÿ'; // 0xff let char pi = 'Π'; // 0x3a0 - check ((yen as int) == 0xa5); - check ((c_cedilla as int) == 0xe7); - check ((thorn as int) == 0xfe); - check ((y_diaeresis as int) == 0xff); - check ((pi as int) == 0x3a0); + assert ((yen as int) == 0xa5); + assert ((c_cedilla as int) == 0xe7); + assert ((thorn as int) == 0xfe); + assert ((y_diaeresis as int) == 0xff); + assert ((pi as int) == 0x3a0); - check ((pi as int) == ('\u03a0' as int)); - check (('\x0a' as int) == ('\n' as int)); + assert ((pi as int) == ('\u03a0' as int)); + assert (('\x0a' as int) == ('\n' as int)); let str bhutan = "འབྲུག་ཡུལ།"; let str japan = "日本"; @@ -28,7 +28,7 @@ fn main() { let str austria_e = "\u00d6sterreich"; let char oo = 'Ö'; - check ((oo as int) == 0xd6); + assert ((oo as int) == 0xd6); fn check_str_eq(str a, str b) { let int i = 0; @@ -37,7 +37,7 @@ fn main() { log ab; let u8 bb = b.(i); log bb; - check(ab == bb); + assert (ab == bb); i += 1; } } diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs index 08671093..07eaca19 100644 --- a/src/test/run-pass/utf8_chars.rs +++ b/src/test/run-pass/utf8_chars.rs @@ -9,25 +9,25 @@ fn main() { let vec[char] chs = vec('e', 'é', '€', 0x10000 as char); let str s = _str.from_chars(chs); - check(_str.byte_len(s) == 10u); - check(_str.char_len(s) == 4u); - check(_vec.len[char](_str.to_chars(s)) == 4u); - check(_str.eq(_str.from_chars(_str.to_chars(s)), s)); - check(_str.char_at(s, 0u) == 'e'); - check(_str.char_at(s, 1u) == 'é'); + assert (_str.byte_len(s) == 10u); + assert (_str.char_len(s) == 4u); + assert (_vec.len[char](_str.to_chars(s)) == 4u); + assert (_str.eq(_str.from_chars(_str.to_chars(s)), s)); + assert (_str.char_at(s, 0u) == 'e'); + assert (_str.char_at(s, 1u) == 'é'); - check(_str.is_utf8(_str.bytes(s))); - check(!_str.is_utf8(vec(0x80_u8))); - check(!_str.is_utf8(vec(0xc0_u8))); - check(!_str.is_utf8(vec(0xc0_u8, 0x10_u8))); + assert (_str.is_utf8(_str.bytes(s))); + assert (!_str.is_utf8(vec(0x80_u8))); + assert (!_str.is_utf8(vec(0xc0_u8))); + assert (!_str.is_utf8(vec(0xc0_u8, 0x10_u8))); auto stack = "a×c€"; - check(_str.pop_char(stack) == '€'); - check(_str.pop_char(stack) == 'c'); + assert (_str.pop_char(stack) == '€'); + assert (_str.pop_char(stack) == 'c'); _str.push_char(stack, 'u'); - check(_str.eq(stack, "a×u")); - check(_str.shift_char(stack) == 'a'); - check(_str.shift_char(stack) == '×'); + assert (_str.eq(stack, "a×u")); + assert (_str.shift_char(stack) == 'a'); + assert (_str.shift_char(stack) == '×'); _str.unshift_char(stack, 'ß'); - check(_str.eq(stack, "ßu")); + assert (_str.eq(stack, "ßu")); } diff --git a/src/test/run-pass/vec-append.rs b/src/test/run-pass/vec-append.rs index 0f9f56dd..69db4788 100644 --- a/src/test/run-pass/vec-append.rs +++ b/src/test/run-pass/vec-append.rs @@ -15,9 +15,9 @@ fn fast_growth() { v += vec(6,7,8,9,0); log v.(9); - check(v.(0) == 1); - check(v.(7) == 8); - check(v.(9) == 0); + assert (v.(0) == 1); + assert (v.(7) == 8); + assert (v.(9) == 0); } fn slow_growth() { @@ -26,7 +26,7 @@ fn slow_growth() { v += vec(17); log v.(0); - check (v.(0) == 17); + assert (v.(0) == 17); } fn slow_growth2_helper(str s) { // ref up: s @@ -52,7 +52,7 @@ fn slow_growth2_helper(str s) { // ref up: s let acc a = acc(v); // ref up: a, v log _vec.refcount[str](v); - check (_vec.refcount[str](v) == 2u); + assert (_vec.refcount[str](v) == 2u); a.add(s); // ref up: mumble, s. ref down: v @@ -60,21 +60,21 @@ fn slow_growth2_helper(str s) { // ref up: s log _str.refcount(s); log _str.refcount(mumble); - check (_vec.refcount[str](v) == 1u); - check (_str.refcount(s) == const_refcount); - check (_str.refcount(mumble) == const_refcount); + assert (_vec.refcount[str](v) == 1u); + assert (_str.refcount(s) == const_refcount); + assert (_str.refcount(mumble) == const_refcount); log v.(0); log _vec.len[str](v); - check (_str.eq(v.(0), mumble)); - check (_vec.len[str](v) == 1u); + assert (_str.eq(v.(0), mumble)); + assert (_vec.len[str](v) == 1u); } // ref down: a, mumble, s, v log _str.refcount(s); log _str.refcount(mumble); - check (_str.refcount(s) == const_refcount); - check (_str.refcount(mumble) == const_refcount); + assert (_str.refcount(s) == const_refcount); + assert (_str.refcount(mumble) == const_refcount); log mumble; log ss; @@ -84,7 +84,7 @@ fn slow_growth2() { let str s = "hi"; // ref up: s slow_growth2_helper(s); log _str.refcount(s); - check (_str.refcount(s) == const_refcount); + assert (_str.refcount(s) == const_refcount); } fn main() { diff --git a/src/test/run-pass/vec-concat.rs b/src/test/run-pass/vec-concat.rs index b6c52c3e..09a95402 100644 --- a/src/test/run-pass/vec-concat.rs +++ b/src/test/run-pass/vec-concat.rs @@ -5,7 +5,7 @@ fn main() { let vec[int] b = vec(6,7,8,9,0); let vec[int] v = a + b; log v.(9); - check(v.(0) == 1); - check(v.(7) == 8); - check(v.(9) == 0); + assert (v.(0) == 1); + assert (v.(7) == 8); + assert (v.(9) == 0); } diff --git a/src/test/run-pass/vec-growth.rs b/src/test/run-pass/vec-growth.rs index fe207030..b6976abd 100644 --- a/src/test/run-pass/vec-growth.rs +++ b/src/test/run-pass/vec-growth.rs @@ -4,10 +4,10 @@ fn main() { v += vec(3); v += vec(4); v += vec(5); - check (v.(0) == 1); - check (v.(1) == 2); - check (v.(2) == 3); - check (v.(3) == 4); - check (v.(4) == 5); + assert (v.(0) == 1); + assert (v.(1) == 2); + assert (v.(2) == 3); + assert (v.(3) == 4); + assert (v.(4) == 5); } diff --git a/src/test/run-pass/vec-ref-count.rs b/src/test/run-pass/vec-ref-count.rs index 78848936..45f28f9b 100644 --- a/src/test/run-pass/vec-ref-count.rs +++ b/src/test/run-pass/vec-ref-count.rs @@ -6,7 +6,7 @@ fn main() { log_err _vec.refcount[int](v); log_err _vec.refcount[int](v); log_err _vec.refcount[int](v); - check (_vec.refcount[int](v) == 1u || _vec.refcount[int](v) == 2u); - check (_vec.refcount[int](v) == 1u || _vec.refcount[int](v) == 2u); + assert (_vec.refcount[int](v) == 1u || _vec.refcount[int](v) == 2u); + assert (_vec.refcount[int](v) == 1u || _vec.refcount[int](v) == 2u); } diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs index 55174142..c3042d0c 100644 --- a/src/test/run-pass/vec-slice.rs +++ b/src/test/run-pass/vec-slice.rs @@ -4,6 +4,6 @@ fn main() { let vec[int] v = vec(1,2,3,4,5); auto v2 = v.(1,2); - check (v2.(0) == 2); - check (v2.(1) == 3); + assert (v2.(0) == 2); + assert (v2.(1) == 3); }
\ No newline at end of file diff --git a/src/test/run-pass/vec.rs b/src/test/run-pass/vec.rs index 67a41eab..138d0ff2 100644 --- a/src/test/run-pass/vec.rs +++ b/src/test/run-pass/vec.rs @@ -2,12 +2,12 @@ fn main() { let vec[int] v = vec(10, 20); - check (v.(0) == 10); - check (v.(1) == 20); + assert (v.(0) == 10); + assert (v.(1) == 20); let int x = 0; - check (v.(x) == 10); - check (v.(x + 1) == 20); + assert (v.(x) == 10); + assert (v.(x + 1) == 20); x = x + 1; - check (v.(x) == 20); - check (v.(x-1) == 10); + assert (v.(x) == 20); + assert (v.(x-1) == 10); } diff --git a/src/test/run-pass/while-with-break.rs b/src/test/run-pass/while-with-break.rs index 0e27f252..2adaf24b 100644 --- a/src/test/run-pass/while-with-break.rs +++ b/src/test/run-pass/while-with-break.rs @@ -11,5 +11,5 @@ fn main() { break; } } - check(i == 95); + assert (i == 95); } diff --git a/src/test/run-pass/writealias.rs b/src/test/run-pass/writealias.rs index 8bf8140f..c0ac1803 100644 --- a/src/test/run-pass/writealias.rs +++ b/src/test/run-pass/writealias.rs @@ -9,5 +9,5 @@ fn f(& mutable point p) { fn main() { let point x = rec(x=10, y=11, mutable z=12); f(x); - check (x.z == 13); + assert (x.z == 13); } |