Use at-testset in unicode tests. (JuliaLang#20445)

test/unicode/UnicodeError.jl

@@ -1,7 +1,9 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-let io = IOBuffer()
-    show(io, UnicodeError(Base.UTF_ERR_SHORT, 1, 10))
-    check = "UnicodeError: invalid UTF-8 sequence starting at index 1 (0xa missing one or more continuation bytes)"
-    @test String(take!(io)) == check
+@testset "invalid utf8" begin
+    let io = IOBuffer()
+        show(io, UnicodeError(Base.UTF_ERR_SHORT, 1, 10))
+        check = "UnicodeError: invalid UTF-8 sequence starting at index 1 (0xa missing one or more continuation bytes)"
+        @test String(take!(io)) == check
+    end
 end

test/unicode/utf8.jl

@@ -1,43 +1,47 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
-## Test for CESU-8 sequences
-
-let ch = 0x10000
-    for hi = 0xd800:0xdbff
-        for lo = 0xdc00:0xdfff
-            @test convert(String, Vector{UInt8}(String(Char[hi, lo]))) == string(Char(ch))
-            ch += 1
+@testset "cesu8 input" begin
+    let ch = 0x10000
+        for hi = 0xd800:0xdbff
+            for lo = 0xdc00:0xdfff
+                @test convert(String, Vector{UInt8}(String(Char[hi, lo]))) == string(Char(ch))
+                ch += 1
+            end
         end
     end
 end
 
-
-let str = String(b"this is a test\xed\x80")
-    @test next(str, 15) == ('\ufffd', 16)
-    @test_throws BoundsError getindex(str, 0:3)
-    @test_throws BoundsError getindex(str, 17:18)
-    @test_throws BoundsError getindex(str, 2:17)
-    @test_throws UnicodeError getindex(str, 16:17)
-    @test string(Char(0x110000)) == "\ufffd"
-    @test convert(String, b"this is a test\xed\x80\x80") == "this is a test\ud000"
+@testset "string indexing" begin
+    let str = String(b"this is a test\xed\x80")
+        @test next(str, 15) == ('\ufffd', 16)
+        @test_throws BoundsError getindex(str, 0:3)
+        @test_throws BoundsError getindex(str, 17:18)
+        @test_throws BoundsError getindex(str, 2:17)
+        @test_throws UnicodeError getindex(str, 16:17)
+        @test string(Char(0x110000)) == "\ufffd"
+    end
 end
 
-## Reverse of String
-@test reverse("") == ""
-@test reverse("a") == "a"
-@test reverse("abc") == "cba"
-@test reverse("xyz\uff\u800\uffff\U10ffff") == "\U10ffff\uffff\u800\uffzyx"
-for str in [
-    b"xyz\xc1",
-    b"xyz\xd0",
-    b"xyz\xe0",
-    b"xyz\xed\x80",
-    b"xyz\xf0",
-    b"xyz\xf0\x80",
-    b"xyz\xf0\x80\x80"
-]
-    @test_throws UnicodeError reverse(String(str))
+@testset "string reverse" begin
+    @test reverse("") == ""
+    @test reverse("a") == "a"
+    @test reverse("abc") == "cba"
+    @test reverse("xyz\uff\u800\uffff\U10ffff") == "\U10ffff\uffff\u800\uffzyx"
+    for str in [
+        b"xyz\xc1",
+        b"xyz\xd0",
+        b"xyz\xe0",
+        b"xyz\xed\x80",
+        b"xyz\xf0",
+        b"xyz\xf0\x80",
+        b"xyz\xf0\x80\x80"
+    ]
+        @test_throws UnicodeError reverse(String(str))
+    end
 end
 
-## Specifically check UTF-8 string whose lead byte is same as a surrogate
-@test convert(String, b"\xed\x9f\xbf") == "\ud7ff"
+@testset "string convert" begin
+    @test convert(String, b"this is a test\xed\x80\x80") == "this is a test\ud000"
+    ## Specifically check UTF-8 string whose lead byte is same as a surrogate
+    @test convert(String, b"\xed\x9f\xbf") == "\ud7ff"
+end