@@ -17,33 +17,33 @@ class KeyTests: XCTestCase {
17
17
}
18
18
19
19
func testKeyPrimaryTriads( ) {
20
- XCTAssertEqual ( Key . C. primaryTriads. map { $0. description } ,
20
+ XCTAssertEqual ( Key . C. primaryTriads ( ) . map { $0. description } ,
21
21
[ " C " , " Dm " , " Em " , " F " , " G " , " Am " , " B° " ] )
22
- XCTAssertEqual ( Key . Am. primaryTriads. map { $0. description } ,
22
+ XCTAssertEqual ( Key . Am. primaryTriads ( ) . map { $0. description } ,
23
23
[ " Am " , " B° " , " C " , " Dm " , " Em " , " F " , " G " ] )
24
- XCTAssertEqual ( Key . G. primaryTriads. map { $0. description } ,
24
+ XCTAssertEqual ( Key . G. primaryTriads ( ) . map { $0. description } ,
25
25
[ " G " , " Am " , " Bm " , " C " , " D " , " Em " , " F♯° " ] )
26
- XCTAssertEqual ( Key . Cs. primaryTriads. map { $0. description } ,
26
+ XCTAssertEqual ( Key . Cs. primaryTriads ( ) . map { $0. description } ,
27
27
[ " C♯ " , " D♯m " , " E♯m " , " F♯ " , " G♯ " , " A♯m " , " B♯° " ] )
28
- XCTAssertEqual ( Key . Cb. primaryTriads. map { $0. description } ,
28
+ XCTAssertEqual ( Key . Cb. primaryTriads ( ) . map { $0. description } ,
29
29
[ " C♭ " , " D♭m " , " E♭m " , " F♭ " , " G♭ " , " A♭m " , " B♭° " ] )
30
30
}
31
31
32
32
func testScalePrimaryTriads( ) {
33
- XCTAssertEqual ( Key ( root: . C, scale: . harmonicMinor) . primaryTriads. map { $0. description } ,
33
+ XCTAssertEqual ( Key ( root: . C, scale: . harmonicMinor) . primaryTriads ( ) . map { $0. description } ,
34
34
[ " Cm " , " D° " , " E♭⁺ " , " Fm " , " G " , " A♭ " , " B° " ] )
35
35
36
- XCTAssertEqual ( Key ( root: . Db, scale: . phrygian) . primaryTriads. map { $0. description } ,
36
+ XCTAssertEqual ( Key ( root: . Db, scale: . phrygian) . primaryTriads ( ) . map { $0. description } ,
37
37
[ " D♭m " , " E𝄫 " , " F♭ " , " G♭m " , " A♭° " , " B𝄫 " , " C♭m " ] )
38
38
39
- XCTAssertEqual ( Key ( root: . Ds, scale: . harmonicMinor) . primaryTriads. map { $0. description } ,
39
+ XCTAssertEqual ( Key ( root: . Ds, scale: . harmonicMinor) . primaryTriads ( ) . map { $0. description } ,
40
40
[ " D♯m " , " E♯° " , " F♯⁺ " , " G♯m " , " A♯ " , " B " , " C𝄪° " ] )
41
41
}
42
42
43
43
func testKeyChords( ) {
44
- XCTAssertEqual ( Key . G. chords. count, 60 ) // This should only change if new chord types are added
45
- for triad in Key . G. primaryTriads {
46
- XCTAssert ( Key . G. chords. contains ( triad) )
44
+ XCTAssertEqual ( Key . G. chords ( ) . count, 60 ) // This should only change if new chord types are added
45
+ for triad in Key . G. primaryTriads ( ) {
46
+ XCTAssert ( Key . G. chords ( ) . contains ( triad) )
47
47
}
48
48
}
49
49
0 commit comments