Fix deprecation

JuliaLang · May 14, 2015 · f7f90d1 · f7f90d1
1 parent a5c06f3
commit f7f90d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -445,6 +445,6 @@ export float32_isvalid, float64_isvalid
 
 @deprecate is_valid_char(ch::Union(Unsigned, Integer, Char)) isvalid(Char, ch)
 @deprecate is_valid_ascii(str::Union(Vector{UInt8}, ByteString)) isvalid(ASCIIString, str)
-@deprecate is_valid_utf8(str::Union(Vector{UInt8}, ByteString)) isvalid(UTFString, str)
+@deprecate is_valid_utf8(str::Union(Vector{UInt8}, ByteString)) isvalid(UTF8String, str)
 @deprecate is_valid_utf16(str::Union(AbstractVector{UInt16}, UTF16String)) isvalid(UTF16String, str)
-@deprecate is_valid_utf32(str::Union(AbstractVector{UInt16}, UTF16String)) isvalid(UTF16String, str)
+@deprecate is_valid_utf32(str::Union(AbstractVector{UInt32}, UTF32String)) isvalid(UTF32String, str)
diff --git a/test/strings.jl b/test/strings.jl
@@ -1324,8 +1324,8 @@ brokenvalid = true      # Set to false if underlying validation code is fixed (#
 @test isvalid(UTF8String, b"\xf4\x8f\xbf\xbf") == true
 @test isvalid(UTF8String, b"\xf4\x90\x80\x80") == brokenvalid
 @test isvalid(UTF8String, b"\xf5\x80\x80\x80") == brokenvalid
-@test isvalid(UTF8String, b"\ud800\udc00") == true
-@test isvalid(UTF8String, b"\udbff\udfff") == true
+@test isvalid(UTF8String, b"\ud800\udc00") == brokenvalid
+@test isvalid(UTF8String, b"\udbff\udfff") == brokenvalid
 @test isvalid(UTF8String, b"\ud800\u0100") == brokenvalid
 @test isvalid(UTF8String, b"\udc00\u0100") == brokenvalid
 @test isvalid(UTF8String, b"\udc00\ud800") == brokenvalid