test for empty strings (StefanKarpinski) and fix bad usage a GLOBAL_RNG

JuliaLang · Jun 5, 2017 · f9b307a · f9b307a
1 parent 27d49ff
commit f9b307a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/base/random.jl b/base/random.jl
@@ -693,9 +693,9 @@ rand(s::AbstractString) = rand(GLOBAL_RNG, s)
 isvalid_unsafe(s::String, i) = !Base.is_valid_continuation(unsafe_load(pointer(s), i))
 
 function rand(rng::AbstractRNG, s::String)
-    rg = Base.Random.RangeGenerator(1:s.len)
+    rg = RangeGenerator(1:s.len)
     while true
-        pos = rand(Base.Random.GLOBAL_RNG, rg)
+        pos = rand(rng, rg)
         isvalid_unsafe(s, pos) && return s[pos]
     end
 end

diff --git a/test/random.jl b/test/random.jl
@@ -350,7 +350,7 @@ for rng in ([], [MersenneTwister(0)], [RandomDevice()])
             @test a in C
         end
     end
-    for C in [1:0, Dict(), Set(), IntSet(), Int[]]
+    for C in [1:0, Dict(), Set(), IntSet(), Int[], "", Base.Test.GenericString("")]
         @test_throws ArgumentError rand(rng..., C)
         @test_throws ArgumentError rand(rng..., C, 5)
     end