Update adjacent enum non-roundtrip tests to match serde-rs/serde#2505

juntyr · Aug 6, 2023 · 1d4067c · 1d4067c
1 parent f692c63
commit 1d4067c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/tests/123_enum_representation.rs b/tests/123_enum_representation.rs
@@ -108,14 +108,14 @@ fn test_adjacently_a_ser() {
         bar: 2,
         different: Inner::Foo,
     };
-    let e = "(type:\"VariantA\",content:(foo:1,bar:2,different:Foo))";
+    let e = "(type:VariantA,content:(foo:1,bar:2,different:Foo))";
     test_ser(&v, e);
 }
 
 #[test]
 fn test_adjacently_b_ser() {
     let v = EnumStructAdjacently::VariantB { foo: 1, bar: 2 };
-    let e = "(type:\"VariantB\",content:(foo:1,bar:2))";
+    let e = "(type:VariantB,content:(foo:1,bar:2))";
     test_ser(&v, e);
 }
 
@@ -175,7 +175,7 @@ fn test_internally_b_de() {
 
 #[test]
 fn test_adjacently_a_de() {
-    let s = "(type:\"VariantA\",content:(foo:1,bar:2,different:Foo))";
+    let s = "(type:VariantA,content:(foo:1,bar:2,different:Foo))";
     let e = EnumStructAdjacently::VariantA {
         foo: 1,
         bar: 2,
@@ -186,7 +186,7 @@ fn test_adjacently_a_de() {
 
 #[test]
 fn test_adjacently_b_de() {
-    let s = "(type:\"VariantB\",content:(foo:1,bar:2))";
+    let s = "(type:VariantB,content:(foo:1,bar:2))";
     let e = EnumStructAdjacently::VariantB { foo: 1, bar: 2 };
     test_de(s, e);
 }

diff --git a/tests/207_adjacently_tagged_enum.rs b/tests/207_adjacently_tagged_enum.rs
@@ -14,7 +14,7 @@ fn test_adjacently_tagged() {
 
     let ron_string = to_string(&source).unwrap();
 
-    assert_eq!(ron_string, "(type:\"Index\",data:1)");
+    assert_eq!(ron_string, "(type:Index,data:1)");
 
     let deserialized = from_str::<TestEnum>(&ron_string).unwrap();
 

diff --git a/tests/393_serde_errors.rs b/tests/393_serde_errors.rs
@@ -188,13 +188,13 @@ fn test_adjacently_tagged_enum() {
     //        the enum as a struct
 
     assert_eq!(
-        ron::from_str::<TestEnumAdjacent>("(type: \"StructVariant\", content: (d: 4))"),
+        ron::from_str::<TestEnumAdjacent>("(type: StructVariant, content: (d: 4))"),
         Err(SpannedError {
             code: Error::MissingStructField {
                 field: "a",
                 outer: Some(String::from("TestEnumAdjacent")),
             },
-            position: Position { line: 1, col: 39 },
+            position: Position { line: 1, col: 37 },
         })
     );
 }

diff --git a/tests/449_tagged_enum.rs b/tests/449_tagged_enum.rs
@@ -165,7 +165,7 @@ fn test_enum_in_adjacently_tagged_roundtrip() {
 
     let ron = ron::to_string(&outer).unwrap();
 
-    assert_eq!(ron, "(tag:\"Variant\",c:(field:Unit))");
+    assert_eq!(ron, "(tag:Variant,c:(field:Unit))");
 
     let de = ron::from_str::<OuterEnumAdjacent>(&ron);
 
@@ -178,7 +178,7 @@ fn test_enum_in_adjacently_tagged_roundtrip() {
 
     let ron = ron::to_string(&outer).unwrap();
 
-    assert_eq!(ron, "(tag:\"Sum\",c:(field:Newtype(true),value:42))");
+    assert_eq!(ron, "(tag:Sum,c:(field:Newtype(true),value:42))");
 
     let de = ron::from_str::<OuterEnumAdjacent>(&ron);
 
@@ -191,7 +191,7 @@ fn test_enum_in_adjacently_tagged_roundtrip() {
 
     let ron = ron::to_string(&outer).unwrap();
 
-    assert_eq!(ron, "(tag:\"Sum\",c:(field:Tuple(true,24),value:42))");
+    assert_eq!(ron, "(tag:Sum,c:(field:Tuple(true,24),value:42))");
 
     let de = ron::from_str::<OuterEnumAdjacent>(&ron);
 
@@ -204,7 +204,7 @@ fn test_enum_in_adjacently_tagged_roundtrip() {
 
     let ron = ron::to_string(&outer).unwrap();
 
-    assert_eq!(ron, "(tag:\"Sum\",c:(field:Struct(field:'🦀'),value:42))");
+    assert_eq!(ron, "(tag:Sum,c:(field:Struct(field:'🦀'),value:42))");
 
     let de = ron::from_str::<OuterEnumAdjacent>(&ron);