Skip to content

Commit 79bf60b

Browse files
Update test ClearSpeak
Update test files for ClearSpeak to be similar to nb See commit 5e9de57 in MathCAT repo
1 parent e889a91 commit 79bf60b

7 files changed

Lines changed: 643 additions & 357 deletions

File tree

Lines changed: 69 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use crate::common::*;
2+
use anyhow::Result;
23

34
#[test]
4-
fn sum_both() {
5+
fn sum_both() -> Result<()> {
56
let expr = "<math>
67
<munderover>
78
<mo>∑</mo>
@@ -10,22 +11,26 @@ fn sum_both() {
1011
</munderover>
1112
<mi>n</mi>
1213
</math>";
13-
test("nb", "ClearSpeak", expr, "sum fra n er lik 1, til 10, av n");
14+
test("nb", "ClearSpeak", expr, "sum fra n er lik 1, til 10, av n")?;
15+
return Ok(());
16+
1417
}
1518

1619
#[test]
17-
fn sum_under() {
20+
fn sum_under() -> Result<()> {
1821
let expr = "<math>
1922
<munder>
2023
<mo>∑</mo>
2124
<mi>S</mi>
2225
</munder>
2326
<mi>i</mi>
2427
</math>";
25-
test("nb", "ClearSpeak", expr, "sum over stor s, av i");
28+
test("nb", "ClearSpeak", expr, "sum over stor s, av i")?;
29+
return Ok(());
30+
2631
}
2732
#[test]
28-
fn sum_both_msubsup() {
33+
fn sum_both_msubsup() -> Result<()> {
2934
let expr = "<math>
3035
<msubsup>
3136
<mo>∑</mo>
@@ -34,32 +39,38 @@ fn sum_both_msubsup() {
3439
</msubsup>
3540
<mi>n</mi>
3641
</math>";
37-
test("nb", "ClearSpeak", expr, "sum fra n er lik 1, til 10, av n");
42+
test("nb", "ClearSpeak", expr, "sum fra n er lik 1, til 10, av n")?;
43+
return Ok(());
44+
3845
}
3946

4047
#[test]
41-
fn sum_sub() {
48+
fn sum_sub() -> Result<()> {
4249
let expr = "<math>
4350
<msub>
4451
<mo>∑</mo>
4552
<mi>S</mi>
4653
</msub>
4754
<mi>i</mi>
4855
</math>";
49-
test("nb", "ClearSpeak", expr, "sum over stor s, av i");
56+
test("nb", "ClearSpeak", expr, "sum over stor s, av i")?;
57+
return Ok(());
58+
5059
}
5160

5261
#[test]
53-
fn sum() {
62+
fn sum() -> Result<()> {
5463
let expr = "<math>
5564
<mo>∑</mo>
5665
<msub><mi>a</mi><mi>i</mi></msub>
5766
</math>";
58-
test("nb", "ClearSpeak", expr, "sum av, a, senket i");
67+
test("nb", "ClearSpeak", expr, "sum av, a, senket i")?;
68+
return Ok(());
69+
5970
}
6071

6172
#[test]
62-
fn product_both() {
73+
fn product_both() -> Result<()> {
6374
let expr = "<math>
6475
<munderover>
6576
<mo>∏</mo>
@@ -68,32 +79,38 @@ fn product_both() {
6879
</munderover>
6980
<mi>n</mi>
7081
</math>";
71-
test("nb", "ClearSpeak", expr, "produktet fra n er lik 1, til 10, av n");
82+
test("nb", "ClearSpeak", expr, "produktet fra n er lik 1, til 10, av n")?;
83+
return Ok(());
84+
7285
}
7386

7487
#[test]
75-
fn product_under() {
88+
fn product_under() -> Result<()> {
7689
let expr = "<math>
7790
<munder>
7891
<mo>∏</mo>
7992
<mi>S</mi>
8093
</munder>
8194
<mi>i</mi>
8295
</math>";
83-
test("nb", "ClearSpeak", expr, "produktet over stor s, av i");
96+
test("nb", "ClearSpeak", expr, "produktet over stor s, av i")?;
97+
return Ok(());
98+
8499
}
85100

86101
#[test]
87-
fn product() {
102+
fn product() -> Result<()> {
88103
let expr = "<math>
89104
<mo>∏</mo>
90105
<msub><mi>a</mi><mi>i</mi></msub>
91106
</math>";
92-
test("nb", "ClearSpeak", expr, "produktet av, a, senket i");
107+
test("nb", "ClearSpeak", expr, "produktet av, a, senket i")?;
108+
return Ok(());
109+
93110
}
94111

95112
#[test]
96-
fn intersection_both() {
113+
fn intersection_both() -> Result<()> {
97114
let expr = "<math>
98115
<munderover>
99116
<mo>⋂</mo>
@@ -102,32 +119,38 @@ fn intersection_both() {
102119
</munderover>
103120
<msub><mi>S</mi><mi>i</mi></msub>
104121
</math>";
105-
test("nb", "ClearSpeak", expr, "snitt fra i er lik 1, til 10, av; stor s, senket i");
122+
test("nb", "ClearSpeak", expr, "snitt fra i er lik 1, til 10, av; stor s, senket i")?;
123+
return Ok(());
124+
106125
}
107126

108127
#[test]
109-
fn intersection_under() {
128+
fn intersection_under() -> Result<()> {
110129
let expr = "<math>
111130
<munder>
112131
<mo>⋂</mo>
113132
<mi>C</mi>
114133
</munder>
115134
<msub><mi>S</mi><mi>i</mi></msub>
116135
</math>";
117-
test("nb", "ClearSpeak", expr, "snitt over stor c, av, stor s, senket i");
136+
test("nb", "ClearSpeak", expr, "snitt over stor c, av, stor s, senket i")?;
137+
return Ok(());
138+
118139
}
119140

120141
#[test]
121-
fn intersection() {
142+
fn intersection() -> Result<()> {
122143
let expr = "<math>
123144
<mo>⋂</mo>
124145
<msub><mi>S</mi><mi>i</mi></msub>
125146
</math>";
126-
test("nb", "ClearSpeak", expr, "snitt av, stor s, senket i");
147+
test("nb", "ClearSpeak", expr, "snitt av, stor s, senket i")?;
148+
return Ok(());
149+
127150
}
128151

129152
#[test]
130-
fn union_both() {
153+
fn union_both() -> Result<()> {
131154
let expr = "<math>
132155
<munderover>
133156
<mo>⋃</mo>
@@ -136,32 +159,38 @@ fn union_both() {
136159
</munderover>
137160
<msub><mi>S</mi><mi>i</mi></msub>
138161
</math>";
139-
test("nb", "ClearSpeak", expr, "union fra i er lik 1, til 10, av; stor s, senket i");
162+
test("nb", "ClearSpeak", expr, "union fra i er lik 1, til 10, av; stor s, senket i")?;
163+
return Ok(());
164+
140165
}
141166

142167
#[test]
143-
fn union_under() {
168+
fn union_under() -> Result<()> {
144169
let expr = "<math>
145170
<munder>
146171
<mo>⋃</mo>
147172
<mi>C</mi>
148173
</munder>
149174
<msub><mi>S</mi><mi>i</mi></msub>
150175
</math>";
151-
test("nb", "ClearSpeak", expr, "union over stor c, av, stor s, senket i");
176+
test("nb", "ClearSpeak", expr, "union over stor c, av, stor s, senket i")?;
177+
return Ok(());
178+
152179
}
153180

154181
#[test]
155-
fn union() {
182+
fn union() -> Result<()> {
156183
let expr = "<math>
157184
<mo>⋃</mo>
158185
<msub><mi>S</mi><mi>i</mi></msub>
159186
</math>";
160-
test("nb", "ClearSpeak", expr, "union av, stor s, senket i");
187+
test("nb", "ClearSpeak", expr, "union av, stor s, senket i")?;
188+
return Ok(());
189+
161190
}
162191

163192
#[test]
164-
fn integral_both() {
193+
fn integral_both() -> Result<()> {
165194
let expr = "<math>
166195
<mrow>
167196
<msubsup>
@@ -173,11 +202,13 @@ fn integral_both() {
173202
</mrow>
174203
<mtext>&#x2009;</mtext><mi>d</mi><mi>x</mi>
175204
</math>";
176-
test("nb", "ClearSpeak", expr, "integralet fra 0, til 1, av, f av x; d x");
205+
test("nb", "ClearSpeak", expr, "integralet fra 0, til 1, av, f av x; d x")?;
206+
return Ok(());
207+
177208
}
178209

179210
#[test]
180-
fn integral_under() {
211+
fn integral_under() -> Result<()> {
181212
let expr = "<math>
182213
<munder>
183214
<mo>∫</mo>
@@ -186,15 +217,19 @@ fn integral_under() {
186217
<mrow><mi>f</mi><mrow><mo>(</mo><mi>x</mi> <mo>)</mo></mrow></mrow>
187218
<mi>d</mi><mi>x</mi>
188219
</math>";
189-
test("nb", "ClearSpeak", expr, "integralet over de reelle tallene, av; f av x d x");
220+
test("nb", "ClearSpeak", expr, "integralet over de reelle tallene, av; f av x d x")?;
221+
return Ok(());
222+
190223
}
191224

192225
#[test]
193-
fn integral() {
226+
fn integral() -> Result<()> {
194227
let expr = "<math>
195228
<mo>∫</mo>
196229
<mrow><mi>f</mi><mrow><mo>(</mo><mi>x</mi> <mo>)</mo></mrow></mrow>
197230
<mi>d</mi><mi>x</mi>
198231
</math>";
199-
test("nb", "ClearSpeak", expr, "integralet av, f av x d x");
232+
test("nb", "ClearSpeak", expr, "integralet av, f av x d x")?;
233+
return Ok(());
234+
200235
}

0 commit comments

Comments
 (0)