* roottypes.cs: Rename from tree.cs.

[mono.git] / mcs / class / System.Web / Test / System.Web.UI.WebControls / FontNamesConverterTest.cs

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/FontNamesConverterTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/FontNamesConverterTest.cs
index 5236f4e290106173c8d5f8a18ae877a02c6db01a..9df9c4d4311648aa590d10365becd204ae616e34 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/FontNamesConverterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/FontNamesConverterTest.cs
@@ -1,5 +1,5 @@
 //
-// Tests for System.Web.UI.WebControls.Style.cs 
+// Tests for System.Web.UI.WebControls.FontNamesConverter.cs 
 //
 // Author:
 //     Peter Dennis Bartok (pbartok@novell.com)
@@ -66,14 +66,16 @@ namespace MonoTests.System.Web.UI.WebControls
                        // list of font names separated by comma.
                        // Why does the CanConvertFrom() and CanConvertTo() then indicate that it cannot handle string[]???
                        // It obviously works:
+#if ONLY_1_1
                        Assert.AreEqual (name_array, conv.ConvertFrom(null, null, name_list), "B7");
                        Assert.AreEqual (name_list, conv.ConvertTo(null, null, name_array, typeof(string)), "B8");
 
                        // Special cases
                        Assert.AreEqual ("", conv.ConvertTo(null, null, new string[0], typeof(string)), "B9");
+#endif
                        Assert.AreEqual ("", conv.ConvertTo(null, null, null, typeof(string)), "B10");
                        Assert.AreEqual (new string[0], conv.ConvertFrom(null, null, ""), "B11");
-
+#if ONLY_1_1
                        // Roundtrip
                        Assert.AreEqual (name_list, conv.ConvertTo(null, null, conv.ConvertFrom(null, null, name_list), typeof(string)), "B12");
 
@@ -86,6 +88,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        // This is stupid behaviour and prevents roundtripping; why trim in ConvertFrom and not in ConvertTo?
                        Assert.AreEqual ("Arial\n,Courier\n", conv.ConvertTo(null, null, new string[] { "Arial\n", "Courier\n" }, typeof(string)), "B17");
                        Assert.AreEqual ("Arial,\n,Courier\n", conv.ConvertTo(null, null, new string[] { "Arial,\n", "Courier\n" }, typeof(string)), "B18");
+#endif
                }
        }
 }