Skip to content

Commit 98fb7d9

Browse files
committed
Move all untagged enum tests (except flatten) into a dedicated module
Moved and renamed: From test_annotations - test_expecting_message_untagged_tagged_enum => expecting_message - flatten::enum_::untagged::straitforward => contains_flatten From test_macros - test_untagged_newtype_struct => newtype_struct - test_untagged_enum => complex - test_untagged_enum_with_flattened_integer_key => contains_flatten_with_integer_key - test_enum_in_untagged_enum => newtype_enum - test_untagged_bytes => string_and_bytes - test_untagged_newtype_variant_containing_unit_struct_not_map => newtype_unit_and_empty_map
1 parent 31ca16d commit 98fb7d9

File tree

3 files changed

+410
-399
lines changed

3 files changed

+410
-399
lines changed

test_suite/tests/test_annotations.rs

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,18 +1895,6 @@ fn test_expecting_message_externally_tagged_enum() {
18951895
);
18961896
}
18971897

1898-
#[test]
1899-
fn test_expecting_message_untagged_tagged_enum() {
1900-
#[derive(Deserialize)]
1901-
#[serde(untagged)]
1902-
#[serde(expecting = "something strange...")]
1903-
enum Enum {
1904-
Untagged,
1905-
}
1906-
1907-
assert_de_tokens_error::<Enum>(&[Token::Str("Untagged")], "something strange...");
1908-
}
1909-
19101898
#[test]
19111899
fn test_expecting_message_identifier_enum() {
19121900
#[derive(Deserialize)]
@@ -2958,41 +2946,6 @@ mod flatten {
29582946
mod untagged {
29592947
use super::*;
29602948

2961-
#[test]
2962-
fn straightforward() {
2963-
#[derive(Serialize, Deserialize, PartialEq, Debug)]
2964-
#[serde(untagged)]
2965-
enum Data {
2966-
A {
2967-
a: i32,
2968-
#[serde(flatten)]
2969-
flat: Flat,
2970-
},
2971-
}
2972-
2973-
#[derive(Serialize, Deserialize, PartialEq, Debug)]
2974-
struct Flat {
2975-
b: i32,
2976-
}
2977-
2978-
let data = Data::A {
2979-
a: 0,
2980-
flat: Flat { b: 0 },
2981-
};
2982-
2983-
assert_tokens(
2984-
&data,
2985-
&[
2986-
Token::Map { len: None },
2987-
Token::Str("a"),
2988-
Token::I32(0),
2989-
Token::Str("b"),
2990-
Token::I32(0),
2991-
Token::MapEnd,
2992-
],
2993-
);
2994-
}
2995-
29962949
#[derive(Debug, PartialEq, Serialize, Deserialize)]
29972950
struct Flatten {
29982951
#[serde(flatten)]

0 commit comments

Comments
 (0)