From 9cbdf5e5eb6706601de10db7e4951080e496473c Mon Sep 17 00:00:00 2001
From: Steve Molloy <smolloy@microsoft.com>
Date: Tue, 23 Sep 2025 14:43:08 -0700
Subject: [PATCH] Re-add tests that were mysteriously removed when copilot
 created import/export tests.

---
 .../XmlSerializerTests.RuntimeOnly.cs         | 72 ++++++++++++++++++-
 .../tests/XmlSerializer/XmlSerializerTests.cs |  2 +-
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs
index 25d42cde5895ef..3c04059c5e4249 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs
@@ -43,9 +43,31 @@ public static void Xml_ByteArrayAsRoot()
         Assert.Equal(x, y);
     }
 
+    [Fact]
+    public static void Xml_ByteArrayNull()
+    {
+        Assert.Null(SerializeAndDeserialize<byte[]>(null,
+@"<?xml version=""1.0""?>
+<base64Binary d1p1:nil=""true"" xmlns:d1p1=""http://www.w3.org/2001/XMLSchema-instance"" />"));
+        byte[] x = new byte[] { 1, 2 };
+        byte[] y = SerializeAndDeserialize<byte[]>(x,
+@"<?xml version=""1.0""?>
+<base64Binary>AQI=</base64Binary>");
+        Assert.Equal(x, y);
+    }
+
     [Fact]
     public static void Xml_CharAsRoot()
     {
+        Assert.StrictEqual(char.MinValue, SerializeAndDeserialize<char>(char.MinValue,
+@"<?xml version=""1.0""?>
+<char>0</char>"));
+        Assert.StrictEqual(char.MaxValue, SerializeAndDeserialize<char>(char.MaxValue,
+@"<?xml version=""1.0""?>
+<char>65535</char>"));
+        Assert.StrictEqual('a', SerializeAndDeserialize<char>('a',
+@"<?xml version=""1.0""?>
+<char>97</char>"));
         Assert.StrictEqual('\u00F1', SerializeAndDeserialize<char>('\u00F1',
 @"<?xml version=""1.0""?>
 <char>241</char>"));
@@ -2313,14 +2335,32 @@ public static void Xml_Soap_ObjectAsRoot()
                 "<?xml version=\"1.0\"?>\r\n<anyType d1p1:type=\"boolean\" xmlns:d1p1=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://www.w3.org/2001/XMLSchema\">true</anyType>",
                 () => ser));
 
+        Assert.Equal(
+            "abc",
+            SerializeAndDeserialize<object>(
+                "abc",
+                "<?xml version=\"1.0\"?>\r\n<anyType d1p1:type=\"string\" xmlns:d1p1=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://www.w3.org/2001/XMLSchema\">abc</anyType>",
+                () => ser));
+
+        var nullDeserialized = SerializeAndDeserialize<object>(
+                null,
+                "<?xml version=\"1.0\"?>\r\n<xsd:anyType xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" />",
+                () => ser);
+        Assert.NotNull(nullDeserialized);
+        Assert.True(typeof(object) == nullDeserialized.GetType());
+    }
+
+    [Fact]
+    public static void Xml_Soap_ObjectAsRoot_Nullable()
+    {
         XmlTypeMapping nullableTypeMapping = new SoapReflectionImporter().ImportTypeMapping(typeof(TypeWithNullableObject));
-        var nullableSer = new XmlSerializer(nullableTypeMapping);
+        var ser = new XmlSerializer(nullableTypeMapping);
 
         var value = new TypeWithNullableObject { MyObject = null };
         TypeWithNullableObject actual = SerializeAndDeserialize(
                 value,
                 "<?xml version=\"1.0\"?>\r\n<TypeWithNullableObject xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" id=\"id1\">\r\n  <MyObject xsi:nil=\"true\" />\r\n</TypeWithNullableObject>",
-                () => nullableSer);
+                () => ser);
         Assert.NotNull(actual);
         Assert.Null(actual.MyObject);
     }
@@ -2449,6 +2489,34 @@ public static void XmlSerializationGeneratedCodeTest()
         Assert.NotNull(cg);
     }
     
+    [Fact]
+    // XmlTypeMapping is not included in System.Xml.XmlSerializer 4.0.0.0 facade in GAC
+    public static void Xml_FromMappings()
+    {
+        var types = new[] { typeof(Guid), typeof(List<string>) };
+        XmlReflectionImporter importer = new XmlReflectionImporter();
+        XmlTypeMapping[] mappings = new XmlTypeMapping[types.Length];
+        for (int i = 0; i < types.Length; i++)
+        {
+            mappings[i] = importer.ImportTypeMapping(types[i]);
+        }
+        var serializers = XmlSerializer.FromMappings(mappings, typeof(object));
+        Xml_GuidAsRoot_Helper(serializers[0]);
+        Xml_ListGenericRoot_Helper(serializers[1]);
+    }
+
+    [Fact]
+    // XmlTypeMapping is not included in System.Xml.XmlSerializer 4.0.0.0 facade in GAC
+    public static void Xml_ConstructorWithTypeMapping()
+    {
+        XmlTypeMapping mapping = null;
+        XmlSerializer serializer = null;
+        Assert.Throws<ArgumentNullException>(() => { new XmlSerializer(mapping); });
+
+        mapping = new XmlReflectionImporter(null, null).ImportTypeMapping(typeof(List<string>));
+        serializer = new XmlSerializer(mapping);
+        Xml_ListGenericRoot_Helper(serializer);
+    }
 
     [Fact]
     public static void XmlMembersMapping_PrimitiveValue()
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs
index c09c96481865b9..0f9d8decddd1d2 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs
@@ -2984,4 +2984,4 @@ private static string GuessCachedName(string name)
         }
         throw new ArgumentException($"Cannot guess cached field name from switch name '{name}'");
     }
-}
\ No newline at end of file
+}