Refactor test

src/MusicalScore/MusicSheet.ts

@@ -32,7 +32,6 @@ export class PlaybackSettings {
     public rhythm: Fraction;
 }
 
-
 export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet>*/ {
     constructor() {
         // (*) try {
@@ -79,6 +78,7 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
     // (*) private musicSheetParameterObject: MusicSheetParameterObject = undefined;
     // (*) private engravingRules: EngravingRules;
     // (*) private musicSheetParameterChangedDelegate: MusicSheetParameterChangedDelegate;
+
     public static getIndexFromStaff(staff: Staff): number {
         return staff.idInMusicSheet;
     }
@@ -243,11 +243,7 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
         }
     }
     public getStaffFromIndex(staffIndexInMusicSheet: number): Staff {
-        if (this.staves.length > staffIndexInMusicSheet) {
-            return this.staves[staffIndexInMusicSheet];
-        } else {
-            return undefined;
-        }
+        return this.staves[staffIndexInMusicSheet];
     }
     public fillStaffList(): void {
         let i: number = 0;
@@ -403,10 +399,10 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
 
     }
     public get CurrentEnrolledPosition(): Fraction {
-        return this.currentEnrolledPosition;
+        return this.currentEnrolledPosition.clone();
     }
     public set CurrentEnrolledPosition(value: Fraction) {
-        this.currentEnrolledPosition = Fraction.CreateFractionFromFraction(value);
+        this.currentEnrolledPosition = value.clone();
     }
     public get Transpose(): number {
         return this.transpose;
@@ -478,10 +474,9 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
         }
         return this.findSourceMeasureFromTimeStamp(timeStamp);
     }
-    public findSourceMeasureFromTimeStamp(timeStamp: Fraction): SourceMeasure {
+    public findSourceMeasureFromTimeStamp(timestamp: Fraction): SourceMeasure {
         for (let sm of this.SourceMeasures) {
-            // FIXME: bug?
-            if (timeStamp.lte(sm.AbsoluteTimestamp) && timeStamp.lt(Fraction.plus(sm.AbsoluteTimestamp, sm.Duration))) {
+            if (sm.AbsoluteTimestamp.lte(timestamp) && timestamp.lt(Fraction.plus(sm.AbsoluteTimestamp, sm.Duration))) {
                 return sm;
             }
         }

src/MusicalScore/VoiceData/SourceMeasure.ts

@@ -278,8 +278,7 @@ export class SourceMeasure {
     }
     public getEntriesPerStaff(staffIndex: number): SourceStaffEntry[] {
         let sourceStaffEntries: SourceStaffEntry[] = [];
-        for (let idx: number = 0, len: number = this.VerticalSourceStaffEntryContainers.length; idx < len; ++idx) {
-            let container: VerticalSourceStaffEntryContainer = this.VerticalSourceStaffEntryContainers[idx];
+        for (let container of this.VerticalSourceStaffEntryContainers) {
             let sse: SourceStaffEntry = container[staffIndex];
             if (sse !== undefined) { sourceStaffEntries.push(sse); }
         }

test/MusicalScore/ScoreIO/MusicSheetReader.ts

@@ -2,10 +2,12 @@ import {MusicSheetReader} from "../../../src/MusicalScore/ScoreIO/MusicSheetRead
 import {MusicSheet} from "../../../src/MusicalScore/MusicSheet";
 import {IXmlElement} from "../../../src/Common/FileIO/Xml";
 
+// Fixture has no typings yet, thus declare it as 'any'
 declare var fixture: any;
 
 describe("Music Sheet Reader Tests", () => {
-    // Initialization
+
+    // Initialize variables
     let path: string = "/test/data/MuzioClementi_SonatinaOpus36No1_Part1.xml";
     let reader: MusicSheetReader = new MusicSheetReader();
     let root: IXmlElement;
@@ -15,8 +17,9 @@ describe("Music Sheet Reader Tests", () => {
         fixture.setBase("base");
     });
 
+    // Load the xml files
     beforeEach((): void => {
-      this.result = fixture.load(path);
+      fixture.load(path);
       // console.log(this.result[0].length, typeof this.result, typeof this.result[0], this.result[0].substr, this.result[0].getElementById);
       let container: Element = document.getElementById("fixture_container");
       let documentElement: IXmlElement = new IXmlElement(container);
@@ -40,7 +43,7 @@ describe("Music Sheet Reader Tests", () => {
         // chai.expect(root.element("part").elements("measure").length).to.equal(38);
         chai.expect(sheet.SourceMeasures.length).to.equal(38);
         console.log("First Measure: ", sheet.SourceMeasures[0]);
-        //console.log("Notes on first Measure: ", sheet.SourceMeasures[0].VerticalSourceStaffEntryContainers[0].StaffEntries[0]);
+        // console.log("Notes on first Measure: ", sheet.SourceMeasures[0].VerticalSourceStaffEntryContainers[0].StaffEntries[0]);
         // chai.expect(sheet.)
         done();
     });
@@ -50,7 +53,7 @@ describe("Music Sheet Reader Tests", () => {
         chai.expect(reader.CompleteNumberOfStaves).to.equal(2);
         chai.expect(sheet.Instruments.length).to.equal(2);
         chai.expect(sheet.InstrumentalGroups.length).to.equal(2);
-        console.log(sheet.SheetErrors);
+        console.log("SheetErrors: ", sheet.SheetErrors);
         chai.expect(sheet.Instruments[0].Name).to.equal("Piano (right)");
         chai.expect(sheet.Instruments[1].Name).to.equal("Piano (left)");
         done();