fix tests

Author: mscuthbert

src/timesignature.ts

@@ -60,6 +60,7 @@ export class TimeSignature extends StaveModifier {
   bottomLine: number;
   topLine: number;
 
+  protected timeSpec: string = '4/4';
   protected line: number = 0;
   protected glyph: Glyph;
   protected is_numeric: boolean = true;
@@ -68,21 +69,25 @@ export class TimeSignature extends StaveModifier {
   constructor(timeSpec: string = '4/4', customPadding = 15, validate_args = true) {
     super();
     this.validate_args = validate_args;
-
-    // violates DRY w/ setTimeSig(timeSpec) but needed to convince TypeScript that all is well.
-    const info = this.parseTimeSpec(timeSpec);
-    this.glyph = info.glyph;
-    this.is_numeric = info.num;
-    this.line = info.line;
+    this.timeSpec = timeSpec;
 
     const padding = customPadding;
 
+    // point must be defined before parsing spec.
     const musicFont = Tables.currentMusicFont();
     this.point = musicFont.lookupMetric('digits.point');
+
     const fontLineShift = musicFont.lookupMetric('digits.shiftLine', 0);
     this.topLine = 2 + fontLineShift;
     this.bottomLine = 4 + fontLineShift;
     this.setPosition(StaveModifierPosition.BEGIN);
+
+    // violates DRY w/ setTimeSig(timeSpec) but needed to convince TypeScript that all is well.
+    const info = this.parseTimeSpec(timeSpec);
+    this.glyph = info.glyph;
+    this.is_numeric = info.num;
+    this.line = info.line;
+
     this.setWidth(defined(this.glyph.getMetrics().width));
     this.setPadding(padding);
   }
@@ -124,15 +129,22 @@ export class TimeSignature extends StaveModifier {
 
   /**
    * Set a new time signature specification without changing customPadding, etc.
+   *
+   * The getter for this is `getTimeSpec` not `getTimeSig`.
    */
   setTimeSig(timeSpec: string): this {
+    this.timeSpec = timeSpec;
     const info = this.parseTimeSpec(timeSpec);
     this.glyph = info.glyph;
     this.is_numeric = info.num;
     this.line = info.line;
     return this;
   }
 
+  getTimeSpec(): string {
+    return this.timeSpec;
+  }
+
   getLine(): number {
     return this.line;
   }

tests/timesignature_tests.ts

@@ -29,6 +29,7 @@ const TimeSignatureTests = {
 
 function parser(): void {
   const timeSig = new TimeSignature();
+  equal(timeSig.getTimeSpec(), '4/4', 'default time signature is 4/4');
 
   const mustFail = ['asdf', '123/', '/10', '/', '4567', 'C+', '1+', '+1', '(3+', '+3)', '()', '(+)'];
   mustFail.forEach((invalidString) => {
@@ -38,10 +39,11 @@ function parser(): void {
   const mustPass = ['4/4', '10/12', '1/8', '1234567890/1234567890', 'C', 'C|', '+'];
   mustPass.forEach((validString) => timeSig.parseTimeSpec(validString));
 
-  timeSig.parseTimeSpec('4/4');
+  timeSig.setTimeSig('4/4');
   equal(timeSig.getIsNumeric(), true, '4/4 is numeric');
   equal(timeSig.getLine(), 0, 'digits are on line 0');
-  timeSig.parseTimeSpec('C|');
+  timeSig.setTimeSig('C|');
+  equal(timeSig.getTimeSpec(), 'C|', 'timeSpec changed to C|');
   equal(timeSig.getIsNumeric(), false, 'cut time is not numeric');
   equal(timeSig.getLine(), 2, 'cut/common are on line 2');