Add use function to switch CharSet

dingosky · dingosky · commit 3127583e55ff · 2017-08-15T13:37:19.000-07:00
diff --git a/Sources/Random.swift b/Sources/Random.swift
@@ -50,6 +50,15 @@ public class Random {
     return charSet.chars
   }
   
+  public func use(_ charSet: CharSet) {
+    self.charSet = charSet
+  }
+  
+  public func use(_ chars: String) throws {
+    let charSet = try CharSet(chars)
+    self.charSet = charSet
+  }
+  
   // MARK: - Public API
   //
   /// Generates a random string.
diff --git a/Tests/EntropyStringTests/RandomTests.swift b/Tests/EntropyStringTests/RandomTests.swift
@@ -218,7 +218,20 @@ class RandomTests: XCTestCase {
         XCTFail("Error not a EntropyStringError")
       }
     }
+  }
+  
+  func testUseCharSet() {
+    random = Random(.charSet32)
+    XCTAssertEqual(random.chars, CharSet.charSet32.chars)
+    random.use(.charSet16)
+    XCTAssertEqual(random.chars, CharSet.charSet16.chars)
+  }
   
+  func testUseChars() {
+    random = try! Random("abce")
+    XCTAssertEqual(random.chars, "abce")
+    try! random.use("ECBA")
+    XCTAssertEqual(random.chars, "ECBA")
   }
 
   #if !os(Linux)

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,20 @@ class RandomTests: XCTestCase {`
`218`	`218`	`XCTFail("Error not a EntropyStringError")`
`219`	`219`	`}`
`220`	`220`	`}`
	`221`	`+ }`
	`222`	`+`
	`223`	`+ func testUseCharSet() {`
	`224`	`+ random = Random(.charSet32)`
	`225`	`+ XCTAssertEqual(random.chars, CharSet.charSet32.chars)`
	`226`	`+ random.use(.charSet16)`
	`227`	`+ XCTAssertEqual(random.chars, CharSet.charSet16.chars)`
	`228`	`+ }`
`221`	`229`
	`230`	`+ func testUseChars() {`
	`231`	`+ random = try! Random("abce")`
	`232`	`+ XCTAssertEqual(random.chars, "abce")`
	`233`	`+ try! random.use("ECBA")`
	`234`	`+ XCTAssertEqual(random.chars, "ECBA")`
`222`	`235`	`}`
`223`	`236`
`224`	`237`	`#if !os(Linux)`