Merge branch 'master' of github.com:JuliaLang/julia

JuliaLang · Feb 12, 2015 · 3451d8f · 3451d8f
2 parents 7a8f434 + 3c300b4
commit 3451d8f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/test/core.jl b/test/core.jl
@@ -319,7 +319,7 @@ function clotest()
     @test (()->c)() == 1
 
     fibb(n) = n < 2 ? n : fibb(n-1)+fibb(n-2)
-    assert(fibb(10)==55)
+    @test fibb(10) == 55
 
     return (n->(c+=n), ()->c)
 end
@@ -2084,8 +2084,8 @@ f9534h(a,b,c...) = c[a]
 counter9535 = 0
 f9535() = (global counter9535; counter9535 += 1; counter9535)
 g9535() = (f9535(),f9535())
-@assert g9535() == (1,2)
-@assert g9535() == (3,4)
+@test g9535() == (1,2)
+@test g9535() == (3,4)
 
 # issue #9617
 let p = 15

diff --git a/test/meta.jl b/test/meta.jl
@@ -55,7 +55,7 @@ _attach(val, ex) = pushmeta!(ex, :test, val)
 end
 
 asts = code_lowered(dummy, ())
-@assert length(asts) == 1
+@test length(asts) == 1
 ast = asts[1]
 
 body = Expr(:block)

diff --git a/test/readdlm.jl b/test/readdlm.jl
@@ -91,10 +91,10 @@ end
 
 let x = ["\"hello\"", "world\""], io = IOBuffer()
     writedlm(io, x, quotes=false)
-    @assert takebuf_string(io) == "\"hello\"\nworld\"\n"
+    @test takebuf_string(io) == "\"hello\"\nworld\"\n"
 
     writedlm(io, x)
-    @assert takebuf_string(io) == "\"\"\"hello\"\"\"\n\"world\"\"\"\n"
+    @test takebuf_string(io) == "\"\"\"hello\"\"\"\n\"world\"\"\"\n"
 end
 
 # test comments

diff --git a/test/sparse/sparse.jl b/test/sparse/sparse.jl
@@ -601,7 +601,7 @@ let M=2^14, N=2^4
             elseif res[2] != res[3]
                 println("2, 3")
             end
-            @assert res[1] == res[2] == res[3]
+            @test res[1] == res[2] == res[3]
         end
     end
 end
@@ -619,7 +619,7 @@ let M = 2^8, N=2^3
             res[searchtype+1] = test_getindex_algs(S, I, J, searchtype)
         end
 
-        @assert res[1] == res[2] == res[3]
+        @test res[1] == res[2] == res[3]
     end
 end