Make those tests look good on net_4_5.

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs
index f3e89003b3ba19c1a82a7d3c051456d0172a771f..35f5c7347ba8247e1e25dcc899d4debd6811ebef 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs
@@ -709,6 +709,12 @@ namespace MonoTests.System.Xaml
                [Test]
                public void OnSetValueAndHandledFalse () // part of bug #3003
                {
+#if NET_4_5
+                       string ver = "net_4_5";
+#else
+                       string ver = "net_4_0";
+#endif
+
                        /*
                        var obj = new TestClass3 ();
                        obj.Nested = new TestClass3 ();
@@ -717,7 +723,7 @@ namespace MonoTests.System.Xaml
                        XamlServices.Transform (new XamlObjectReader (obj), xxw);
                        Console.Error.WriteLine (sw);
                        */
-                       var xml = "<TestClass3 xmlns='clr-namespace:MonoTests.System.Xaml;assembly=System.Xaml_test_net_4_0' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'><TestClass3.Nested><TestClass3 Nested='{x:Null}' /></TestClass3.Nested></TestClass3>";
+                       var xml = "<TestClass3 xmlns='clr-namespace:MonoTests.System.Xaml;assembly=System.Xaml_test_net_4_0' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'><TestClass3.Nested><TestClass3 Nested='{x:Null}' /></TestClass3.Nested></TestClass3>".Replace ("net_4_0", ver);
                        var settings = new XamlObjectWriterSettings ();
                        bool invoked = false;
                        settings.XamlSetValueHandler = (sender, e) => {
@@ -832,7 +838,13 @@ namespace MonoTests.System.Xaml
 
                XamlReader GetReader (string filename)
                {
-                       return new XamlXmlReader (XmlReader.Create (Path.Combine ("Test/XmlFiles", filename), new XmlReaderSettings () { CloseInput =true }));
+#if NET_4_5
+                       string ver = "net_4_5";
+#else
+                       string ver = "net_4_0";
+#endif
+                       string xml = File.ReadAllText (Path.Combine ("Test/XmlFiles", filename)).Replace ("net_4_0", ver);
+                       return new XamlXmlReader (XmlReader.Create (new StringReader (xml)));
                }
 
                [Test]

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
index e27e2a77d8e150f4f1a77918980ce2d818291ab3..b8dd211e648598d080ae7eea686705894f2ff507 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
@@ -45,7 +45,13 @@ namespace MonoTests.System.Xaml
 
                XamlReader GetReader (string filename)
                {
-                       return new XamlXmlReader (XmlReader.Create (Path.Combine ("Test/XmlFiles", filename), new XmlReaderSettings () { CloseInput =true }));
+#if NET_4_5
+                       string ver = "net_4_5";
+#else
+                       string ver = "net_4_0";
+#endif
+                       string xml = File.ReadAllText (Path.Combine ("Test/XmlFiles", filename)).Replace ("net_4_0", ver);
+                       return new XamlXmlReader (XmlReader.Create (new StringReader (xml)));
                }
 
                void ReadTest (string filename)

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
index aebfed0cd1d2a8a4ae789361fbac136626427254..435a363cec9b7fb0a22cc640ed99721e87b7a1ed 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
@@ -636,7 +636,12 @@ namespace MonoTests.System.Xaml
 
                string ReadXml (string name)
                {
-                       return File.ReadAllText ("Test/XmlFiles/" + name).Trim ().Replace ("\r\n", "\n").Replace ("\n", Environment.NewLine);
+#if NET_4_5
+                       string ver = "net_4_5";
+#else
+                       string ver = "net_4_0";
+#endif
+                       return File.ReadAllText ("Test/XmlFiles/" + name).Trim ().Replace ("\r\n", "\n").Replace ("\n", Environment.NewLine).Replace ("net_4_0", ver);
                }
 
                [Test]