Skip to content

Commit 08fe3f0

Browse files
committed
Fix use of count
1 parent 896d38d commit 08fe3f0

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

Tests/EntropyStringTests/RandomTests.swift

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ class RandomTests: XCTestCase {
2020

2121
func testSmallID() {
2222
random = Random()
23-
XCTAssertEqual( 6, random.smallID().count)
24-
XCTAssertEqual( 5, random.smallID(.charSet64).count)
25-
XCTAssertEqual( 6, random.smallID(.charSet32).count)
26-
XCTAssertEqual( 8, random.smallID(.charSet16).count)
27-
XCTAssertEqual(10, random.smallID(.charSet8).count)
28-
XCTAssertEqual(15, random.smallID(.charSet4).count)
29-
XCTAssertEqual(29, random.smallID(.charSet2).count)
23+
XCTAssertEqual( 6, random.smallID().characters.count)
24+
XCTAssertEqual( 5, random.smallID(.charSet64).characters.count)
25+
XCTAssertEqual( 6, random.smallID(.charSet32).characters.count)
26+
XCTAssertEqual( 8, random.smallID(.charSet16).characters.count)
27+
XCTAssertEqual(10, random.smallID(.charSet8).characters.count)
28+
XCTAssertEqual(15, random.smallID(.charSet4).characters.count)
29+
XCTAssertEqual(29, random.smallID(.charSet2).characters.count)
3030

3131
for charSet in charSets {
3232
let smallIDBits = Float(29)
@@ -39,13 +39,13 @@ class RandomTests: XCTestCase {
3939

4040
func testMediumID() {
4141
random = Random()
42-
XCTAssertEqual(14, random.mediumID().count)
43-
XCTAssertEqual(12, random.mediumID(.charSet64).count)
44-
XCTAssertEqual(14, random.mediumID(.charSet32).count)
45-
XCTAssertEqual(18, random.mediumID(.charSet16).count)
46-
XCTAssertEqual(23, random.mediumID(.charSet8).count)
47-
XCTAssertEqual(35, random.mediumID(.charSet4).count)
48-
XCTAssertEqual(69, random.mediumID(.charSet2).count)
42+
XCTAssertEqual(14, random.mediumID().characters.count)
43+
XCTAssertEqual(12, random.mediumID(.charSet64).characters.count)
44+
XCTAssertEqual(14, random.mediumID(.charSet32).characters.count)
45+
XCTAssertEqual(18, random.mediumID(.charSet16).characters.count)
46+
XCTAssertEqual(23, random.mediumID(.charSet8).characters.count)
47+
XCTAssertEqual(35, random.mediumID(.charSet4).characters.count)
48+
XCTAssertEqual(69, random.mediumID(.charSet2).characters.count)
4949

5050
for charSet in charSets {
5151
let mediumIDBits = Float(69)
@@ -58,13 +58,13 @@ class RandomTests: XCTestCase {
5858

5959
func testLargeID() {
6060
random = Random()
61-
XCTAssertEqual(20, random.largeID().count)
62-
XCTAssertEqual(17, random.largeID(.charSet64).count)
63-
XCTAssertEqual(20, random.largeID(.charSet32).count)
64-
XCTAssertEqual(25, random.largeID(.charSet16).count)
65-
XCTAssertEqual(33, random.largeID(.charSet8).count)
66-
XCTAssertEqual(50, random.largeID(.charSet4).count)
67-
XCTAssertEqual(99, random.largeID(.charSet2).count)
61+
XCTAssertEqual(20, random.largeID().characters.count)
62+
XCTAssertEqual(17, random.largeID(.charSet64).characters.count)
63+
XCTAssertEqual(20, random.largeID(.charSet32).characters.count)
64+
XCTAssertEqual(25, random.largeID(.charSet16).characters.count)
65+
XCTAssertEqual(33, random.largeID(.charSet8).characters.count)
66+
XCTAssertEqual(50, random.largeID(.charSet4).characters.count)
67+
XCTAssertEqual(99, random.largeID(.charSet2).characters.count)
6868

6969
for charSet in charSets {
7070
let largeIDBits = Float(99)
@@ -77,13 +77,13 @@ class RandomTests: XCTestCase {
7777

7878
func testSessionID() {
7979
random = Random()
80-
XCTAssertEqual( 26, random.sessionID().count)
81-
XCTAssertEqual( 22, random.sessionID(.charSet64).count)
82-
XCTAssertEqual( 26, random.sessionID(.charSet32).count)
83-
XCTAssertEqual( 32, random.sessionID(.charSet16).count)
84-
XCTAssertEqual( 43, random.sessionID(.charSet8).count)
85-
XCTAssertEqual( 64, random.sessionID(.charSet4).count)
86-
XCTAssertEqual(128, random.sessionID(.charSet2).count)
80+
XCTAssertEqual( 26, random.sessionID().characters.count)
81+
XCTAssertEqual( 22, random.sessionID(.charSet64).characters.count)
82+
XCTAssertEqual( 26, random.sessionID(.charSet32).characters.count)
83+
XCTAssertEqual( 32, random.sessionID(.charSet16).characters.count)
84+
XCTAssertEqual( 43, random.sessionID(.charSet8).characters.count)
85+
XCTAssertEqual( 64, random.sessionID(.charSet4).characters.count)
86+
XCTAssertEqual(128, random.sessionID(.charSet2).characters.count)
8787

8888
for charSet in charSets {
8989
let sessionIDBits = Float(128)
@@ -96,13 +96,13 @@ class RandomTests: XCTestCase {
9696

9797
func testToken() {
9898
random = Random()
99-
XCTAssertEqual( 52, random.token().count)
100-
XCTAssertEqual( 43, random.token(.charSet64).count)
101-
XCTAssertEqual( 52, random.token(.charSet32).count)
102-
XCTAssertEqual( 64, random.token(.charSet16).count)
103-
XCTAssertEqual( 86, random.token(.charSet8).count)
104-
XCTAssertEqual(128, random.token(.charSet4).count)
105-
XCTAssertEqual(256, random.token(.charSet2).count)
99+
XCTAssertEqual( 52, random.token().characters.count)
100+
XCTAssertEqual( 43, random.token(.charSet64).characters.count)
101+
XCTAssertEqual( 52, random.token(.charSet32).characters.count)
102+
XCTAssertEqual( 64, random.token(.charSet16).characters.count)
103+
XCTAssertEqual( 86, random.token(.charSet8).characters.count)
104+
XCTAssertEqual(128, random.token(.charSet4).characters.count)
105+
XCTAssertEqual(256, random.token(.charSet2).characters.count)
106106

107107
for charSet in charSets {
108108
let tokenBits = Float(256)

0 commit comments

Comments
 (0)