fix tests

JuliaLang · Feb 4, 2018 · a556386 · a556386
1 parent 1499957
commit a556386
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -1415,9 +1415,9 @@ end
 
 @deprecate which(s::Symbol) which(Main, s)
 
-@deprecate IOBuffer(data::AbstractVector{UInt8}, read::Bool, write::Bool, maxsize::Integer=typemax(Int)) IOBuffer(data, read=read, write=write, maxsize=maxsize)
+@deprecate IOBuffer(data::AbstractVector{UInt8}, read::Bool, write::Bool=false, maxsize::Integer=typemax(Int)) IOBuffer(data, read=read, write=write, maxsize=maxsize)
 @deprecate IOBuffer(read::Bool, write::Bool) IOBuffer(read=read, write=write)
-@deprecate IOBuffer(maxsize::Integer) IOBuffer(maxsize=maxsize)
+@deprecate IOBuffer(maxsize::Integer) IOBuffer(read=true, write=true, maxsize=maxsize)
 
 
 # END 0.7 deprecations

diff --git a/base/iobuffer.jl b/base/iobuffer.jl
@@ -105,7 +105,7 @@ function IOBuffer(;
         append=flags.append,
         truncate=flags.truncate,
         maxsize=maxsize)
-    buf.data[:] = 0  # TODO: Is this really needed?
+    buf.data[:] = 0
     if flags.truncate
         buf.size = 0
     end

diff --git a/stdlib/Dates/src/io.jl b/stdlib/Dates/src/io.jl
@@ -481,7 +481,7 @@ end
 
 function format(dt::TimeType, fmt::DateFormat, bufsize=12)
     # preallocate to reduce resizing
-    io = IOBuffer(Vector{UInt8}(uninitialized, bufsize), true, true)
+    io = IOBuffer(Vector{UInt8}(uninitialized, bufsize), read=true, write=true)
     format(io, dt, fmt)
     String(io.data[1:io.ptr - 1])
 end

diff --git a/test/functional.jl b/test/functional.jl
@@ -14,7 +14,7 @@ end
 @test isequal(map(sqrt, 2:6), [sqrt(i) for i in 2:6])
 
 # map on ranges should evaluate first value only once (#4453)
-let io=IOBuffer(3)
+let io=IOBuffer(maxsize=3)
     map(x->print(io,x), 1:2)
     @test String(take!(io))=="12"
 end
@@ -176,4 +176,4 @@ end
     @test res isa Vector{Union{Bool, T}}
     res = map(f, y)
     @test res isa Vector{Union{Bool, T}}
-end
+end
diff --git a/test/iobuffer.jl b/test/iobuffer.jl
@@ -195,7 +195,7 @@ end
 
 @testset "pr #11554" begin
     io  = IOBuffer(SubString("***αhelloworldω***", 4, 16))
-    io2 = IOBuffer(Vector{UInt8}(b"goodnightmoon"), true, true)
+    io2 = IOBuffer(Vector{UInt8}(b"goodnightmoon"), read=true, write=true)
 
     @test read(io, Char) == 'α'
     @test_throws ArgumentError write(io,"!")
@@ -227,7 +227,7 @@ end
 
 # issue #11917
 # (previous tests triggered this sometimes, but this should trigger nearly all the time)
-let io = IOBuffer(0)
+let io = IOBuffer(maxsize=0)
    write(io, fill(0x01, 1048577))
 end
 
@@ -289,11 +289,11 @@ end
 end
 
 @testset "Test constructor with a generic type argument." begin
-    io = IOBuffer(Int16(10))
+    io = IOBuffer(maxsize=Int16(10))
     @test io isa IOBuffer
-    io = IOBuffer(Int32(10))
+    io = IOBuffer(maxsize=Int32(10))
     @test io isa IOBuffer
-    io = IOBuffer(Int64(10))
+    io = IOBuffer(maxsize=Int64(10))
     @test io isa IOBuffer
 end
 

diff --git a/test/read.jl b/test/read.jl
@@ -343,7 +343,7 @@ for (name, f) in l
     @test read("$filename.to", String) == text
 
     verbose && println("$name write(::IOBuffer, ...)")
-    to = IOBuffer(Vector{UInt8}(codeunits(text)), false, true)
+    to = IOBuffer(Vector{UInt8}(codeunits(text)), read=false, write=true)
     write(to, io())
     @test String(take!(to)) == text
 

diff --git a/test/show.jl b/test/show.jl
@@ -755,7 +755,7 @@ end
 
 # PR 17117
 # test print_array
-let s = IOBuffer(Vector{UInt8}(), true, true)
+let s = IOBuffer(Vector{UInt8}(), read=true, write=true)
     Base.print_array(s, [1, 2, 3])
     @test String(resize!(s.data, s.size)) == " 1\n 2\n 3"
 end