Skip to content

Commit e5d59a7

Browse files
anatoly-osanatoly-os
authored
Merge pull request #3900 from handrok/fix-unit-tests
Fix unit tests after changing scores format in master
2 parents 40dc553 + f00c084 commit e5d59a7

File tree

4 files changed

+392
-308
lines changed

4 files changed

+392
-308
lines changed

‎mtest/libmscore/compat114/ottava-ref.mscx

Lines changed: 94 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.00">
2+
<museScore version="3.01">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>
@@ -88,81 +88,106 @@
8888
</Instrument>
8989
</Part>
9090
<Staff id="1">
91-
<Measure number="1">
92-
<Clef>
93-
<concertClefType>G</concertClefType>
94-
<transposingClefType>G</transposingClefType>
95-
</Clef>
96-
<TimeSig>
97-
<sigN>4</sigN>
98-
<sigD>4</sigD>
99-
</TimeSig>
100-
<Ottava id="2">
101-
<subtype>8va</subtype>
102-
<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>
103-
<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>
104-
<endHookHeight>1.5</endHookHeight>
105-
<lineWidth>0.15</lineWidth>
106-
<lineStyle>1</lineStyle>
107-
</Ottava>
108-
<Chord>
109-
<durationType>quarter</durationType>
110-
<Note>
111-
<pitch>65</pitch>
112-
<tpc>13</tpc>
113-
</Note>
114-
</Chord>
115-
<Rest>
116-
<durationType>quarter</durationType>
117-
</Rest>
118-
<Rest>
119-
<durationType>half</durationType>
120-
</Rest>
91+
<Measure>
92+
<voice>
93+
<Clef>
94+
<concertClefType>G</concertClefType>
95+
<transposingClefType>G</transposingClefType>
96+
</Clef>
97+
<TimeSig>
98+
<sigN>4</sigN>
99+
<sigD>4</sigD>
100+
</TimeSig>
101+
<Spanner type="Ottava">
102+
<Ottava>
103+
<subtype>8va</subtype>
104+
<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>
105+
<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>
106+
<endHookHeight>1.5</endHookHeight>
107+
<lineWidth>0.15</lineWidth>
108+
<lineStyle>1</lineStyle>
109+
</Ottava>
110+
<next>
111+
<location>
112+
<measures>1</measures>
113+
</location>
114+
</next>
115+
</Spanner>
116+
<Chord>
117+
<durationType>quarter</durationType>
118+
<Note>
119+
<pitch>65</pitch>
120+
<tpc>13</tpc>
121+
</Note>
122+
</Chord>
123+
<Rest>
124+
<durationType>quarter</durationType>
125+
</Rest>
126+
<Rest>
127+
<durationType>half</durationType>
128+
</Rest>
129+
</voice>
121130
</Measure>
122-
<Measure number="2">
123-
<endSpanner id="2"/>
124-
<Rest>
125-
<durationType>measure</durationType>
126-
<duration>4/4</duration>
127-
</Rest>
131+
<Measure>
132+
<voice>
133+
<Spanner type="Ottava">
134+
<prev>
135+
<location>
136+
<measures>-1</measures>
137+
</location>
138+
</prev>
139+
</Spanner>
140+
<Rest>
141+
<durationType>measure</durationType>
142+
<duration>4/4</duration>
143+
</Rest>
144+
</voice>
128145
</Measure>
129-
<Measure number="3">
130-
<Rest>
131-
<durationType>measure</durationType>
132-
<duration>4/4</duration>
133-
</Rest>
134-
<BarLine>
135-
<subtype>end</subtype>
136-
<span>1</span>
137-
</BarLine>
146+
<Measure>
147+
<voice>
148+
<Rest>
149+
<durationType>measure</durationType>
150+
<duration>4/4</duration>
151+
</Rest>
152+
<BarLine>
153+
<subtype>end</subtype>
154+
<span>1</span>
155+
</BarLine>
156+
</voice>
138157
</Measure>
139158
</Staff>
140159
<Staff id="2">
141-
<Measure number="1">
142-
<Clef>
143-
<concertClefType>F</concertClefType>
144-
<transposingClefType>F</transposingClefType>
145-
</Clef>
146-
<TimeSig>
147-
<sigN>4</sigN>
148-
<sigD>4</sigD>
149-
</TimeSig>
150-
<Rest>
151-
<durationType>measure</durationType>
152-
<duration>4/4</duration>
153-
</Rest>
160+
<Measure>
161+
<voice>
162+
<Clef>
163+
<concertClefType>F</concertClefType>
164+
<transposingClefType>F</transposingClefType>
165+
</Clef>
166+
<TimeSig>
167+
<sigN>4</sigN>
168+
<sigD>4</sigD>
169+
</TimeSig>
170+
<Rest>
171+
<durationType>measure</durationType>
172+
<duration>4/4</duration>
173+
</Rest>
174+
</voice>
154175
</Measure>
155-
<Measure number="2">
156-
<Rest>
157-
<durationType>measure</durationType>
158-
<duration>4/4</duration>
159-
</Rest>
176+
<Measure>
177+
<voice>
178+
<Rest>
179+
<durationType>measure</durationType>
180+
<duration>4/4</duration>
181+
</Rest>
182+
</voice>
160183
</Measure>
161-
<Measure number="3">
162-
<Rest>
163-
<durationType>measure</durationType>
164-
<duration>4/4</duration>
165-
</Rest>
184+
<Measure>
185+
<voice>
186+
<Rest>
187+
<durationType>measure</durationType>
188+
<duration>4/4</duration>
189+
</Rest>
190+
</voice>
166191
</Measure>
167192
</Staff>
168193
</Score>

‎mtest/libmscore/compat114/pedal-ref.mscx

Lines changed: 91 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.00">
2+
<museScore version="3.01">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>
@@ -88,78 +88,103 @@
8888
</Instrument>
8989
</Part>
9090
<Staff id="1">
91-
<Measure number="1">
92-
<Clef>
93-
<concertClefType>G</concertClefType>
94-
<transposingClefType>G</transposingClefType>
95-
</Clef>
96-
<TimeSig>
97-
<sigN>4</sigN>
98-
<sigD>4</sigD>
99-
</TimeSig>
100-
<Pedal id="2">
101-
<beginText>&lt;sym&gt;keyboardPedalPed&lt;/sym&gt;</beginText>
102-
<lineWidth>0.006</lineWidth>
103-
<endHookHeight>-1.5</endHookHeight>
104-
</Pedal>
105-
<Chord>
106-
<durationType>quarter</durationType>
107-
<Note>
108-
<pitch>65</pitch>
109-
<tpc>13</tpc>
110-
</Note>
111-
</Chord>
112-
<Rest>
113-
<durationType>quarter</durationType>
114-
</Rest>
115-
<Rest>
116-
<durationType>half</durationType>
117-
</Rest>
91+
<Measure>
92+
<voice>
93+
<Clef>
94+
<concertClefType>G</concertClefType>
95+
<transposingClefType>G</transposingClefType>
96+
</Clef>
97+
<TimeSig>
98+
<sigN>4</sigN>
99+
<sigD>4</sigD>
100+
</TimeSig>
101+
<Spanner type="Pedal">
102+
<Pedal>
103+
<beginText>&lt;sym&gt;keyboardPedalPed&lt;/sym&gt;</beginText>
104+
<lineWidth>0.006</lineWidth>
105+
<endHookHeight>-1.5</endHookHeight>
106+
</Pedal>
107+
<next>
108+
<location>
109+
<measures>1</measures>
110+
</location>
111+
</next>
112+
</Spanner>
113+
<Chord>
114+
<durationType>quarter</durationType>
115+
<Note>
116+
<pitch>65</pitch>
117+
<tpc>13</tpc>
118+
</Note>
119+
</Chord>
120+
<Rest>
121+
<durationType>quarter</durationType>
122+
</Rest>
123+
<Rest>
124+
<durationType>half</durationType>
125+
</Rest>
126+
</voice>
118127
</Measure>
119-
<Measure number="2">
120-
<endSpanner id="2"/>
121-
<Rest>
122-
<durationType>measure</durationType>
123-
<duration>4/4</duration>
124-
</Rest>
128+
<Measure>
129+
<voice>
130+
<Spanner type="Pedal">
131+
<prev>
132+
<location>
133+
<measures>-1</measures>
134+
</location>
135+
</prev>
136+
</Spanner>
137+
<Rest>
138+
<durationType>measure</durationType>
139+
<duration>4/4</duration>
140+
</Rest>
141+
</voice>
125142
</Measure>
126-
<Measure number="3">
127-
<Rest>
128-
<durationType>measure</durationType>
129-
<duration>4/4</duration>
130-
</Rest>
131-
<BarLine>
132-
<subtype>end</subtype>
133-
<span>1</span>
134-
</BarLine>
143+
<Measure>
144+
<voice>
145+
<Rest>
146+
<durationType>measure</durationType>
147+
<duration>4/4</duration>
148+
</Rest>
149+
<BarLine>
150+
<subtype>end</subtype>
151+
<span>1</span>
152+
</BarLine>
153+
</voice>
135154
</Measure>
136155
</Staff>
137156
<Staff id="2">
138-
<Measure number="1">
139-
<Clef>
140-
<concertClefType>F</concertClefType>
141-
<transposingClefType>F</transposingClefType>
142-
</Clef>
143-
<TimeSig>
144-
<sigN>4</sigN>
145-
<sigD>4</sigD>
146-
</TimeSig>
147-
<Rest>
148-
<durationType>measure</durationType>
149-
<duration>4/4</duration>
150-
</Rest>
157+
<Measure>
158+
<voice>
159+
<Clef>
160+
<concertClefType>F</concertClefType>
161+
<transposingClefType>F</transposingClefType>
162+
</Clef>
163+
<TimeSig>
164+
<sigN>4</sigN>
165+
<sigD>4</sigD>
166+
</TimeSig>
167+
<Rest>
168+
<durationType>measure</durationType>
169+
<duration>4/4</duration>
170+
</Rest>
171+
</voice>
151172
</Measure>
152-
<Measure number="2">
153-
<Rest>
154-
<durationType>measure</durationType>
155-
<duration>4/4</duration>
156-
</Rest>
173+
<Measure>
174+
<voice>
175+
<Rest>
176+
<durationType>measure</durationType>
177+
<duration>4/4</duration>
178+
</Rest>
179+
</voice>
157180
</Measure>
158-
<Measure number="3">
159-
<Rest>
160-
<durationType>measure</durationType>
161-
<duration>4/4</duration>
162-
</Rest>
181+
<Measure>
182+
<voice>
183+
<Rest>
184+
<durationType>measure</durationType>
185+
<duration>4/4</duration>
186+
</Rest>
187+
</voice>
163188
</Measure>
164189
</Staff>
165190
</Score>

0 commit comments

Comments
 (0)