pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-07-18 16:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete excessive tests of adjacently tagged non-string keys

Browse Source
This commit is contained in:
David Tolnay
2023-07-08 18:17:41 -07:00
parent 7aa0453c3b
commit e4a4389177
1 changed files with 6 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_suite/tests/test_macros.rs
+6 -508
View File
@@ -1086,34 +1086,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// unit with no content (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Unit"),
Token::StructEnd,
],
);
// unit with no content (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::StructEnd,
],
);
// unit with tag first // unit with tag first
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>, &AdjacentlyTagged::Unit::<u8>,
@@ -1130,38 +1102,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// unit with tag first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Unit"),
Token::U64(1), // content field
Token::Unit,
Token::StructEnd,
],
);
// unit with tag first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::Bytes(b"c"),
Token::Unit,
Token::StructEnd,
],
);
// unit with content first // unit with content first
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>, &AdjacentlyTagged::Unit::<u8>,
@@ -1178,38 +1118,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// unit with content first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(1), // content field
Token::Unit,
Token::U64(0), // tag field
Token::Str("Unit"),
Token::StructEnd,
],
);
// unit with content first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"c"),
Token::Unit,
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::StructEnd,
],
);
// unit with excess content (f, g, h) // unit with excess content (f, g, h)
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>, &AdjacentlyTagged::Unit::<u8>,
@@ -1232,50 +1140,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// unit with excess content (f, g, 3) (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Str("f"),
Token::Unit,
Token::U64(0), // tag field
Token::Str("Unit"),
Token::Str("g"),
Token::Unit,
Token::U64(1), // content field
Token::Unit,
Token::U64(3), // unknown field
Token::Unit,
Token::StructEnd,
],
);
// unit with excess content (f, b"g", 3) (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Unit::<u8>,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Str("f"),
Token::Unit,
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::Bytes(b"g"),
Token::Unit,
Token::Str("c"),
Token::Unit,
Token::U64(3),
Token::Unit,
Token::StructEnd,
],
);
// newtype with tag first // newtype with tag first
assert_tokens( assert_tokens(
&AdjacentlyTagged::Newtype::<u8>(1), &AdjacentlyTagged::Newtype::<u8>(1),
@@ -1292,38 +1156,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// newtype with tag first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Newtype::<u8>(1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Newtype"),
Token::U64(1), // content field
Token::U8(1),
Token::StructEnd,
],
);
// newtype with tag first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Newtype::<u8>(1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Newtype"),
Token::Bytes(b"c"),
Token::U8(1),
Token::StructEnd,
],
);
// newtype with content first // newtype with content first
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Newtype::<u8>(1), &AdjacentlyTagged::Newtype::<u8>(1),
@@ -1340,38 +1172,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// newtype with content first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Newtype::<u8>(1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(1), // content field
Token::U8(1),
Token::U64(0), // tag field
Token::Str("Newtype"),
Token::StructEnd,
],
);
// newtype with content first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Newtype::<u8>(1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"c"),
Token::U8(1),
Token::Bytes(b"t"),
Token::Str("Newtype"),
Token::StructEnd,
],
);
// optional newtype with no content field // optional newtype with no content field
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Newtype::<Option<u8>>(None), &AdjacentlyTagged::Newtype::<Option<u8>>(None),
@@ -1386,34 +1186,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// optional newtype with no content field (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Newtype::<Option<u8>>(None),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 1,
},
Token::U64(0), // tag field
Token::Str("Newtype"),
Token::StructEnd,
],
);
// optional newtype with no content field (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Newtype::<Option<u8>>(None),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 1,
},
Token::Bytes(b"t"),
Token::Str("Newtype"),
Token::StructEnd,
],
);
// tuple with tag first // tuple with tag first
assert_tokens( assert_tokens(
&AdjacentlyTagged::Tuple::<u8>(1, 1), &AdjacentlyTagged::Tuple::<u8>(1, 1),
@@ -1433,44 +1205,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// tuple with tag first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Tuple::<u8>(1, 1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Tuple"),
Token::U64(1), // content field
Token::Tuple { len: 2 },
Token::U8(1),
Token::U8(1),
Token::TupleEnd,
Token::StructEnd,
],
);
// tuple with tag first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Tuple::<u8>(1, 1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Tuple"),
Token::Bytes(b"c"),
Token::Tuple { len: 2 },
Token::U8(1),
Token::U8(1),
Token::TupleEnd,
Token::StructEnd,
],
);
// tuple with content first // tuple with content first
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Tuple::<u8>(1, 1), &AdjacentlyTagged::Tuple::<u8>(1, 1),
@@ -1490,44 +1224,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// tuple with content first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Tuple::<u8>(1, 1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(1), // content field
Token::Tuple { len: 2 },
Token::U8(1),
Token::U8(1),
Token::TupleEnd,
Token::U64(0), // tag field
Token::Str("Tuple"),
Token::StructEnd,
],
);
// tuple with content first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Tuple::<u8>(1, 1),
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"c"),
Token::Tuple { len: 2 },
Token::U8(1),
Token::U8(1),
Token::TupleEnd,
Token::Bytes(b"t"),
Token::Str("Tuple"),
Token::StructEnd,
],
);
// struct with tag first // struct with tag first
assert_tokens( assert_tokens(
&AdjacentlyTagged::Struct::<u8> { f: 1 }, &AdjacentlyTagged::Struct::<u8> { f: 1 },
@@ -1550,50 +1246,6 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// struct with tag first (integer tag)
assert_de_tokens(
&AdjacentlyTagged::Struct::<u8> { f: 1 },
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Struct"),
Token::U64(1), // content field
Token::Struct {
name: "Struct",
len: 1,
},
Token::Str("f"),
Token::U8(1),
Token::StructEnd,
Token::StructEnd,
],
);
// struct with tag first (bytes tag)
assert_de_tokens(
&AdjacentlyTagged::Struct::<u8> { f: 1 },
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Struct"),
Token::Bytes(b"c"),
Token::Struct {
name: "Struct",
len: 1,
},
Token::Str("f"),
Token::U8(1),
Token::StructEnd,
Token::StructEnd,
],
);
// struct with content first // struct with content first
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Struct::<u8> { f: 1 }, &AdjacentlyTagged::Struct::<u8> { f: 1 },
@@ -1616,46 +1268,34 @@ fn test_adjacently_tagged_enum() {
], ],
); );
// struct with content first (integer tag) // integer field keys
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Struct::<u8> { f: 1 }, &AdjacentlyTagged::Newtype::<u8>(1),
&[ &[
Token::Struct { Token::Struct {
name: "AdjacentlyTagged", name: "AdjacentlyTagged",
len: 2, len: 2,
}, },
Token::U64(1), // content field Token::U64(1), // content field
Token::Struct {
name: "Struct",
len: 1,
},
Token::Str("f"),
Token::U8(1), Token::U8(1),
Token::StructEnd,
Token::U64(0), // tag field Token::U64(0), // tag field
Token::Str("Struct"), Token::Str("Newtype"),
Token::StructEnd, Token::StructEnd,
], ],
); );
// struct with content first (bytes tag) // byte-array field keys
assert_de_tokens( assert_de_tokens(
&AdjacentlyTagged::Struct::<u8> { f: 1 }, &AdjacentlyTagged::Newtype::<u8>(1),
&[ &[
Token::Struct { Token::Struct {
name: "AdjacentlyTagged", name: "AdjacentlyTagged",
len: 2, len: 2,
}, },
Token::Bytes(b"c"), Token::Bytes(b"c"),
Token::Struct {
name: "Struct",
len: 1,
},
Token::Str("f"),
Token::U8(1), Token::U8(1),
Token::StructEnd,
Token::Bytes(b"t"), Token::Bytes(b"t"),
Token::Str("Struct"), Token::Str("Newtype"),
Token::StructEnd, Token::StructEnd,
], ],
); );
@@ -1684,126 +1324,6 @@ fn test_adjacently_tagged_enum_deny_unknown_fields() {
], ],
); );
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Unit"),
Token::U64(1), // content field
Token::Unit,
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::Bytes(b"c"),
Token::Unit,
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Str("t"),
Token::Str("Unit"),
Token::U64(1), // content field
Token::Unit,
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(0), // tag field
Token::Str("Unit"),
Token::Str("c"),
Token::Unit,
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::U64(1), // content field
Token::Unit,
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::Str("c"),
Token::Unit,
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Str("c"),
Token::Unit,
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::StructEnd,
],
);
assert_de_tokens(
&AdjacentlyTagged::Unit,
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Str("c"),
Token::Unit,
Token::Bytes(b"t"),
Token::Str("Unit"),
Token::StructEnd,
],
);
assert_de_tokens_error::<AdjacentlyTagged>( assert_de_tokens_error::<AdjacentlyTagged>(
&[ &[
Token::Struct { Token::Struct {
@@ -1843,17 +1363,6 @@ fn test_adjacently_tagged_enum_deny_unknown_fields() {
r#"invalid value: string "h", expected "t" or "c""#, r#"invalid value: string "h", expected "t" or "c""#,
); );
assert_de_tokens_error::<AdjacentlyTagged>(
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::U64(2),
],
r#"invalid value: integer `2`, expected "t" or "c""#,
);
assert_de_tokens_error::<AdjacentlyTagged>( assert_de_tokens_error::<AdjacentlyTagged>(
&[ &[
Token::Struct { Token::Struct {
@@ -1867,17 +1376,6 @@ fn test_adjacently_tagged_enum_deny_unknown_fields() {
r#"invalid value: integer `3`, expected "t" or "c""#, r#"invalid value: integer `3`, expected "t" or "c""#,
); );
assert_de_tokens_error::<AdjacentlyTagged>(
&[
Token::Struct {
name: "AdjacentlyTagged",
len: 2,
},
Token::Bytes(b"h"),
],
r#"invalid value: byte array, expected "t" or "c""#,
);
assert_de_tokens_error::<AdjacentlyTagged>( assert_de_tokens_error::<AdjacentlyTagged>(
&[ &[
Token::Struct { Token::Struct {