Merge branch 'develop' of https://github.com/opensheetmusicdisplay/opensheetmusicdisplay into develop

test/Common/OSMD/OSMD_Test.ts

@@ -1,5 +1,6 @@
 import chai = require("chai");
 import {OSMD} from "../../../src/OSMD/OSMD";
+import {TestUtils} from "../../Util/TestUtils";
 
 
 describe("OSMD Main Export", () => {
@@ -20,7 +21,7 @@ describe("OSMD Main Export", () => {
         done();
     });
 
-    /*it("load MXL from string", (done: MochaDone) => {
+    it("load MXL from string", (done: MochaDone) => {
         let mxl: string = TestUtils.getMXL("MozartTrio");
         let div: HTMLElement = document.createElement("div");
         let osmd: OSMD = new OSMD(div);
@@ -31,7 +32,7 @@ describe("OSMD Main Export", () => {
             },
             done
         );
-    });*/
+    });
 
     it("load invalid MXL from string", (done: MochaDone) => {
         let mxl: string = "\x50\x4b\x03\x04";
@@ -51,7 +52,7 @@ describe("OSMD Main Export", () => {
         );
     });
 
-    /*it("load XML string", (done: MochaDone) => {
+    it("load XML string", (done: MochaDone) => {
         let score: Document = TestUtils.getScore("MuzioClementi_SonatinaOpus36No1_Part1");
         let xml: string = new XMLSerializer().serializeToString(score);
         let div: HTMLElement = document.createElement("div");
@@ -63,9 +64,9 @@ describe("OSMD Main Export", () => {
             },
             done
         );
-    });*/
+    });
 
-    /*it("load XML Document", (done: MochaDone) => {
+    it("load XML Document", (done: MochaDone) => {
         let score: Document = TestUtils.getScore("MuzioClementi_SonatinaOpus36No1_Part1");
         let div: HTMLElement = document.createElement("div");
         let osmd: OSMD = new OSMD(div);
@@ -76,9 +77,9 @@ describe("OSMD Main Export", () => {
             },
             done
         );
-    });*/
+    });
 
-    /*it("load MXL Document by URL", (done: MochaDone) => {
+    it("load MXL Document by URL", (done: MochaDone) => {
         let url: string = "base/test/data/MozartTrio.mxl";
         let div: HTMLElement = document.createElement("div");
         let osmd: OSMD = new OSMD(div);
@@ -89,7 +90,7 @@ describe("OSMD Main Export", () => {
             },
             done
         );
-    });*/
+    });
 
     it("load MXL Document by invalid URL", (done: MochaDone) => {
         let url: string = "http://www.google.com";
@@ -146,7 +147,7 @@ describe("OSMD Main Export", () => {
         document.body.removeChild(container1);
     });
 
-    /*it("test width 500", (done: MochaDone) => {
+    it("test width 500", (done: MochaDone) => {
         let div: HTMLElement = container1;
         div.style.width = "500px";
         let osmd: OSMD = new OSMD(div);
@@ -159,9 +160,9 @@ describe("OSMD Main Export", () => {
             },
             done
         ).catch(done);
-    });*/
+    });
 
-    /*it("test width 200", (done: MochaDone) => {
+    it("test width 200", (done: MochaDone) => {
         let div: HTMLElement = container1;
         div.style.width = "200px";
         let osmd: OSMD = new OSMD(div);
@@ -174,5 +175,5 @@ describe("OSMD Main Export", () => {
             },
             done
         ).catch(done);
-    });*/
+    });
 });

test/MusicalScore/Graphical/VexFlow/VexFlowMeasure_Test.ts

@@ -1,47 +1,53 @@
-//import {GraphicalMusicSheet} from "../../../../src/MusicalScore/Graphical/GraphicalMusicSheet";
-//import {IXmlElement} from "../../../../src/Common/FileIO/Xml";
-//import {MusicSheet} from "../../../../src/MusicalScore/MusicSheet";
-//import {MusicSheetReader} from "../../../../src/MusicalScore/ScoreIO/MusicSheetReader";
-//import {VexFlowMusicSheetCalculator} from "../../../../src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator";
-//import {TestUtils} from "../../../Util/TestUtils";
-//
-//describe("VexFlow Measure", () => {
-//
-//    //it("GraphicalMusicSheet", (done: MochaDone) => {
-//    //    let path: string = "test/data/MuzioClementi_SonatinaOpus36No1_Part1.xml";
-//    //    let score: IXmlElement = TestUtils.getScore(path);
-//    //    chai.expect(score).to.not.be.undefined;
-//    //    let calc: VexFlowMusicSheetCalculator = new VexFlowMusicSheetCalculator();
-//    //    let reader: MusicSheetReader = new MusicSheetReader();
-//    //    let sheet: MusicSheet = reader.createMusicSheet(score, path);
-//    //    let gms: GraphicalMusicSheet = new GraphicalMusicSheet(sheet, calc);
-//    //    console.log(gms);
-//    //    done();
-//    //});
-//
-//    //it("Simple Measure", (done: MochaDone) => {
-//    //    let sheet: MusicSheet = new MusicSheet();
-//    //    let measure: SourceMeasure = new SourceMeasure(1);
-//    //    sheet.addMeasure(measure);
-//    //    let calc: MusicSheetCalculator = new VexFlowMusicSheetCalculator();
-//    //    let gms: GraphicalMusicSheet = new GraphicalMusicSheet(sheet, calc);
-//    //    chai.expect(gms.MeasureList.length).to.equal(1);
-//    //    chai.expect(gms.MeasureList[0].length).to.equal(1);
-//    //    let gm: StaffMeasure = gms.MeasureList[0][0];
-//    //    console.log(gm);
-//    //    done();
-//    //});
-//
-//    //it("Empty Measure", (done: MochaDone) => {
-//    //    let sheet: MusicSheet = new MusicSheet();
-//    //    let measure: SourceMeasure = new SourceMeasure(1);
-//    //    measure.FirstInstructionsStaffEntries[0] = new SourceStaffEntry(undefined, undefined);
-//    //    sheet.addMeasure(measure);
-//    //    let calc: MusicSheetCalculator = new VexFlowMusicSheetCalculator();
-//    //    let gms: GraphicalMusicSheet = new GraphicalMusicSheet(sheet, calc);
-//    //    chai.expect(gms.MeasureList.length).to.equal(1);
-//    //    chai.expect(gms.MeasureList[0].length).to.equal(0);
-//    //    done();
-//    //});
-//
-//});
+import {GraphicalMusicSheet} from "../../../../src/MusicalScore/Graphical/GraphicalMusicSheet";
+import {IXmlElement} from "../../../../src/Common/FileIO/Xml";
+import {MusicSheet} from "../../../../src/MusicalScore/MusicSheet";
+import {MusicSheetReader} from "../../../../src/MusicalScore/ScoreIO/MusicSheetReader";
+import {VexFlowMusicSheetCalculator} from "../../../../src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator";
+import {TestUtils} from "../../../Util/TestUtils";
+import {SourceMeasure} from "../../../../src/MusicalScore/VoiceData/SourceMeasure";
+import {SourceStaffEntry} from "../../../../src/MusicalScore/VoiceData/SourceStaffEntry";
+import {StaffMeasure} from "../../../../src/MusicalScore/Graphical/StaffMeasure";
+import {MusicSheetCalculator} from "../../../../src/MusicalScore/Graphical/MusicSheetCalculator";
+
+describe("VexFlow Measure", () => {
+
+   it.skip("GraphicalMusicSheet", (done: MochaDone) => {
+      let path: string = "test/data/MuzioClementi_SonatinaOpus36No1_Part1.xml";
+      let score: Document = TestUtils.getScore(path);
+      chai.expect(score).to.not.be.undefined;
+      let partwise: Element = TestUtils.getPartWiseElement(score);
+      chai.expect(partwise).to.not.be.undefined;
+      let calc: VexFlowMusicSheetCalculator = new VexFlowMusicSheetCalculator();
+      let reader: MusicSheetReader = new MusicSheetReader();
+      let sheet: MusicSheet = reader.createMusicSheet(new IXmlElement(partwise), path);
+      let gms: GraphicalMusicSheet = new GraphicalMusicSheet(sheet, calc);
+      console.log(gms);
+      done();
+   });
+
+   it.skip("Simple Measure", (done: MochaDone) => {
+      let sheet: MusicSheet = new MusicSheet();
+      let measure: SourceMeasure = new SourceMeasure(1);
+      sheet.addMeasure(measure);
+      let calc: MusicSheetCalculator = new VexFlowMusicSheetCalculator();
+      let gms: GraphicalMusicSheet = new GraphicalMusicSheet(sheet, calc);
+      chai.expect(gms.MeasureList.length).to.equal(1);
+      chai.expect(gms.MeasureList[0].length).to.equal(1);
+      let gm: StaffMeasure = gms.MeasureList[0][0];
+      console.log(gm);
+      done();
+   });
+
+   it.skip("Empty Measure", (done: MochaDone) => {
+      let sheet: MusicSheet = new MusicSheet();
+      let measure: SourceMeasure = new SourceMeasure(1);
+      measure.FirstInstructionsStaffEntries[0] = new SourceStaffEntry(undefined, undefined);
+      sheet.addMeasure(measure);
+      let calc: MusicSheetCalculator = new VexFlowMusicSheetCalculator();
+      let gms: GraphicalMusicSheet = new GraphicalMusicSheet(sheet, calc);
+      chai.expect(gms.MeasureList.length).to.equal(1);
+      chai.expect(gms.MeasureList[0].length).to.equal(0);
+      done();
+   });
+
+});

test/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetDrawer_Test.ts

@@ -1,10 +1,12 @@
 import {VexFlowMusicSheetDrawer} from "../../../../src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetDrawer";
 import {GraphicalMusicSheet} from "../../../../src/MusicalScore/Graphical/GraphicalMusicSheet";
+import {OutlineAndFillStyleEnum} from "../../../../src/MusicalScore/Graphical/DrawingEnums";
 import {MusicSheet} from "../../../../src/MusicalScore/MusicSheet";
 import {MusicSheetReader} from "../../../../src/MusicalScore/ScoreIO/MusicSheetReader";
 import {VexFlowMusicSheetCalculator} from "../../../../src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator";
 import {TestUtils} from "../../../Util/TestUtils";
 import {IXmlElement} from "../../../../src/Common/FileIO/Xml";
+import {Fraction} from "../../../../src/Common/DataObjects/Fraction";
 
 describe("VexFlow Music Sheet Drawer", () => {
 
@@ -25,7 +27,7 @@ describe("VexFlow Music Sheet Drawer", () => {
         done();
     });
 
-    /*it("With cursor (as rectangle)", (done: MochaDone) => {
+    it.skip("With cursor (as rectangle)", (done: MochaDone) => {
         let score: Document = TestUtils.getScore("MuzioClementi_SonatinaOpus36No1_Part1");
         chai.expect(score).to.not.be.undefined;
         let partwise: Element = TestUtils.getPartWiseElement(score);
@@ -41,5 +43,5 @@ describe("VexFlow Music Sheet Drawer", () => {
         let drawer: VexFlowMusicSheetDrawer = new VexFlowMusicSheetDrawer(canvas);
         drawer.drawSheet(gms);
         done();
-    });*/
+    });
 });