diff options
| author | atsushieno <atsushieno@veritas-vos-liberabit.com> | 2012-05-31 07:37:14 +0400 |
|---|---|---|
| committer | atsushieno <atsushieno@veritas-vos-liberabit.com> | 2012-05-31 07:37:14 +0400 |
| commit | 3590a88381401f5cfa2c4fdc87582a66ebe5a1bf (patch) | |
| tree | ca07a10594344d891db2059aab0f40f079bb833f /mcs/class/System.Xaml | |
| parent | 691cc77cb712a078fee2b0c76c24d82dde512ccd (diff) | |
Make those tests look good on net_4_5.
Diffstat (limited to 'mcs/class/System.Xaml')
3 files changed, 27 insertions, 4 deletions
diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs index f3e89003b3b..35f5c7347ba 100755 --- 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 e27e2a77d8e..b8dd211e648 100755 --- 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 aebfed0cd1d..435a363cec9 100755 --- 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] |