Deprecate Random.chars

dingosky · dingosky · commit 43f425ee6193 · 2017-09-02T04:00:54.000-07:00
Chars availble via CharSet.chars
diff --git a/Sources/Random.swift b/Sources/Random.swift
@@ -27,8 +27,8 @@
 import Foundation
 
 public class Random {
-  
-  private var charSet: CharSet
+
+  public private(set) var charSet: CharSet
 
   // MARK: - Public Initializers
   //
@@ -45,7 +45,9 @@ public class Random {
     let charSet = try CharSet(chars)
     self.init(charSet)
   }
-  
+
+  /// The characters of the default `CharSet`
+  @available(*, deprecated, message: "use charSet.chars instead")
   public var chars: String {
     return charSet.chars
   }
diff --git a/Tests/EntropyStringTests/RandomTests.swift b/Tests/EntropyStringTests/RandomTests.swift
@@ -15,7 +15,7 @@ class RandomTests: XCTestCase {
 
   func testInit() {
     let random = Random()
-    XCTAssertEqual(random.chars, CharSet.charSet32.chars)
+    XCTAssertEqual(random.charSet.chars, CharSet.charSet32.chars)
   }
   
   func testSessionID() {
@@ -222,16 +222,16 @@ class RandomTests: XCTestCase {
   
   func testUseCharSet() {
     random = Random(.charSet32)
-    XCTAssertEqual(random.chars, CharSet.charSet32.chars)
+    XCTAssertEqual(random.charSet.chars, CharSet.charSet32.chars)
     random.use(.charSet16)
-    XCTAssertEqual(random.chars, CharSet.charSet16.chars)
+    XCTAssertEqual(random.charSet.chars, CharSet.charSet16.chars)
   }
   
   func testUseChars() {
     random = try! Random("abce")
-    XCTAssertEqual(random.chars, "abce")
+    XCTAssertEqual(random.charSet.chars, "abce")
     try! random.use("ECBA")
-    XCTAssertEqual(random.chars, "ECBA")
+    XCTAssertEqual(random.charSet.chars, "ECBA")
   }
 
   #if !os(Linux)
