Take the ResizeArray helper into use in even more tests

Author: iminashi

tests/Rocksmith2014.XML.Processing.Tests/InstrumentalChecker/MiscTests.fs

@@ -69,8 +69,8 @@ let eventTests =
 let handshapeTests =
     testList "Arrangement Checker (Handshapes)" [
         testCase "Detects fingering that does not match anchor position" <| fun _ ->
-            let hs = ResizeArray(seq { HandShape(0s, 1000, 1500) })
-            let anchors = ResizeArray(seq { Anchor(2y, 500) })
+            let hs = ![ HandShape(0s, 1000, 1500) ]
+            let anchors = ![ Anchor(2y, 500) ]
             let level = Level(HandShapes = hs, Anchors = anchors)
 
             let results = checkHandshapes testArr level
@@ -79,8 +79,8 @@ let handshapeTests =
             Expect.equal results.Head.IssueType FingeringAnchorMismatch "Correct issue type"
 
         testCase "Logic that checks if fingering does not match anchor position ignores fingerings using thumb" <| fun _ ->
-            let hs = ResizeArray(seq { HandShape(6s, 1000, 1500); HandShape(7s, 2000, 2500) })
-            let anchors = ResizeArray(seq { Anchor(5y, 1000); Anchor(1y, 2000) })
+            let hs = ![ HandShape(6s, 1000, 1500); HandShape(7s, 2000, 2500) ]
+            let anchors = ![ Anchor(5y, 1000); Anchor(1y, 2000) ]
             let level = Level(HandShapes = hs, Anchors = anchors)
 
             let results = checkHandshapes testArr level
@@ -92,8 +92,8 @@ let handshapeTests =
 let anchorTests =
     testList "Arrangement Checker (Anchors)" [
         testCase "Detects anchor inside handshape" <| fun _ ->
-            let anchors = ResizeArray(seq { Anchor(1y, 200) })
-            let handShapes = ResizeArray(seq { HandShape(StartTime = 100, EndTime = 400) })
+            let anchors = ![ Anchor(1y, 200) ]
+            let handShapes = ![ HandShape(StartTime = 100, EndTime = 400) ]
             let level = Level(HandShapes = handShapes, Anchors = anchors)
 
             let results = checkAnchors testArr level
@@ -102,17 +102,17 @@ let anchorTests =
             Expect.equal results.Head.IssueType AnchorInsideHandShape "Correct issue type"
 
         testCase "No false positive for anchor at the start of handshape" <| fun _ ->
-            let anchors = ResizeArray(seq { Anchor(1y, 100) })
-            let handShapes = ResizeArray(seq { HandShape(StartTime = 100, EndTime = 400) })
+            let anchors = ![ Anchor(1y, 100) ]
+            let handShapes = ![ HandShape(StartTime = 100, EndTime = 400) ]
             let level = Level(HandShapes = handShapes, Anchors = anchors)
 
             let results = checkAnchors testArr level
 
             Expect.isEmpty results "An issue was found in check results"
 
         testCase "Detects anchor inside handshape at section boundary" <| fun _ ->
-            let anchors = ResizeArray(seq { Anchor(1y, 8000) })
-            let handShapes = ResizeArray(seq { HandShape(StartTime = 7000, EndTime = 9000) })
+            let anchors = ![ Anchor(1y, 8000) ]
+            let handShapes = ![ HandShape(StartTime = 7000, EndTime = 9000) ]
             let level = Level(HandShapes = handShapes, Anchors = anchors)
 
             let results = checkAnchors testArr level
@@ -121,17 +121,17 @@ let anchorTests =
             Expect.equal results.Head.IssueType AnchorInsideHandShapeAtPhraseBoundary "Correct issue type"
 
         testCase "Ignores anchors on phrases that will be moved (handshape check)" <| fun _ ->
-            let anchors = ResizeArray(seq { Anchor(1y, 6500) })
-            let handShapes = ResizeArray(seq { HandShape(StartTime = 6000, EndTime = 6550) })
+            let anchors = ![ Anchor(1y, 6500) ]
+            let handShapes = ![ HandShape(StartTime = 6000, EndTime = 6550) ]
             let level = Level(HandShapes = handShapes, Anchors = anchors)
 
             let results = checkAnchors testArr level
 
             Expect.isEmpty results "An issue was found in check results"
 
         testCase "Detects anchor near the end of an unpitched slide" <| fun _ ->
-            let anchors = ResizeArray(seq { Anchor(1y, 500) })
-            let notes = ResizeArray(seq { Note(Time = 100, Sustain = 397, SlideUnpitchTo = 5y) })
+            let anchors = ![ Anchor(1y, 500) ]
+            let notes = ![ Note(Time = 100, Sustain = 397, SlideUnpitchTo = 5y) ]
             let level = Level(Notes = notes, Anchors = anchors)
 
             let results = checkAnchors testArr level
@@ -140,8 +140,8 @@ let anchorTests =
             Expect.equal results.Head.IssueType AnchorCloseToUnpitchedSlide "Correct issue type"
 
         testCase "Ignores anchors on phrases that will be moved (unpitched slide check)" <| fun _ ->
-            let anchors = ResizeArray(seq { Anchor(1y, 6500) })
-            let notes = ResizeArray(seq { Note(Time = 6200, Sustain = 300, SlideUnpitchTo = 5y) })
+            let anchors = ![ Anchor(1y, 6500) ]
+            let notes = ![ Note(Time = 6200, Sustain = 300, SlideUnpitchTo = 5y) ]
             let level = Level(Notes = notes, Anchors = anchors)
 
             let results = checkAnchors testArr level
@@ -153,11 +153,11 @@ let anchorTests =
 let phraseTests =
     testList "Arrangement Checker (Phrases)" [
         testCase "Detects non-empty first phrase" <| fun _ ->
-            let sections = ResizeArray(seq { Section("riff", 1500, 1s); Section("noguitar", 2000, 2s) })
-            let phrases = ResizeArray(seq { Phrase("COUNT", 0uy, PhraseMask.None); Phrase("riff", 0uy, PhraseMask.None); Phrase("END", 0uy, PhraseMask.None) })
-            let phraseIterations = ResizeArray(seq { PhraseIteration(1000, 0); PhraseIteration(1500, 1); PhraseIteration(2000, 2) })
-            let notes = ResizeArray(seq { Note(Time = 1100) })
-            let levels = ResizeArray(seq { Level(0y, Notes = notes) })
+            let sections = ![ Section("riff", 1500, 1s); Section("noguitar", 2000, 2s) ]
+            let phrases = ![ Phrase("COUNT", 0uy, PhraseMask.None); Phrase("riff", 0uy, PhraseMask.None); Phrase("END", 0uy, PhraseMask.None) ]
+            let phraseIterations = ![ PhraseIteration(1000, 0); PhraseIteration(1500, 1); PhraseIteration(2000, 2) ]
+            let notes = ![ Note(Time = 1100) ]
+            let levels = ![ Level(0y, Notes = notes) ]
             let phraseTestArr = InstrumentalArrangement(Sections = sections, Phrases = phrases, PhraseIterations = phraseIterations, Levels = levels)
 
             let results = checkPhrases phraseTestArr
@@ -166,10 +166,10 @@ let phraseTests =
             Expect.equal results.Head.IssueType FirstPhraseNotEmpty "Correct issue type"
 
         testCase "Detects missing END phrase" <| fun _ ->
-            let phrases = ResizeArray(seq { Phrase("COUNT", 0uy, PhraseMask.None); Phrase("riff", 0uy, PhraseMask.None) })
-            let phraseIterations = ResizeArray(seq { PhraseIteration(1000, 0); PhraseIteration(1500, 1) })
-            let notes = ResizeArray(seq { Note(Time = 1600) })
-            let levels = ResizeArray(seq { Level(0y, Notes = notes) })
+            let phrases = ![ Phrase("COUNT", 0uy, PhraseMask.None); Phrase("riff", 0uy, PhraseMask.None) ]
+            let phraseIterations = ![ PhraseIteration(1000, 0); PhraseIteration(1500, 1) ]
+            let notes = ![ Note(Time = 1600) ]
+            let levels = ![ Level(0y, Notes = notes) ]
             let noEndTestArr = InstrumentalArrangement(Sections = sections, Phrases = phrases, PhraseIterations = phraseIterations, Levels = levels)
 
             let results = checkPhrases noEndTestArr
@@ -178,21 +178,20 @@ let phraseTests =
             Expect.equal results.Head.IssueType NoEndPhrase "Correct issue type"
 
         testCase "Detects more than 100 phrases" <| fun _ ->
-            let phrases =
-                ResizeArray(seq {
-                    Phrase("COUNT", 0uy, PhraseMask.None)
-                    Phrase("riff", 0uy, PhraseMask.None)
-                    Phrase("END", 0uy, PhraseMask.None) })
-
-            let phraseIterations =
-                seq {
-                    yield PhraseIteration(1000, 0)
-                    for i in 1..99 -> PhraseIteration(1000 + i * 100, 1)
-                    yield PhraseIteration(9000, 2)
-                } |> ResizeArray
-
-            let notes = ResizeArray(seq { Note(Time = 1600) })
-            let levels = ResizeArray(seq { Level(0y, Notes = notes) })
+            let phrases = ![
+                Phrase("COUNT", 0uy, PhraseMask.None)
+                Phrase("riff", 0uy, PhraseMask.None)
+                Phrase("END", 0uy, PhraseMask.None)
+            ]
+
+            let phraseIterations = ![
+                yield PhraseIteration(1000, 0)
+                for i in 1..99 -> PhraseIteration(1000 + i * 100, 1)
+                yield PhraseIteration(9000, 2)
+            ]
+
+            let notes = ![ Note(Time = 1600) ]
+            let levels = ![ Level(0y, Notes = notes) ]
             let noEndTestArr = InstrumentalArrangement(Sections = sections, Phrases = phrases, PhraseIterations = phraseIterations, Levels = levels)
 
             let results = checkPhrases noEndTestArr
@@ -205,8 +204,8 @@ let phraseTests =
 let generalTests =
     testList "Arrangement Checker (General)" [
         testCase "Does not throw exceptions when checking an arrangement without notes" <| fun _ ->
-            let phrases = ResizeArray(seq { Phrase("A", 0uy, PhraseMask.None); Phrase("END", 0uy, PhraseMask.None) })
-            let phraseIterations = ResizeArray(seq { PhraseIteration(500, 0); PhraseIteration(2500, 1) })
+            let phrases = ![ Phrase("A", 0uy, PhraseMask.None); Phrase("END", 0uy, PhraseMask.None) ]
+            let phraseIterations = ![ PhraseIteration(500, 0); PhraseIteration(2500, 1) ]
             let arr = InstrumentalArrangement(Phrases = phrases, PhraseIterations = phraseIterations)
 
             let issues = ArrangementChecker.checkInstrumental arr

tests/Rocksmith2014.XML.Processing.Tests/ShowLightsCheckerTests.fs

@@ -8,21 +8,21 @@ open Rocksmith2014.XML.Processing
 let showLightsTests =
     testList "Arrangement Checker (Show Lights)" [
         testCase "Detects missing fog note" <| fun _ ->
-            let sl = ResizeArray(seq { ShowLight(100, ShowLight.BeamMin) })
+            let sl = ![ ShowLight(100, ShowLight.BeamMin) ]
 
             let result = ShowLightsChecker.check sl
 
             Expect.isSome result "Checker returned an issue"
 
         testCase "Detects missing beam note" <| fun _ ->
-            let sl = ResizeArray(seq { ShowLight(100, ShowLight.FogMin) })
+            let sl = ![ ShowLight(100, ShowLight.FogMin) ]
 
             let result = ShowLightsChecker.check sl
 
             Expect.isSome result "Checker returned an issue"
 
         testCase "Returns None for valid show lights" <| fun _ ->
-            let sl = ResizeArray(seq { ShowLight(100, ShowLight.FogMin); ShowLight(100, ShowLight.BeamOff) })
+            let sl = ![ ShowLight(100, ShowLight.FogMin); ShowLight(100, ShowLight.BeamOff) ]
 
             let result = ShowLightsChecker.check sl
 

tests/Rocksmith2014.XML.Processing.Tests/UtilsTests.fs

@@ -9,20 +9,20 @@ let tests =
     testList "Utility tests" [
         testCase "getFirstNoteTime does not fail when there are no phrase iterations" <| fun _ ->
             let arr = InstrumentalArrangement()
-            let notes = ResizeArray(seq { Note(Time = 4000) })
-            arr.Levels <- ResizeArray(seq { Level(0y); Level(1y, Notes = notes)  })
+            let notes = ![ Note(Time = 4000) ]
+            arr.Levels <- ![ Level(0y); Level(1y, Notes = notes) ]
 
             let time = Utils.getFirstNoteTime arr
 
             Expect.equal time (Some 4000) "First note time is correct"
 
         testCase "getFirstNoteTime finds first note when there are DD levels" <| fun _ ->
-            let phrases = ResizeArray(seq { Phrase("default", 0uy, PhraseMask.None); Phrase("riff", 1uy, PhraseMask.None) })
-            let phraseIterations = ResizeArray(seq { PhraseIteration(0, 0); PhraseIteration(5000, 1) })
+            let phrases = ![ Phrase("default", 0uy, PhraseMask.None); Phrase("riff", 1uy, PhraseMask.None) ]
+            let phraseIterations = ![ PhraseIteration(0, 0); PhraseIteration(5000, 1) ]
             let arr = InstrumentalArrangement(Phrases = phrases, PhraseIterations = phraseIterations)
-            let notes = ResizeArray(seq { Note(Time = 5400) })
-            let chords = ResizeArray(seq { Chord(Time = 5000) })
-            arr.Levels <- ResizeArray(seq { Level(0y); Level(1y, Notes = notes, Chords = chords)  })
+            let notes = ![ Note(Time = 5400) ]
+            let chords = ![ Chord(Time = 5000) ]
+            arr.Levels <- ![ Level(0y); Level(1y, Notes = notes, Chords = chords)  ]
 
             let time = Utils.getFirstNoteTime arr
 

tests/Rocksmith2014.XML.Processing.Tests/VocalsCheckerTests.fs

@@ -15,64 +15,64 @@ let vocalsTests =
             Expect.isEmpty result "Checking completed without issues"
 
         testCase "Detects character not in default font" <| fun _ ->
-            let vocals = ResizeArray(seq { Vocal(0, 50, "Test+"); Vocal(100, 50, "Nope:あ") })
+            let vocals = ![ Vocal(0, 50, "Test+"); Vocal(100, 50, "Nope:あ") ]
 
             let result = VocalsChecker.check None vocals
 
             Expect.equal result.Head.IssueType (LyricWithInvalidChar('あ', false)) "Issue type is correct"
 
         testCase "Accepts characters in default font" <| fun _ ->
-            let vocals = ResizeArray(seq { Vocal(0, 50, "Test+"); Vocal(100, 50, "ÄöÖÅå"); Vocal(200, 50, "àè- +?&#\"") })
+            let vocals = ![ Vocal(0, 50, "Test+"); Vocal(100, 50, "ÄöÖÅå"); Vocal(200, 50, "àè- +?&#\"") ]
 
             let result = VocalsChecker.check None vocals
 
             Expect.isEmpty result "Issue was created"
 
         testCase "Ignores special characters ('-', '+') when using custom font" <| fun _ ->
-            let vocals = ResizeArray(seq { Vocal(0, 100, "あ+"); Vocal(50, 50, "あ-"); Vocal(80, 50, "あ") })
+            let vocals = ![ Vocal(0, 100, "あ+"); Vocal(50, 50, "あ-"); Vocal(80, 50, "あ") ]
             // Custom font does not define characters - or +
-            let customFont = GlyphDefinitions(Glyphs = ResizeArray(seq { GlyphDefinition(Symbol = "あ") }))
+            let customFont = GlyphDefinitions(Glyphs = ![ GlyphDefinition(Symbol = "あ") ])
 
             let result = VocalsChecker.check (Some customFont) vocals
 
             Expect.isEmpty result "Issue was created"
 
         testCase "Detects hyphen not used as a special character when not included in custom font" <| fun _ ->
-            let vocals = ResizeArray(seq { Vocal(0, 100, "あ+"); Vocal(50, 50, "あ--"); Vocal(80, 50, "あ") })
-            let customFont = GlyphDefinitions(Glyphs = ResizeArray(seq { GlyphDefinition(Symbol = "あ") }))
+            let vocals = ![ Vocal(0, 100, "あ+"); Vocal(50, 50, "あ--"); Vocal(80, 50, "あ") ]
+            let customFont = GlyphDefinitions(Glyphs = ![ GlyphDefinition(Symbol = "あ") ])
 
             let result = VocalsChecker.check (Some customFont) vocals
 
             Expect.equal result.Head.IssueType (LyricWithInvalidChar('-', true)) "Issue type is correct"
 
         testCase "Detects character not in the custom font" <| fun _ ->
-            let vocals = ResizeArray(seq { Vocal(0, 50, "あ+"); Vocal(100, 50, "不") })
-            let customFont = GlyphDefinitions(Glyphs = ResizeArray(seq { GlyphDefinition(Symbol = "あ") }))
+            let vocals = ![ Vocal(0, 50, "あ+"); Vocal(100, 50, "不") ]
+            let customFont = GlyphDefinitions(Glyphs = ![ GlyphDefinition(Symbol = "あ") ])
 
             let result = VocalsChecker.check (Some customFont) vocals
 
             Expect.equal result.Head.IssueType (LyricWithInvalidChar('不', true)) "Issue type is correct"
 
         testCase "Detects lyric that is too long (ASCII)" <| fun _ ->
             let lyric = String.replicate 48 "A"
-            let vocals = ResizeArray(seq { Vocal(0, 10, "Test+"); Vocal(0, 50, lyric) })
+            let vocals = ![ Vocal(0, 10, "Test+"); Vocal(0, 50, lyric) ]
 
             let result = VocalsChecker.check None vocals
 
             Expect.equal result.Head.IssueType (LyricTooLong lyric) "Issue type is correct"
 
         testCase "Detects lyric that is too long (non-ASCII)" <| fun _ ->
             let lyric = String.replicate 16 "あ" // 48 bytes in UTF8
-            let vocals = ResizeArray(seq { Vocal(0, 100, "あ+"); Vocal(0, 50, lyric) })
-            let customFont = GlyphDefinitions(Glyphs = ResizeArray(seq { GlyphDefinition(Symbol = "あ") }))
+            let vocals = ![ Vocal(0, 100, "あ+"); Vocal(0, 50, lyric) ]
+            let customFont = GlyphDefinitions(Glyphs = ![ GlyphDefinition(Symbol = "あ") ])
 
             let result = VocalsChecker.check (Some customFont) vocals
 
             Expect.hasLength result 1 "One issue created"
             Expect.equal result.Head.IssueType (LyricTooLong lyric) "Issue type is correct"
 
         testCase "Detects lyrics without line breaks" <| fun _ ->
-            let vocals = ResizeArray(seq { Vocal(0, 50, "Line"); Vocal(0, 100, "Test+") })
+            let vocals = ![ Vocal(0, 50, "Line"); Vocal(0, 100, "Test+") ]
 
             let result = VocalsChecker.check None vocals