Skip to content

Commit b0849c0

Browse files
PorgesPorges
committed
Test tidy
1 parent 8ab266b commit b0849c0

File tree

4 files changed

+111
-92
lines changed

4 files changed

+111
-92
lines changed

‎.vscode/settings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
"cSpell.words": [
33
"ANSEL",
44
"GEDCOM",
5+
"errful",
56
"gedcomfy",
67
"indoc",
78
"insta",
9+
"itertools",
10+
"memmap",
811
"miette",
12+
"rstest",
913
"subrecord",
1014
"thiserror"
1115
]

‎gedcomfy/tests/snapshots/tests__kdl_error@ascii_specified_malformed.ged.snap‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
source: gedcomfy/tests/tests.rs
33
description: "0 HEAD\r\n1 GEDC\r\n2 VERS 5.5.1\r\n1 CHAR ASCII\r\n0 TEXT HÖÖT\r\n0 TRLR\r\n"
44
expression: "shared::render(&err)"
5-
input_file: gedcomfy/tests/encoding_inputs/ascii_specified_malformed.ged
65
---
76
gedcomfy::error
87

@@ -35,8 +34,8 @@ gedcomfy::error
3534
│ Advice: gedcom::possible_encodings
3635
│
3736
│ ☞ the invalid data appears to be valid in other encodings:
38-
│ │ → HÖÖT (using Windows-1252)
39-
│ │ → HÖÖT (using UTF-8)
37+
│ │ → [1mHÖÖT[0m (using Windows-1252)
38+
│ │ → [1mHÖÖT[0m (using UTF-8)
4039
│ help: encoding can be chosen explicitly using the `--force-encoding`
4140
│ option
4241
│

‎gedcomfy/tests/syntax.rs‎

Lines changed: 103 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
// cSpell:ignore GEDC VERS xref
12
use gedcomfy::reader::{Reader, ReaderError, WithSourceCode};
3+
use indoc::indoc;
24
use kdl::KdlDocument;
35

46
mod shared;
@@ -15,12 +17,13 @@ fn test(input: &[u8]) -> Result<KdlDocument, String> {
1517

1618
#[test]
1719
fn basic_line() {
18-
let input: &[u8] = b"\
19-
0 HEAD\n\
20-
1 GEDC\n\
21-
2 VERS 5.5.1\n\
22-
1 CHAR ASCII\n\
23-
0 TAG value";
20+
let input: &[u8] = indoc! {b"
21+
0 HEAD
22+
1 GEDC
23+
2 VERS 5.5.1
24+
1 CHAR ASCII
25+
0 TAG value
26+
"};
2427

2528
let result = test(input).unwrap();
2629
insta::assert_snapshot!(result, @r###"
@@ -36,13 +39,14 @@ fn basic_line() {
3639

3740
#[test]
3841
fn basic_nested() {
39-
let input: &[u8] = b"\
40-
0 HEAD\n\
41-
1 GEDC\n\
42-
2 VERS 5.5.1\n\
43-
1 CHAR ASCII\n\
44-
0 _ROOT\n\
45-
1 _CHILD c";
42+
let input: &[u8] = indoc! {b"
43+
0 HEAD
44+
1 GEDC
45+
2 VERS 5.5.1
46+
1 CHAR ASCII
47+
0 _ROOT
48+
1 _CHILD c
49+
"};
4650

4751
let result = test(input).unwrap();
4852
insta::assert_snapshot!(result, @r###"
@@ -60,14 +64,15 @@ fn basic_nested() {
6064

6165
#[test]
6266
fn basic_siblings() {
63-
let input: &[u8] = b"\
64-
0 HEAD\n\
65-
1 GEDC\n\
66-
2 VERS 5.5.1\n\
67-
1 CHAR ASCII\n\
68-
0 _ROOT\n\
69-
1 _CHILD c1\n\
70-
1 _CHILD c2";
67+
let input: &[u8] = indoc! {b"
68+
0 HEAD
69+
1 GEDC
70+
2 VERS 5.5.1
71+
1 CHAR ASCII
72+
0 _ROOT
73+
1 _CHILD c1
74+
1 _CHILD c2
75+
"};
7176

7277
let result = test(input).unwrap();
7378
insta::assert_snapshot!(result, @r###"
@@ -86,14 +91,15 @@ fn basic_siblings() {
8691

8792
#[test]
8893
fn basic_nested_2() {
89-
let input: &[u8] = b"\
90-
0 HEAD\n\
91-
1 GEDC\n\
92-
2 VERS 5.5.1\n\
93-
1 CHAR ASCII\n\
94-
0 _ROOT\n\
95-
1 _CHILD\n\
96-
2 _GRANDCHILD gc";
94+
let input: &[u8] = indoc! {b"
95+
0 HEAD
96+
1 GEDC
97+
2 VERS 5.5.1
98+
1 CHAR ASCII
99+
0 _ROOT
100+
1 _CHILD
101+
2 _GRANDCHILD gc
102+
"};
97103

98104
let result = test(input).unwrap();
99105
insta::assert_snapshot!(result, @r###"
@@ -113,15 +119,16 @@ fn basic_nested_2() {
113119

114120
#[test]
115121
fn basic_nested_2_siblings() {
116-
let input: &[u8] = b"\
117-
0 HEAD\n\
118-
1 GEDC\n\
119-
2 VERS 5.5.1\n\
120-
1 CHAR ASCII\n\
121-
0 _ROOT\n\
122-
1 _CHILD c1\n\
123-
2 _GRANDCHILD gc1\n\
124-
1 _CHILD c2";
122+
let input: &[u8] = indoc! {b"
123+
0 HEAD
124+
1 GEDC
125+
2 VERS 5.5.1
126+
1 CHAR ASCII
127+
0 _ROOT
128+
1 _CHILD c1
129+
2 _GRANDCHILD gc1
130+
1 _CHILD c2
131+
"};
125132

126133
let result = test(input).unwrap();
127134
insta::assert_snapshot!(result, @r###"
@@ -142,15 +149,16 @@ fn basic_nested_2_siblings() {
142149

143150
#[test]
144151
fn basic_grandparent() {
145-
let input: &[u8] = b"\
146-
0 HEAD\n\
147-
1 GEDC\n\
148-
2 VERS 5.5.1\n\
149-
1 CHAR ASCII\n\
150-
0 _ROOT1\n\
151-
1 _CHILD\n\
152-
2 _GRANDCHILD gc\n\
153-
0 _ROOT2 r";
152+
let input: &[u8] = indoc! {b"
153+
0 HEAD
154+
1 GEDC
155+
2 VERS 5.5.1
156+
1 CHAR ASCII
157+
0 _ROOT1
158+
1 _CHILD
159+
2 _GRANDCHILD gc
160+
0 _ROOT2 r
161+
"};
154162

155163
let result = test(input).unwrap();
156164
insta::assert_snapshot!(result, @r###"
@@ -171,12 +179,13 @@ fn basic_grandparent() {
171179

172180
#[test]
173181
fn bad_xref_no_tag() {
174-
let input: &[u8] = b"\
175-
0 HEAD\n\
176-
1 GEDC\n\
177-
2 VERS 5.5.1\n\
178-
1 CHAR ASCII\n\
179-
0 @x@\n";
182+
let input: &[u8] = indoc! {b"
183+
0 HEAD
184+
1 GEDC
185+
2 VERS 5.5.1
186+
1 CHAR ASCII
187+
0 @x@
188+
"};
180189

181190
let err = test(input).unwrap_err();
182191
insta::assert_snapshot!(err, @r"
@@ -197,13 +206,14 @@ fn bad_xref_no_tag() {
197206

198207
#[test]
199208
fn bad_void_xref() {
200-
let input: &[u8] = b"\
201-
0 HEAD\n\
202-
1 GEDC\n\
203-
2 VERS 5.5.1\n\
204-
1 CHAR ASCII\n\
205-
0 OK\n\
206-
1 @VOID@ BAD\n";
209+
let input: &[u8] = indoc! {b"
210+
0 HEAD
211+
1 GEDC
212+
2 VERS 5.5.1
213+
1 CHAR ASCII
214+
0 OK
215+
1 @VOID@ BAD
216+
"};
207217

208218
let err = test(input).unwrap_err();
209219
insta::assert_snapshot!(err, @r"
@@ -224,13 +234,14 @@ fn bad_void_xref() {
224234

225235
#[test]
226236
fn bad_skipped_level() {
227-
let input: &[u8] = b"\
228-
0 HEAD\n\
229-
1 GEDC\n\
230-
2 VERS 5.5.1\n\
231-
1 CHAR ASCII\n\
232-
0 TAG\n\
233-
2 TAG";
237+
let input: &[u8] = indoc! {b"
238+
0 HEAD
239+
1 GEDC
240+
2 VERS 5.5.1
241+
1 CHAR ASCII
242+
0 TAG
243+
2 TAG
244+
"};
234245

235246
let err = test(input).unwrap_err();
236247
insta::assert_snapshot!(err, @r"
@@ -251,12 +262,13 @@ fn bad_skipped_level() {
251262

252263
#[test]
253264
fn bad_no_tag() {
254-
let input: &[u8] = b"\
255-
0 HEAD\n\
256-
1 GEDC\n\
257-
2 VERS 5.5.1\n\
258-
1 CHAR ASCII\n\
259-
0";
265+
let input: &[u8] = indoc! {b"
266+
0 HEAD
267+
1 GEDC
268+
2 VERS 5.5.1
269+
1 CHAR ASCII
270+
0
271+
"};
260272

261273
let err = test(input).unwrap_err();
262274
insta::assert_snapshot!(err, @r"
@@ -277,9 +289,10 @@ fn bad_no_tag() {
277289

278290
#[test]
279291
fn bad_incorrect_level() {
280-
let input: &[u8] = b"\
281-
1 HEAD\n\
282-
1 TAG";
292+
let input: &[u8] = indoc! {b"
293+
1 HEAD
294+
1 TAG
295+
"};
283296

284297
let err = test(input).unwrap_err();
285298
insta::assert_snapshot!(err, @r"
@@ -304,12 +317,13 @@ fn bad_incorrect_level() {
304317

305318
#[test]
306319
fn bad_invalid_level() {
307-
let input: &[u8] = b"\
308-
0 HEAD\n\
309-
1 GEDC\n\
310-
2 VERS 5.5.1\n\
311-
1 CHAR ASCII\n\
312-
x y z";
320+
let input: &[u8] = indoc! {b"
321+
0 HEAD
322+
1 GEDC
323+
2 VERS 5.5.1
324+
1 CHAR ASCII
325+
x y z
326+
"};
313327

314328
let err = test(input).unwrap_err();
315329
insta::assert_snapshot!(err, @r"
@@ -332,12 +346,13 @@ fn bad_invalid_level() {
332346

333347
#[test]
334348
fn warn_no_children_or_value() {
335-
let input: &[u8] = b"\
336-
0 HEAD\n\
337-
1 GEDC\n\
338-
2 VERS 5.5.1\n\
339-
1 CHAR ASCII\n\
340-
0 TAG";
349+
let input: &[u8] = indoc! {b"
350+
0 HEAD
351+
1 GEDC
352+
2 VERS 5.5.1
353+
1 CHAR ASCII
354+
0 TAG
355+
"};
341356

342357
// TODO[warn]: warning check
343358
let err = test(input).unwrap();

‎gedcomfy/tests/tests.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use std::path::{self, Path, PathBuf};
1+
// cSpell:ignore allged
2+
use std::path::PathBuf;
23

34
use gedcomfy::reader::{Reader, decoding::detect_external_encoding, input::File};
45
use rstest::*;

0 commit comments

Comments
 (0)