Skip to content

Commit f6877a4

Browse files
committed
formats_err: update broken tests to use the new enums syntax
See kaitai-io/kaitai_struct#1288 This commit fixes only the tests that were broken compared to the `master` branch when running `sbt test` in a compiler that requires the new syntax for enum definitions: kaitai-io/kaitai_struct_compiler#335
1 parent b88e1f5 commit f6877a4

8 files changed

Lines changed: 37 additions & 21 deletions
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# enum_member_name_bad.ksy: /enums/animal/101:
1+
# enum_member_name_bad.ksy: /enums/animal/values/101:
22
# error: invalid enum member ID: '101dogs', expected /^[a-z][a-z0-9_]*$/
33
#
44
meta:
55
id: enum_member_name_bad
66
enums:
77
animal:
8-
1: cat
9-
2: dog
10-
101: 101dogs
8+
type: u1
9+
values:
10+
1: cat
11+
2: dog
12+
101: 101dogs
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# enum_member_name_dup.ksy: /enums/animal/101:
2-
# error: duplicate enum member ID: 'cat', previously defined at /enums/animal/1
1+
# enum_member_name_dup.ksy: /enums/animal/values/101:
2+
# error: duplicate enum member ID: 'cat', previously defined at /enums/animal/values/1
33
#
44
meta:
55
id: enum_member_name_dup
66
enums:
77
animal:
8-
1: cat
9-
2: dog
10-
101: cat
8+
type: u1
9+
values:
10+
1: cat
11+
2: dog
12+
101: cat

formats_err/enum_unquoted_null.ksy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
# enum_unquoted_null.ksy: /enums/foo/0:
1+
# enum_unquoted_null.ksy: /enums/foo/values/0:
22
# error: expected string or map, got null
33
#
44
meta:
55
id: enum_unquoted_null
66
enums:
77
foo:
8-
0: null
8+
type: u1
9+
values:
10+
0: null

formats_err/expr_compare_enum.ksy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ seq:
1212
if: 'foo > animal::cat'
1313
enums:
1414
animal:
15-
1: cat
16-
2: dog
15+
type: u1
16+
values:
17+
1: cat
18+
2: dog

formats_err/expr_compare_enum2.ksy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ seq:
1212
if: foo == 2
1313
enums:
1414
animal:
15-
1: cat
16-
2: dog
15+
type: u1
16+
values:
17+
1: cat
18+
2: dog

formats_err/expr_enum_member_unknown.ksy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ instances:
88
value: animal::hat
99
enums:
1010
animal:
11-
1: cat
12-
2: dog
11+
type: u1
12+
values:
13+
1: cat
14+
2: dog

formats_err/expr_enum_unknown.ksy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ seq:
1212
if: 'foo == unknown_enum::cat'
1313
enums:
1414
animal:
15-
1: cat
16-
2: dog
15+
type: u1
16+
values:
17+
1: cat
18+
2: dog

formats_err/many_type_validator.ksy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ seq:
1818
if: 'foo_enum > animal::cat'
1919
enums:
2020
animal:
21-
1: cat
22-
2: dog
21+
type: u1
22+
values:
23+
1: cat
24+
2: dog

0 commit comments

Comments
 (0)