Skip to content

Commit

Permalink
Merge pull request #3900 from handrok/fix-unit-tests
Browse files Browse the repository at this point in the history 
Fix unit tests after changing scores format in master
  • Loading branch information
@anatoly-os
anatoly-os committed Aug 24, 2018
2 parents 40dc553 + f00c084 commit e5d59a7
Show file tree
Hide file tree
Showing 4 changed files with 392 additions and 308 deletions.
163 changes: 94 additions & 69 deletions mtest/libmscore/compat114/ottava-ref.mscx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.00">
<museScore version="3.01">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down Expand Up @@ -88,81 +88,106 @@
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Ottava id="2">
<subtype>8va</subtype>
<beginText>&lt;font size=&quot;12&quot;/&gt;&lt;font face=&quot;Times New Roman&quot;/&gt;&lt;i&gt;8va&lt;/i&gt;</beginText>
<continueText>&lt;font size=&quot;12&quot;/&gt;&lt;font face=&quot;Times New Roman&quot;/&gt;&lt;i&gt;(8va)&lt;/i&gt;</continueText>
<endHookHeight>1.5</endHookHeight>
<lineWidth>0.15</lineWidth>
<lineStyle>1</lineStyle>
</Ottava>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
<Measure>
<voice>
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Spanner type="Ottava">
<Ottava>
<subtype>8va</subtype>
<beginText>&lt;font size=&quot;12&quot;/&gt;&lt;font face=&quot;Times New Roman&quot;/&gt;&lt;i&gt;8va&lt;/i&gt;</beginText>
<continueText>&lt;font size=&quot;12&quot;/&gt;&lt;font face=&quot;Times New Roman&quot;/&gt;&lt;i&gt;(8va)&lt;/i&gt;</continueText>
<endHookHeight>1.5</endHookHeight>
<lineWidth>0.15</lineWidth>
<lineStyle>1</lineStyle>
</Ottava>
<next>
<location>
<measures>1</measures>
</location>
</next>
</Spanner>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
</voice>
</Measure>
<Measure number="2">
<endSpanner id="2"/>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Spanner type="Ottava">
<prev>
<location>
<measures>-1</measures>
</location>
</prev>
</Spanner>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure number="3">
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</voice>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>F</concertClefType>
<transposingClefType>F</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Clef>
<concertClefType>F</concertClefType>
<transposingClefType>F</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure number="2">
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure number="3">
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
</Staff>
</Score>
Expand Down
157 changes: 91 additions & 66 deletions mtest/libmscore/compat114/pedal-ref.mscx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.00">
<museScore version="3.01">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down Expand Up @@ -88,78 +88,103 @@
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Pedal id="2">
<beginText>&lt;sym&gt;keyboardPedalPed&lt;/sym&gt;</beginText>
<lineWidth>0.006</lineWidth>
<endHookHeight>-1.5</endHookHeight>
</Pedal>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
<Measure>
<voice>
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Spanner type="Pedal">
<Pedal>
<beginText>&lt;sym&gt;keyboardPedalPed&lt;/sym&gt;</beginText>
<lineWidth>0.006</lineWidth>
<endHookHeight>-1.5</endHookHeight>
</Pedal>
<next>
<location>
<measures>1</measures>
</location>
</next>
</Spanner>
<Chord>
<durationType>quarter</durationType>
<Note>
<pitch>65</pitch>
<tpc>13</tpc>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
</voice>
</Measure>
<Measure number="2">
<endSpanner id="2"/>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Spanner type="Pedal">
<prev>
<location>
<measures>-1</measures>
</location>
</prev>
</Spanner>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure number="3">
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</voice>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<Clef>
<concertClefType>F</concertClefType>
<transposingClefType>F</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Clef>
<concertClefType>F</concertClefType>
<transposingClefType>F</transposingClefType>
</Clef>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure number="2">
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure number="3">
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
</Staff>
</Score>
Expand Down
Loading

0 comments on commit e5d59a7

Please sign in to comment.