Skip to content

Commit 35c8fdd

Browse files
mike-spamike-spa
committed
Added unit tests for new Expression items
1 parent 022acf9 commit 35c8fdd

File tree

6 files changed

+739
-0
lines changed

6 files changed

+739
-0
lines changed

‎src/engraving/tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ set(MODULE_TEST_SRC
4747
${CMAKE_CURRENT_LIST_DIR}/earlymusic_tests.cpp
4848
${CMAKE_CURRENT_LIST_DIR}/element_tests.cpp
4949
${CMAKE_CURRENT_LIST_DIR}/exchangevoices_tests.cpp
50+
${CMAKE_CURRENT_LIST_DIR}/expression_tests.cpp
5051
${CMAKE_CURRENT_LIST_DIR}/hairpin_tests.cpp
5152
${CMAKE_CURRENT_LIST_DIR}/implodeexplode_tests.cpp
5253
${CMAKE_CURRENT_LIST_DIR}/instrumentchange_tests.cpp

‎src/engraving/tests/expression_data/expression-1-ref.mscx

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<museScore version="4.00">
3+
<Score>
4+
<LayerTag id="0" tag="default"></LayerTag>
5+
<currentLayer>0</currentLayer>
6+
<Division>480</Division>
7+
<Style>
8+
<Spatium>1.74978</Spatium>
9+
</Style>
10+
<showInvisible>1</showInvisible>
11+
<showUnprintable>1</showUnprintable>
12+
<showFrames>1</showFrames>
13+
<showMargins>0</showMargins>
14+
<metaTag name="arranger"></metaTag>
15+
<metaTag name="composer">Composer / arranger</metaTag>
16+
<metaTag name="copyright"></metaTag>
17+
<metaTag name="lyricist"></metaTag>
18+
<metaTag name="movementNumber"></metaTag>
19+
<metaTag name="movementTitle"></metaTag>
20+
<metaTag name="poet"></metaTag>
21+
<metaTag name="source"></metaTag>
22+
<metaTag name="subtitle">Subtitle</metaTag>
23+
<metaTag name="translator"></metaTag>
24+
<metaTag name="workNumber"></metaTag>
25+
<metaTag name="workTitle">Untitled score</metaTag>
26+
<Order id="orchestral">
27+
<name>Orchestral</name>
28+
<instrument id="flute">
29+
<family id="flutes">Flutes</family>
30+
</instrument>
31+
<section id="woodwind" brackets="true" barLineSpan="true" thinBrackets="true">
32+
<family>flutes</family>
33+
<family>oboes</family>
34+
<family>clarinets</family>
35+
<family>saxophones</family>
36+
<family>bassoons</family>
37+
<unsorted group="woodwinds"/>
38+
</section>
39+
<section id="brass" brackets="true" barLineSpan="true" thinBrackets="true">
40+
<family>horns</family>
41+
<family>trumpets</family>
42+
<family>cornets</family>
43+
<family>flugelhorns</family>
44+
<family>trombones</family>
45+
<family>tubas</family>
46+
</section>
47+
<section id="timpani" brackets="true" barLineSpan="true" thinBrackets="true">
48+
<family>timpani</family>
49+
</section>
50+
<section id="percussion" brackets="true" barLineSpan="true" thinBrackets="true">
51+
<family>keyboard-percussion</family>
52+
<family>drums</family>
53+
<family>unpitched-metal-percussion</family>
54+
<family>unpitched-wooden-percussion</family>
55+
<family>other-percussion</family>
56+
</section>
57+
<family>keyboards</family>
58+
<family>harps</family>
59+
<family>organs</family>
60+
<family>synths</family>
61+
<soloists/>
62+
<section id="voices" brackets="true" barLineSpan="false" thinBrackets="true">
63+
<family>voices</family>
64+
<family>voice-groups</family>
65+
</section>
66+
<section id="strings" brackets="true" barLineSpan="true" thinBrackets="true">
67+
<family>orchestral-strings</family>
68+
</section>
69+
<unsorted/>
70+
</Order>
71+
<Part id="1">
72+
<Staff id="1">
73+
<StaffType group="pitched">
74+
<name>stdNormal</name>
75+
</StaffType>
76+
</Staff>
77+
<trackName>Flute</trackName>
78+
<Instrument id="flute">
79+
<longName>Flute</longName>
80+
<shortName>Fl.</shortName>
81+
<trackName>Flute</trackName>
82+
<minPitchP>59</minPitchP>
83+
<maxPitchP>98</maxPitchP>
84+
<minPitchA>60</minPitchA>
85+
<maxPitchA>93</maxPitchA>
86+
<instrumentId>wind.flutes.flute</instrumentId>
87+
<Channel>
88+
<program value="73"/>
89+
</Channel>
90+
</Instrument>
91+
</Part>
92+
<Staff id="1">
93+
<Measure>
94+
<voice>
95+
<KeySig>
96+
<accidental>0</accidental>
97+
</KeySig>
98+
<TimeSig>
99+
<sigN>4</sigN>
100+
<sigD>4</sigD>
101+
</TimeSig>
102+
<Expression>
103+
<text>expr text</text>
104+
</Expression>
105+
<Chord>
106+
<durationType>whole</durationType>
107+
<Note>
108+
<pitch>72</pitch>
109+
<tpc>14</tpc>
110+
</Note>
111+
</Chord>
112+
</voice>
113+
</Measure>
114+
<Measure>
115+
<voice>
116+
<Expression>
117+
<placement>above</placement>
118+
<text>expr text</text>
119+
</Expression>
120+
<Chord>
121+
<durationType>whole</durationType>
122+
<Note>
123+
<pitch>72</pitch>
124+
<tpc>14</tpc>
125+
</Note>
126+
</Chord>
127+
</voice>
128+
</Measure>
129+
<Measure>
130+
<voice>
131+
<Expression>
132+
<snapToDynamics>0</snapToDynamics>
133+
<offset x="0" y="5.11718"/>
134+
<text>expr <b>text</b></text>
135+
</Expression>
136+
<Chord>
137+
<durationType>whole</durationType>
138+
<Note>
139+
<pitch>72</pitch>
140+
<tpc>14</tpc>
141+
</Note>
142+
</Chord>
143+
</voice>
144+
</Measure>
145+
<Measure>
146+
<voice>
147+
<Expression>
148+
<placement>above</placement>
149+
<snapToDynamics>0</snapToDynamics>
150+
<offset x="0" y="-4.72943"/>
151+
<text><i>expr </i><u>text</u></text>
152+
</Expression>
153+
<Chord>
154+
<durationType>whole</durationType>
155+
<Note>
156+
<pitch>72</pitch>
157+
<tpc>14</tpc>
158+
</Note>
159+
</Chord>
160+
</voice>
161+
</Measure>
162+
</Staff>
163+
</Score>
164+
</museScore>

‎src/engraving/tests/expression_data/expression-1.mscx

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<museScore version="4.00">
3+
<programVersion>4.1.0</programVersion>
4+
<programRevision></programRevision>
5+
<Score>
6+
<LayerTag id="0" tag="default"></LayerTag>
7+
<currentLayer>0</currentLayer>
8+
<Division>480</Division>
9+
<showInvisible>1</showInvisible>
10+
<showUnprintable>1</showUnprintable>
11+
<showFrames>1</showFrames>
12+
<showMargins>0</showMargins>
13+
<open>1</open>
14+
<metaTag name="arranger"></metaTag>
15+
<metaTag name="composer">Composer / arranger</metaTag>
16+
<metaTag name="copyright"></metaTag>
17+
<metaTag name="creationDate">2023-04-07</metaTag>
18+
<metaTag name="lyricist"></metaTag>
19+
<metaTag name="movementNumber"></metaTag>
20+
<metaTag name="movementTitle"></metaTag>
21+
<metaTag name="platform">Linux</metaTag>
22+
<metaTag name="poet"></metaTag>
23+
<metaTag name="source"></metaTag>
24+
<metaTag name="subtitle">Subtitle</metaTag>
25+
<metaTag name="translator"></metaTag>
26+
<metaTag name="workNumber"></metaTag>
27+
<metaTag name="workTitle">Untitled score</metaTag>
28+
<Order id="orchestral">
29+
<name>Orchestral</name>
30+
<instrument id="flute">
31+
<family id="flutes">Flutes</family>
32+
</instrument>
33+
<section id="woodwind" brackets="true" barLineSpan="true" thinBrackets="true">
34+
<family>flutes</family>
35+
<family>oboes</family>
36+
<family>clarinets</family>
37+
<family>saxophones</family>
38+
<family>bassoons</family>
39+
<unsorted group="woodwinds"/>
40+
</section>
41+
<section id="brass" brackets="true" barLineSpan="true" thinBrackets="true">
42+
<family>horns</family>
43+
<family>trumpets</family>
44+
<family>cornets</family>
45+
<family>flugelhorns</family>
46+
<family>trombones</family>
47+
<family>tubas</family>
48+
</section>
49+
<section id="timpani" brackets="true" barLineSpan="true" thinBrackets="true">
50+
<family>timpani</family>
51+
</section>
52+
<section id="percussion" brackets="true" barLineSpan="true" thinBrackets="true">
53+
<family>keyboard-percussion</family>
54+
<family>drums</family>
55+
<family>unpitched-metal-percussion</family>
56+
<family>unpitched-wooden-percussion</family>
57+
<family>other-percussion</family>
58+
</section>
59+
<family>keyboards</family>
60+
<family>harps</family>
61+
<family>organs</family>
62+
<family>synths</family>
63+
<soloists/>
64+
<section id="voices" brackets="true" barLineSpan="false" thinBrackets="true">
65+
<family>voices</family>
66+
<family>voice-groups</family>
67+
</section>
68+
<section id="strings" brackets="true" barLineSpan="true" thinBrackets="true">
69+
<family>orchestral-strings</family>
70+
</section>
71+
<unsorted/>
72+
</Order>
73+
<Part id="1">
74+
<Staff id="1">
75+
<StaffType group="pitched">
76+
<name>stdNormal</name>
77+
</StaffType>
78+
</Staff>
79+
<trackName>Flute</trackName>
80+
<Instrument id="flute">
81+
<longName>Flute</longName>
82+
<shortName>Fl.</shortName>
83+
<trackName>Flute</trackName>
84+
<minPitchP>59</minPitchP>
85+
<maxPitchP>98</maxPitchP>
86+
<minPitchA>60</minPitchA>
87+
<maxPitchA>93</maxPitchA>
88+
<instrumentId>wind.flutes.flute</instrumentId>
89+
<Channel>
90+
<program value="73"/>
91+
<synti>Fluid</synti>
92+
</Channel>
93+
</Instrument>
94+
</Part>
95+
<Staff id="1">
96+
<Measure>
97+
<voice>
98+
<KeySig>
99+
<accidental>0</accidental>
100+
</KeySig>
101+
<TimeSig>
102+
<sigN>4</sigN>
103+
<sigD>4</sigD>
104+
</TimeSig>
105+
<StaffText>
106+
<style>expression</style>
107+
<placement>below</placement>
108+
<text>expr text</text>
109+
</StaffText>
110+
<Chord>
111+
<durationType>whole</durationType>
112+
<Note>
113+
<pitch>72</pitch>
114+
<tpc>14</tpc>
115+
</Note>
116+
</Chord>
117+
</voice>
118+
</Measure>
119+
<Measure>
120+
<voice>
121+
<StaffText>
122+
<style>expression</style>
123+
<text>expr text</text>
124+
</StaffText>
125+
<Chord>
126+
<durationType>whole</durationType>
127+
<Note>
128+
<pitch>72</pitch>
129+
<tpc>14</tpc>
130+
</Note>
131+
</Chord>
132+
</voice>
133+
</Measure>
134+
<Measure>
135+
<voice>
136+
<StaffText>
137+
<style>expression</style>
138+
<placement>below</placement>
139+
<offset x="0" y="5.11718"/>
140+
<text>expr <b>text</b></text>
141+
</StaffText>
142+
<Chord>
143+
<durationType>whole</durationType>
144+
<Note>
145+
<pitch>72</pitch>
146+
<tpc>14</tpc>
147+
</Note>
148+
</Chord>
149+
</voice>
150+
</Measure>
151+
<Measure>
152+
<voice>
153+
<StaffText>
154+
<style>expression</style>
155+
<italic>0</italic>
156+
<offset x="0" y="-4.72943"/>
157+
<text><i>expr </i><u>text</u></text>
158+
</StaffText>
159+
<Chord>
160+
<durationType>whole</durationType>
161+
<Note>
162+
<pitch>72</pitch>
163+
<tpc>14</tpc>
164+
</Note>
165+
</Chord>
166+
</voice>
167+
</Measure>
168+
</Staff>
169+
</Score>
170+
</museScore>

0 commit comments

Comments
 (0)